diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2
index fcd88fc..08380fb 100644
--- a/octoprint_klipper/templates/klipper_settings.jinja2
+++ b/octoprint_klipper/templates/klipper_settings.jinja2
@@ -1,7 +1,4 @@
 <form class="form-horizontal">
-    <div class="control-group">
-      <h4>{{ _('Settings') }}<h4>
-    </div>
     <div class="control-group">
         <label class="control-label">{{ _('Serial Port') }}</label>
         <div class="controls">
diff --git a/octoprint_klipper/templates/klipper_tab_main.jinja2 b/octoprint_klipper/templates/klipper_tab_main.jinja2
index eaaa78a..337767e 100644
--- a/octoprint_klipper/templates/klipper_tab_main.jinja2
+++ b/octoprint_klipper/templates/klipper_tab_main.jinja2
@@ -1,28 +1,36 @@
 <div class="row-fluid">
   <div class="span8">
-    <label>Log</label>
+    <label>Messages</label>
     <div class="plugin_klipper_log" data-bind="foreach: logMessages">
       <div class="log-item"><i data-bind="text: time"></i> <span data-bind="text: msg, css: type"></span></div>
     </div>
     <a href="#" data-bind="click: onClearLog" class="fa fa-trash" alt="Clear"></a>
   </div>
   <div class="span4">
-    <div>
-      <label>Process Management</label>
-      <button class="btn btn-block" data-bind="click: onGetStatus, enable: isActive()">Status</button>
-      <label>Restart</label>
-      <button class="btn btn-block" data-bind="click: onRestartHost, enable: isActive()"><i class="fa fa-repeat"></i> Host</button>
-      <button class="btn btn-block" data-bind="click: onRestartFirmware, enable: isActive()"><i class="fa fa-repeat"></i> MCU</button>
-      <label>Tools</label>
-      <button class="btn btn-block" data-bind="click: showLevelingDialog, enable: isActive()">Assisted Bed Leveling</button>
-      <button class="btn btn-block" data-bind="click: showPidTuningDialog, enable: isActive()">PID Tuning</button>
-    </div>
-    <hr>
-    <div>
-      <label>Macros</label>
-      <div data-bind="foreach: settings.settings.plugins.klipper.macros">
-        <button class="btn btn-block" data-bind="text: name, click: $parent.executeMacro, enable: $parent.isActive()"></button>
-      </div>
+    <div class="control-group">
+     <div class="controls">
+           <label class="control-label">&nbsp;</label>
+           <button class="btn btn-block" data-bind="click: onGetStatus, enable: isActive()">Status</button>
+     </div>
+     <div class="controls">
+          <hr>
+          <label class="control-label">Restart</label>
+          <button class="btn btn-block" data-bind="click: onRestartHost, enable: isActive()"><i class="fa fa-repeat"></i> Host</button>
+          <button class="btn btn-block" data-bind="click: onRestartFirmware, enable: isActive()"><i class="fa fa-repeat"></i> MCU</button>
+     </div>
+     <div class="controls">
+         <hr>
+         <label class="control-label">Tools</label>
+         <button class="btn btn-block" data-bind="click: showLevelingDialog, enable: isActive()">Assisted Bed Leveling</button>
+         <button class="btn btn-block" data-bind="click: showPidTuningDialog, enable: isActive()">PID Tuning</button>
+     </div>
+     <div class="controls">
+          <hr>
+         <label class="control-label">Macros</label>
+         <div data-bind="foreach: settings.settings.plugins.klipper.macros">
+            <button class="btn btn-block" data-bind="text: name, click: $parent.executeMacro, enable: $parent.isActive()"></button>
+         </div>
+     </div>
     </div>
   </div>
 </div>
\ No newline at end of file