diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
index 469cd433..b4311d90 100644
--- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
@@ -137,45 +137,60 @@ var UI_API_KEY = "{{ uiApiKey }}";
 									<div id="statusbox">
 										
 									<div id="control" class="accordion-inner" >
-										{{ _('Position') }}: <strong data-bind="text: laserPos"></strong>
-										<a href="#control_btns" style="margin-top: -5px;"
-										   class="btn btn-xs pull-right"  
-										   data-toggle="collapse" aria-expanded="false">
-											<i class="icon-move sr-only"></i>
-											<span class="caret"></span>
-										</a>
-
-										<div class="clearfix"></div>
-										<div class="collapse" id="control_btns">
-											<div class="jog-panel" id="control_xyaxis">
-												XY-Axes
-												<div>
-													<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('y',1) }"><i class="icon-arrow-up"></i></button>
-												</div>
-												<div>
-													<button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('x',-1) }"><i class="icon-arrow-left"></i></button>
-													<button class="btn box pull-left" data-bind="enable: (isOperational() || isLocked()) && !isPrinting() && loginState.isUser(), click: function() { $root.sendHomeCommand(['x', 'y']) }"><i class="icon-home"></i></button>
-													<button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('x',1) }"><i class="icon-arrow-right"></i></button>
-												</div>
-												<div>
-													<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('y',-1) }"><i class="icon-arrow-down"></i></button>
+										<div data-bind="visible: isLocked ">
+											Mr Beam is in a locked state as it does not know its position.
+											First remove any objects blocking the gantry's travel range.
+											Then do a homing cycle.
+											<div style='text-align: center; padding:.5em;'>
+												
+												<div class='btn-group'>
+													<button class="btn btn-default" data-bind="enable: isLocked() && loginState.isUser(), click: function() { $root.sendHomeCommand(['x', 'y']) }"><i class="icon-home"> Homing Cycle</i></button>
+													<!--<button class="btn btn-default" data-bind="enable: isLocked() && loginState.isUser(), click: function() { $root.sendHomeCommand(['x', 'y']) }"><i class="icon-unlock">Unlock</i></button>-->
 												</div>
 											</div>
-											{% if hasZAxis %}
-										   <div class="jog-panel" id="control_zaxis">
-											   Z-Axis
-											   <div class="btn-group-vertical" role="group" aria-label="z-axis control">
-												  <button class="btn xbox" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',1) }"><i class="icon-arrow-up"></i></button>
-											      <!--<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendHomeCommand(['z']) }"><i class="icon-home"></i></button>-->
-											      <button class="btn xbox" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',-1) }"><i class="icon-arrow-down"></i></button>
-											   </div>
-										   </div>
-											{% endif %}
+										</div>
+										<div data-bind="visible: !isLocked() ">
+											{{ _('Position') }}: <strong data-bind="text: laserPos"></strong>
+											<a href="#control_btns" style="margin-top: -5px;"
+											   class="btn btn-xs pull-right"  
+											   data-toggle="collapse" aria-expanded="false">
+												<i class="icon-move sr-only"></i>
+												<span class="caret"></span>
+											</a>
 
 											<div class="clearfix"></div>
-											Jog distance: <span data-bind="text: jogDistanceInMM">10</span>mm
-											<div class="distance">
-												<input type="text" id="jogDistance" />
+											<div class="collapse" id="control_btns">
+												
+												<div class="jog-panel" id="control_xyaxis">
+													XY-Axes
+													<div>
+														<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('y',1) }"><i class="icon-arrow-up"></i></button>
+													</div>
+													<div>
+														<button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('x',-1) }"><i class="icon-arrow-left"></i></button>
+														<button class="btn box pull-left" data-bind="enable: (isOperational() || isLocked()) && !isPrinting() && loginState.isUser(), click: function() { $root.sendHomeCommand(['x', 'y']) }"><i class="icon-home"></i></button>
+														<button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('x',1) }"><i class="icon-arrow-right"></i></button>
+													</div>
+													<div>
+														<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('y',-1) }"><i class="icon-arrow-down"></i></button>
+													</div>
+												</div>
+												{% if hasZAxis %}
+											   <div class="jog-panel" id="control_zaxis">
+												   Z-Axis
+												   <div class="btn-group-vertical" role="group" aria-label="z-axis control">
+													  <button class="btn xbox" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',1) }"><i class="icon-arrow-up"></i></button>
+													  <!--<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendHomeCommand(['z']) }"><i class="icon-home"></i></button>-->
+													  <button class="btn xbox" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',-1) }"><i class="icon-arrow-down"></i></button>
+												   </div>
+											   </div>
+												{% endif %}
+
+												<div class="clearfix"></div>
+												Jog distance: <span data-bind="text: jogDistanceInMM">10</span>mm
+												<div class="distance">
+													<input type="text" id="jogDistance" />
+												</div>
 											</div>
 										</div>
 									</div>
@@ -198,41 +213,43 @@ var UI_API_KEY = "{{ uiApiKey }}";
 									<div class="accordion-body collapse in" id="state" data-bind="visible: !isErrorOrClosed() && loginState.isUser()">
 										<div class="accordion-inner">
 											{{ _('Machine State') }}: <strong data-bind="text: stateString"></strong><br>
-											{{ _('File') }}: <strong data-bind="text: filename"></strong>&nbsp;<strong data-bind="visible: sd">(SD)</strong><br>
-											<!--                                {{ _('Timelapse') }}: <strong data-bind="text: timelapseString"></strong><br>-->
-											<!-- ko foreach: filament -->
-											<!--<span data-bind="text: 'Filament (' + name() + '): '"></span><strong data-bind="text: formatFilament(data())"></strong><br>-->
-											<!-- /ko -->
-											{{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
-											<!--                                {{ _('Print Time') }}: <strong data-bind="text: printTimeString"></strong><br>
-																			{{ _('Print Time Left') }}: <strong data-bind="text: printTimeLeftString"></strong><br>-->
-											{{ _('Processed') }}: <strong data-bind="text: byteString"></strong><br>
 
-											<div class="progress">
-												<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }"></div>
-											</div>
+											<div data-bind="visible: !isLocked()">
+												
+												{{ _('File') }}: <strong data-bind="text: filename"></strong>&nbsp;<strong data-bind="visible: sd">(SD)</strong><br>
+												<!--                                {{ _('Timelapse') }}: <strong data-bind="text: timelapseString"></strong><br>-->
+												<!-- ko foreach: filament -->
+												<!--<span data-bind="text: 'Filament (' + name() + '): '"></span><strong data-bind="text: formatFilament(data())"></strong><br>-->
+												<!-- /ko -->
+												{{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
+												<!--                                {{ _('Print Time') }}: <strong data-bind="text: printTimeString"></strong><br>
+																				{{ _('Print Time Left') }}: <strong data-bind="text: printTimeLeftString"></strong><br>-->
+												{{ _('Processed') }}: <strong data-bind="text: byteString"></strong><br>
 
-<!--											<div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
-												<button class="btn btn-danger span4" data-bind="click: print_with_safety_glasses_warning, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), attr: {title: titlePrintButton}" id="job_print">
-													<i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused(), 'wobble': isPrinting()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span>
-												</button>
-												<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}, attr: {title: titlePauseButton}"><i data-bind="css: {'icon-pause': !isPaused(), 'icon-play': isPaused()}"></i> <span data-bind="visible: !isPaused()">{{ _('Pause') }}</span><span data-bind="visible: isPaused()">{{ _('Resume') }}</span></button>
-												<button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()" title="{{ _('Cancels the job') }}"><i class="icon-stop"></i> {{ _('Cancel') }}</button>
-											</div>-->
-											<div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
-												<button class="btn btn-danger span4" data-bind="click: convertWorkingArea, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), attr: {title: titlePrintButton}" id="job_print">
-													<i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused(), 'wobble': isPrinting()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span>
-												</button>
-												<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}, attr: {title: titlePauseButton}"><i data-bind="css: {'icon-pause': !isPaused(), 'icon-play': isPaused()}"></i> <span data-bind="visible: !isPaused()">{{ _('Pause') }}</span><span data-bind="visible: isPaused()">{{ _('Resume') }}</span></button>
-												<button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()" title="{{ _('Cancels the job') }}"><i class="icon-stop"></i> {{ _('Cancel') }}</button>
+												<div class="progress">
+													<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }"></div>
+												</div>
+
+	<!--											<div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
+													<button class="btn btn-danger span4" data-bind="click: print_with_safety_glasses_warning, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), attr: {title: titlePrintButton}" id="job_print">
+														<i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused(), 'wobble': isPrinting()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span>
+													</button>
+													<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}, attr: {title: titlePauseButton}"><i data-bind="css: {'icon-pause': !isPaused(), 'icon-play': isPaused()}"></i> <span data-bind="visible: !isPaused()">{{ _('Pause') }}</span><span data-bind="visible: isPaused()">{{ _('Resume') }}</span></button>
+													<button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()" title="{{ _('Cancels the job') }}"><i class="icon-stop"></i> {{ _('Cancel') }}</button>
+												</div>-->
+												<div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
+													<button class="btn btn-danger span4" data-bind="click: convertWorkingArea, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), attr: {title: titlePrintButton}" id="job_print">
+														<i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused(), 'wobble': isPrinting()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span>
+													</button>
+													<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}, attr: {title: titlePauseButton}"><i data-bind="css: {'icon-pause': !isPaused(), 'icon-play': isPaused()}"></i> <span data-bind="visible: !isPaused()">{{ _('Pause') }}</span><span data-bind="visible: isPaused()">{{ _('Resume') }}</span></button>
+													<button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()" title="{{ _('Cancels the job') }}"><i class="icon-stop"></i> {{ _('Cancel') }}</button>
+												</div>
 											</div>
 										</div>
 									</div>
 								</div>
 			
 								</div>
-
-
 																
 								<div data-bind="visible: loginState.isUser" id="connection_accordion"></div>
 
@@ -336,13 +353,6 @@ var UI_API_KEY = "{{ uiApiKey }}";
 									 ">
 								<g id="scaleGroup" data-bind="attr: { transform: scaleMatrix() }"></g>
 								</svg>
-								
-<!--								<div class="jumbotron">
-									<canvas id="renderPathCanvas" style="border: none;" width="512" height="512"></canvas>
-
-									<input id="timeSlider" type="text" data-slider-min="0" data-slider-max="1000" data-slider-step="1" data-slider-value="1000" />
-
-								</div>-->
 
 							</div>
 						</div>