diff --git a/octoprint/static/css/ui.css b/octoprint/static/css/ui.css
index 90dd04c..770e6c0 100644
--- a/octoprint/static/css/ui.css
+++ b/octoprint/static/css/ui.css
@@ -169,3 +169,10 @@ table th.timelapse_files_action, table td.timelapse_files_action {
     margin-right: 20px;
     margin-bottom: 20px;
 }
+
+#controls .control-box {
+    display: block;
+    height: 40px;
+    margin-right: 20px;
+    margin-bottom: 20px;
+}
diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index eebdf17..40282d9 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -170,7 +170,7 @@
                         </div>
                         <div class="tab-pane" id="controls">
                             <!-- XY jogging control panel -->
-                            <div id="jog_xy" class="jog-panel">
+                            <div class="jog-panel">
                                 <h4>XY</h4>
                                 <div>
                                     <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('y', 10) }"><i class="icon-arrow-up"></i></button>
@@ -185,7 +185,7 @@
                                 </div>
                             </div>
                             <!-- Z jogging control panel -->
-                            <div id="jog_z" class="jog-panel">
+                            <div class="jog-panel">
                                 <h4>Z</h4>
                                 <div>
                                     <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('z', 10) }"><i class="icon-arrow-up"></i></button>
@@ -197,6 +197,15 @@
                                     <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('z', -10) }"><i class="icon-arrow-down"></i></button>
                                 </div>
                             </div>
+                            <!-- General control -->
+                            <div class="jog-panel">
+                                <h4>Control</h4>
+                                <div>
+                                    <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendCustomCommand({type:'command',command:'M18'}) }"><i class="icon-off"></i>&nbsp;Motors off</button>
+                                    <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendCustomCommand({type:'command',command:'M106'}) }">Fans on</button>
+                                    <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendCustomCommand({type:'command',command:'M106 S0'}) }">Fans off</button>
+                                </div>
+                            </div>
 
                             <div data-bind="template: { name: $root.displayMode, foreach: controls }"></div>