diff --git a/html/pages/device/edit/alert-rules.inc.php b/html/pages/device/edit/alert-rules.inc.php
index 20ad52f11..473f86050 100644
--- a/html/pages/device/edit/alert-rules.inc.php
+++ b/html/pages/device/edit/alert-rules.inc.php
@@ -1,3 +1,4 @@
+<h3> Alert Rules </h3>
 <?php
 
 /*
diff --git a/html/pages/device/edit/alerts.inc.php b/html/pages/device/edit/alerts.inc.php
index 7320c94fc..10d3e7197 100644
--- a/html/pages/device/edit/alerts.inc.php
+++ b/html/pages/device/edit/alerts.inc.php
@@ -44,6 +44,7 @@ $override_sysContact_bool   = get_dev_attrib($device, 'override_sysContact_bool'
 $override_sysContact_string = get_dev_attrib($device, 'override_sysContact_string');
 $disable_notify             = get_dev_attrib($device, 'disable_notify');
 ?>
+<h3>Alert settings</h3>
 
 <div class="row">
     <div class="col-md-12">
@@ -51,7 +52,7 @@ $disable_notify             = get_dev_attrib($device, 'disable_notify');
     </div>
 </div>
 
-<h3>Alert settings</h3>
+
 
 <form id="edit" name="edit" method="post" action="" role="form" class="form-horizontal">
   <input type="hidden" name="editing" value="yes">
@@ -107,4 +108,4 @@ require_once 'includes/modal/new_alert_rule.inc.php';
     <div class="col-md-1 col-md-offset-3">
         <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#create-alert" data-device_id="<?php echo $device['device_id']; ?>"><i class="fa fa-plus"></i> Create new alert rule</button>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/html/pages/device/edit/apps.inc.php b/html/pages/device/edit/apps.inc.php
index fc5e50eea..03b0ca5f4 100644
--- a/html/pages/device/edit/apps.inc.php
+++ b/html/pages/device/edit/apps.inc.php
@@ -1,3 +1,4 @@
+<h3> Applications </h3>
 <?php
 
 // Load our list of available applications
diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php
index b435a24e5..c95245a0d 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -62,7 +62,7 @@ elseif ($update_message) {
 }
 
 ?>
-
+<h3> Device Settings </h3>
 <div class="row">
     <div class="col-md-1 col-md-offset-2">
         <form id="delete_host" name="delete_host" method="post" action="delhost/" role="form">
@@ -114,9 +114,7 @@ elseif ($update_message) {
 <div class="form-group">
     <label for="sysLocation" class="col-sm-2 control-label">Override sysLocation:</label>
     <div class="col-sm-6">
-        <div class="checkbox">
-            <input onclick="edit.sysLocation.disabled=!edit.override_sysLocation.checked" type="checkbox" name="override_sysLocation"<?php if ($override_sysLocation) echo(' checked="1"'); ?> />
-        </div>
+      <input onclick="edit.sysLocation.disabled=!edit.override_sysLocation.checked" type="checkbox" name="override_sysLocation"<?php if ($override_sysLocation) echo(' checked="1"'); ?> />
     </div>
 </div>
 <div class="form-group">
diff --git a/html/pages/device/edit/modules.inc.php b/html/pages/device/edit/modules.inc.php
index 050083468..e433dd037 100644
--- a/html/pages/device/edit/modules.inc.php
+++ b/html/pages/device/edit/modules.inc.php
@@ -1,3 +1,4 @@
+<h3> Modules </h3>
 <div class="row">
   <div class="col-sm-6">
     <strong>Poller Modules</strong>
diff --git a/html/pages/device/edit/ports.inc.php b/html/pages/device/edit/ports.inc.php
index 2e14cbb46..d18a42193 100644
--- a/html/pages/device/edit/ports.inc.php
+++ b/html/pages/device/edit/ports.inc.php
@@ -1,4 +1,5 @@
 </form>
+<h3> Port Settings </h3>
 <span id="message"><small><div class="alert alert-danger">n.b For the first time, please click any button twice.</div></small></span>
 
 <form id='ignoreport' name='ignoreport' method='post' action='' role='form' class='form-inline'>