Index: html/includes/graphs/accesspoints/auth.inc.php
===================================================================
--- html/includes/graphs/accesspoints/auth.inc.php	(revision 6965)
+++ html/includes/graphs/accesspoints/auth.inc.php	(working copy)
@@ -22,9 +22,9 @@
     $rrd_filename = get_rrd_path($device, "arubaap-".$ap['name'].".".$ap['radio_number'].".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: AP :: " . htmlentities($ap['name']);
+    $title .= " :: AP :: " . escape_html($ap['name']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/bgp/auth.inc.php
===================================================================
--- html/includes/graphs/bgp/auth.inc.php	(revision 6965)
+++ html/includes/graphs/bgp/auth.inc.php	(working copy)
@@ -21,7 +21,7 @@
     $device = device_by_id_cache($data['device_id']);
 
     $title  = generate_device_link($device);
-    $title .= " :: BGP :: " . htmlentities($data['bgp_peerid']);
+    $title .= " :: BGP :: " . escape_html($data['bgp_peerid']);
     $auth = TRUE;
   }
 }
Index: html/includes/graphs/cefswitching/auth.inc.php
===================================================================
--- html/includes/graphs/cefswitching/auth.inc.php	(revision 6965)
+++ html/includes/graphs/cefswitching/auth.inc.php	(working copy)
@@ -22,9 +22,9 @@
     $rrd_filename = get_rrd_path($device, "cefswitching-".$cef['entPhysicalIndex']."-".$cef['afi']."-".$cef['cef_index'].".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: CEF Switching :: " . htmlentities($cef['cef_descr']);
+    $title .= " :: CEF Switching :: " . escape_html($cef['cef_descr']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/customer/auth.inc.php
===================================================================
--- html/includes/graphs/customer/auth.inc.php	(revision 6965)
+++ html/includes/graphs/customer/auth.inc.php	(working copy)
@@ -20,4 +20,4 @@
   $auth = TRUE;
 }
 
-?>
+// EOF
Index: html/includes/graphs/customer/bits.inc.php
===================================================================
--- html/includes/graphs/customer/bits.inc.php	(revision 6965)
+++ html/includes/graphs/customer/bits.inc.php	(working copy)
@@ -39,4 +39,4 @@
 
 include("includes/graphs/generic_multi_bits_separated.inc.php");
 
-?>
+// EOF
Index: html/includes/graphs/diskio/auth.inc.php
===================================================================
--- html/includes/graphs/diskio/auth.inc.php	(revision 6965)
+++ html/includes/graphs/diskio/auth.inc.php	(working copy)
@@ -22,9 +22,9 @@
     $rrd_filename = get_rrd_path($device, "ucd_diskio-" . $disk['diskio_descr'] . ".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: Disk :: " . htmlentities($disk['diskio_descr']);
+    $title .= " :: Disk :: " . escape_html($disk['diskio_descr']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/eigrpport/auth.inc.php
===================================================================
--- html/includes/graphs/eigrpport/auth.inc.php	(revision 6965)
+++ html/includes/graphs/eigrpport/auth.inc.php	(working copy)
@@ -23,7 +23,7 @@
     $rrd_filename = get_rrd_path($device, "eigrp_port-".$data['eigrp_vpn']."-".$data['eigrp_as']."-".$port['ifIndex'].".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: EIGRP :: Port :: " . htmlentities($port['port_label']);
+    $title .= " :: EIGRP :: Port :: " . escape_html($port['port_label']);
     $auth = TRUE;
   }
 }
Index: html/includes/graphs/ipsectunnel/auth.inc.php
===================================================================
--- html/includes/graphs/ipsectunnel/auth.inc.php	(revision 6965)
+++ html/includes/graphs/ipsectunnel/auth.inc.php	(working copy)
@@ -22,9 +22,9 @@
     $rrd_filename = get_rrd_path($device, "ipsectunnel-".$tunnel['peer_addr'].".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: IPSEC Tunnel :: " . htmlentities($tunnel['peer_addr']);
+    $title .= " :: IPSEC Tunnel :: " . escape_html($tunnel['peer_addr']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/mempool/auth.inc.php
===================================================================
--- html/includes/graphs/mempool/auth.inc.php	(revision 6965)
+++ html/includes/graphs/mempool/auth.inc.php	(working copy)
@@ -21,7 +21,7 @@
     if (isset($mempool['mempool_type'])) { $mempool['mempool_mib'] = $mempool['mempool_type']; }
     $rrd_filename = get_rrd_path($device, "mempool-".$mempool['mempool_mib']."-".$mempool['mempool_index'].".rrd");
     $title  = generate_device_link($device);
-    $title .= " :: Memory Pool :: " . htmlentities($mempool['mempool_descr']);
+    $title .= " :: Memory Pool :: " . escape_html($mempool['mempool_descr']);
     $auth = TRUE;
   }
 }
Index: html/includes/graphs/netscalersvc/auth.inc.php
===================================================================
--- html/includes/graphs/netscalersvc/auth.inc.php	(revision 6965)
+++ html/includes/graphs/netscalersvc/auth.inc.php	(working copy)
@@ -23,9 +23,9 @@
     $rrd_filename = get_rrd_path($device, "nscaler-svc-".$svc['svc_name'].".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: Netscaler VServer :: " . htmlentities($svc['svc_name']);
+    $title .= " :: Netscaler VServer :: " . escape_html($svc['svc_name']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/netscalervsvr/auth.inc.php
===================================================================
--- html/includes/graphs/netscalervsvr/auth.inc.php	(revision 6965)
+++ html/includes/graphs/netscalervsvr/auth.inc.php	(working copy)
@@ -23,9 +23,9 @@
     $rrd_filename = get_rrd_path($device, "netscaler-vsvr-".$vsvr['vsvr_name'].".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: Netscaler VServer :: " . htmlentities($vsvr['vsvr_name']);
+    $title .= " :: Netscaler VServer :: " . escape_html($vsvr['vsvr_name']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/p2pradio/auth.inc.php
===================================================================
--- html/includes/graphs/p2pradio/auth.inc.php	(revision 6965)
+++ html/includes/graphs/p2pradio/auth.inc.php	(working copy)
@@ -23,9 +23,9 @@
     $rrd_filename = get_rrd_path($device, "p2p_radio-" . $radio['radio_mib'] . "-" . $radio['radio_index'] . ".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: P2P Radio :: " . htmlentities($radio['radio_name']);
+    $title .= " :: P2P Radio :: " . escape_html($radio['radio_name']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/processor/auth.inc.php
===================================================================
--- html/includes/graphs/processor/auth.inc.php	(revision 6965)
+++ html/includes/graphs/processor/auth.inc.php	(working copy)
@@ -18,8 +18,8 @@
   $device = device_by_id_cache($proc['device_id']);
   $rrd_filename  = get_rrd_path($device, "processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
   $title  = generate_device_link($device);
-  $title .= " :: Processor :: " . htmlentities($proc['processor_descr']);
+  $title .= " :: Processor :: " . escape_html($proc['processor_descr']);
   $auth = TRUE;
 }
 
-?>
+// EOF
Index: html/includes/graphs/rserver/auth.inc.php
===================================================================
--- html/includes/graphs/rserver/auth.inc.php	(revision 6965)
+++ html/includes/graphs/rserver/auth.inc.php	(working copy)
@@ -23,9 +23,9 @@
     $rrd_filename = get_rrd_path($device, "rserver-".$rserver['rserver_id'].".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: Rserver :: " . htmlentities($rserver['farm_id']);
+    $title .= " :: Rserver :: " . escape_html($rserver['farm_id']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/service/auth.inc.php
===================================================================
--- html/includes/graphs/service/auth.inc.php	(revision 6965)
+++ html/includes/graphs/service/auth.inc.php	(working copy)
@@ -22,9 +22,9 @@
     $rrd_filename = get_rrd_path($device, "service-" . $service['service_type'] . "-" . $service['service_id'] . ".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: Service :: " . htmlentities($service['service_type']);
+    $title .= " :: Service :: " . escape_html($service['service_type']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/status/auth.inc.php
===================================================================
--- html/includes/graphs/status/auth.inc.php	(revision 6965)
+++ html/includes/graphs/status/auth.inc.php	(working copy)
@@ -23,7 +23,7 @@
     $rrd_filename = get_rrd_path($device, get_status_rrd($device, $status));
 
     $title  = generate_device_link($device);
-    $title .= " :: Status :: " . htmlentities($status['status_descr']);
+    $title .= " :: Status :: " . escape_html($status['status_descr']);
     $auth = TRUE;
   }
 }
Index: html/includes/graphs/storage/auth.inc.php
===================================================================
--- html/includes/graphs/storage/auth.inc.php	(revision 6965)
+++ html/includes/graphs/storage/auth.inc.php	(working copy)
@@ -21,9 +21,9 @@
     $rrd_filename = get_rrd_path($device, "storage-" . $storage['storage_mib'] . "-" . $storage['storage_descr'] . ".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: Storage :: " . htmlentities($storage['storage_descr']);
+    $title .= " :: Storage :: " . escape_html($storage['storage_descr']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/toner/auth.inc.php
===================================================================
--- html/includes/graphs/toner/auth.inc.php	(revision 6965)
+++ html/includes/graphs/toner/auth.inc.php	(working copy)
@@ -21,9 +21,9 @@
     $rrd_filename  = get_rrd_path($device, "toner-" . $toner['toner_index'] . ".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: Toner :: " . htmlentities($toner['toner_descr']);
+    $title .= " :: Toner :: " . escape_html($toner['toner_descr']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/vserver/auth.inc.php
===================================================================
--- html/includes/graphs/vserver/auth.inc.php	(revision 6965)
+++ html/includes/graphs/vserver/auth.inc.php	(working copy)
@@ -23,7 +23,7 @@
     $rrd_filename = get_rrd_path($device, "vserver-".$vserver['classmap_id'].".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: Serverfarm :: " . htmlentities($vserver['classmap_id']);
+    $title .= " :: Serverfarm :: " . escape_html($vserver['classmap_id']);
     $auth = TRUE;
   }
 }
Index: html/includes/graphs/wifi/auth.inc.php
===================================================================
--- html/includes/graphs/wifi/auth.inc.php	(revision 6965)
+++ html/includes/graphs/wifi/auth.inc.php	(working copy)
@@ -19,9 +19,9 @@
     $device = device_by_id_cache($radio['device_id']);
 
     $title  = generate_device_link($device);
-    $title .= " :: WIFI - Accesspoint :: " . htmlentities($radio['name']);
+    $title .= " :: WIFI - Accesspoint :: " . escape_html($radio['name']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/graphs/wifiradio/auth.inc.php
===================================================================
--- html/includes/graphs/wifiradio/auth.inc.php	(revision 6965)
+++ html/includes/graphs/wifiradio/auth.inc.php	(working copy)
@@ -23,9 +23,9 @@
     $rrd_filename = get_rrd_path($device, "wifi-radio-" . $radio['radio_ap'] . "-" . $radio['radio_number'] . ".rrd");
 
     $title  = generate_device_link($device);
-    $title .= " :: WiFi - Radio :: " . htmlentities($radio['radio_number']);
+    $title .= " :: WiFi - Radio :: " . escape_html($radio['radio_number']);
     $auth = TRUE;
   }
 }
 
-?>
+// EOF
Index: html/includes/group-navbar.inc.php
===================================================================
--- html/includes/group-navbar.inc.php	(revision 6965)
+++ html/includes/group-navbar.inc.php	(working copy)
@@ -44,6 +44,7 @@
   } else {
     $navbar['options'][$thing['entity_type']]['url'] = generate_url($vars, array('page' => 'groups', 'entity_type' => $thing['entity_type']));
   }
+  $navbar['options'][$thing['entity_type']]['icon'] = $config['entities'][$thing['entity_type']]['icon'];
   $navbar['options'][$thing['entity_type']]['text'] = escape_html(nicecase($thing['entity_type']));
 }
 
Index: html/includes/map/google-mc.inc.php
===================================================================
--- html/includes/map/google-mc.inc.php	(revision 6965)
+++ html/includes/map/google-mc.inc.php	(working copy)
@@ -51,7 +51,7 @@
   <?php
   if ($config['frontpage']['map']['clouds'])
   {
-    echo '<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=weather"></script>';
+    echo '<script src="//maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=weather"></script>';
   } else {
     echo '<script src="//maps.google.com/maps/api/js?sensor=false"></script>';
   }
Index: html/includes/navbar.inc.php
===================================================================
--- html/includes/navbar.inc.php	(revision 6965)
+++ html/includes/navbar.inc.php	(working copy)
@@ -46,9 +46,9 @@
     $group['member_count'] = dbFetchCell("SELECT COUNT(*) FROM `group_table` WHERE `group_id` = ?", array($group['group_id']));
     $entity_type           = $config['entities'][$group['entity_type']];
 
-    $group_menu[] = array('url' => generate_url(array('page' => 'group', 'group_id' => $group['group_id'])), 'title' => $group['group_name'].' <span class="label label-info">'.$group['member_count'].'</span>', 'icon' => $config['entities'][$group['entity_type']]['icon']);
+    $group_menu[] = array('url' => generate_url(array('page' => 'group', 'group_id' => $group['group_id'])), 'title' => escape_html($group['group_name']).' <span class="label label-info">'.$group['member_count'].'</span>', 'icon' => $config['entities'][$group['entity_type']]['icon']);
 
-    $entity_group_menu[$group['entity_type']][] = array('url' => generate_url(array('page' => 'group', 'group_id' => $group['group_id'])), 'title' => $group['group_name'].' <span class="label label-info">'.$group['member_count'].'</span>', 'icon' => $config['entities'][$group['entity_type']]['icon']);
+    $entity_group_menu[$group['entity_type']][] = array('url' => generate_url(array('page' => 'group', 'group_id' => $group['group_id'])), 'title' => escape_html($group['group_name']).' <span class="label label-info">'.$group['member_count'].'</span>', 'icon' => $config['entities'][$group['entity_type']]['icon']);
 
   }
 
@@ -214,18 +214,18 @@
 
 if ($config['enable_pseudowires'] && $cache['pseudowires']['count'])
 {
-  $navbar['ports']['entries'][] = array('title' => 'Pseudowires ('.$cache['pseudowires']['count'].')', 'url' => generate_url(array('page' => 'pseudowires')), 'icon' => 'oicon-layer-shape-curve');
+  $navbar['ports']['entries'][] = array('title' => 'Pseudowires', 'count' => $cache['pseudowires']['count'], 'url' => generate_url(array('page' => 'pseudowires')), 'icon' => 'oicon-layer-shape-curve');
   $ifbreak = 1;
 }
 if ($cache['cbqos']['count'])
 {
-  $navbar['ports']['entries'][] = array('title' => 'CBQoS ('.$cache['cbqos']['count'].')', 'url' => generate_url(array('page' => 'ports', 'cbqos' => 'yes')), 'icon' => 'oicon-category-group');
+  $navbar['ports']['entries'][] = array('title' => 'CBQoS', 'count' => $cache['cbqos']['count'], 'url' => generate_url(array('page' => 'ports', 'cbqos' => 'yes')), 'icon' => 'oicon-category-group');
   $ifbreak = 1;
 }
 
 if ($cache['sla']['count'])
 {
-  $navbar['ports']['entries'][] = array('title' => 'IP SLA ('.$cache['sla']['count'].')', 'url' => generate_url(array('page' => 'slas')), 'icon' => 'oicon-chart-up');
+  $navbar['ports']['entries'][] = array('title' => 'IP SLA', 'count' => $cache['sla']['count'], 'url' => generate_url(array('page' => 'slas')), 'icon' => 'oicon-chart-up');
   $ifbreak = 1;
 }
 
@@ -269,17 +269,17 @@
 
 if ($ports['down'])
 {
-  $navbar['ports']['entries']['statuses']['entries'][] = array('url' => generate_url(array('page' => 'ports', 'state' => 'down')), 'icon' => 'oicon-network-status-busy', 'title' => 'Down');
+  $navbar['ports']['entries']['statuses']['entries'][] = array('url' => generate_url(array('page' => 'ports', 'state' => 'down')), 'icon' => 'oicon-network-status-busy', 'title' => 'Down', 'count' => $ports['down']);
 }
 
 if ($ports['ignored'])
 {
-  $navbar['ports']['entries']['statuses']['entries'][] = array('url' => generate_url(array('page' => 'ports', 'ignore' => '1')), 'icon' => 'oicon-network-status-away', 'title' => 'Ignored');
+  $navbar['ports']['entries']['statuses']['entries'][] = array('url' => generate_url(array('page' => 'ports', 'ignore' => '1')), 'icon' => 'oicon-network-status-away', 'title' => 'Ignored', 'count' => $ports['ignored']);
 }
 
 if ($ports['disabled'])
 {
-  $navbar['ports']['entries']['statuses']['entries'][] = array('url' => generate_url(array('page' => 'ports', 'state' => 'admindown')), 'icon' => 'oicon-network-status-offline', 'title' => 'Disabled');
+  $navbar['ports']['entries']['statuses']['entries'][] = array('url' => generate_url(array('page' => 'ports', 'state' => 'admindown')), 'icon' => 'oicon-network-status-offline', 'title' => 'Disabled', 'count' => $ports['disabled']);
 }
 
 if ($ports['deleted'])
@@ -306,7 +306,6 @@
   $health_items['status'] = array('text' => "Status", 'icon' => $config['entities']['status']['icon']);
 }
 
-
 foreach ($health_items as $item => $item_data)
 {
   $navbar['health']['entries'][] = array('url' => generate_url(array('page' => 'health', 'metric' => $item)), 'icon' => $item_data['icon'], 'title' => $item_data['text']);
@@ -486,7 +485,7 @@
 // DOCME needs phpdoc block
 function navbar_submenu($entry, $level = 1)
 {
-  echo(str_pad('',($level-1)*2) . '                <li class="dropdown-submenu"><a nowrap href="' . $entry['url'] . '"><i class="menu-icon ' . $entry['icon'] . '"></i> ' . $entry['title'] . '</a>' . PHP_EOL);
+  echo(str_pad('',($level-1)*2) . '                <li class="dropdown-submenu"><a href="' . $entry['url'] . '"><i class="menu-icon ' . $entry['icon'] . '"></i> ' . $entry['title'] . '</a>' . PHP_EOL);
   echo(str_pad('',($level-1)*2) . '                  <ul class="dropdown-menu">' . PHP_EOL);
 
   foreach ($entry['entries'] as $subentry)
Index: html/includes/print-interface.inc.php
===================================================================
--- html/includes/print-interface.inc.php	(revision 6965)
+++ html/includes/print-interface.inc.php	(working copy)
@@ -66,7 +66,7 @@
 
 echo("        <span class='entity-title'>
               " . generate_port_link($port) . " ".$port['tags']."
-           </span><br /><span class=small>".htmlentities($port['ifAlias'])."</span>");
+           </span><br /><span class=small>".escape_html($port['ifAlias'])."</span>");
 
 if ($port['ifAlias']) { echo("<br />"); }
 
Index: html/includes/print/alert.inc.php
===================================================================
--- html/includes/print/alert.inc.php	(revision 6965)
+++ html/includes/print/alert.inc.php	(working copy)
@@ -234,7 +234,7 @@
     // Print link to the alert rule page
     if ($list['alert_test_id'])
     {
-      echo '<td class="entity"><a href="', generate_url(array('page' => 'alert_check', 'alert_test_id' => $alert_rule['alert_test_id'])), '">', $alert_rule['alert_name'], '</a></td>';
+      echo '<td class="entity"><a href="', generate_url(array('page' => 'alert_check', 'alert_test_id' => $alert_rule['alert_test_id'])), '">', escape_html($alert_rule['alert_name']), '</a></td>';
     }
 
     echo('<td>');
@@ -274,7 +274,7 @@
     // Print (i) icon with popup of state.
     echo(overlib_link("", '<i class="icon-info-sign"></i>', $alert['state_popup'], NULL));
 
-    echo(' <a href="'.generate_url(array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'alert', 'alert_entry' => $alert['alert_table_id'])).'"><i class="oicon-gear" /></a>');
+    echo(' <a href="'.generate_url(array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'alert', 'alert_entry' => $alert['alert_table_id'])).'"><i class="oicon-gear"></i></a>');
     echo('</td>');
     echo('</tr>');
 
Index: html/includes/print/alert_log.inc.php
===================================================================
--- html/includes/print/alert_log.inc.php	(revision 6965)
+++ html/includes/print/alert_log.inc.php	(working copy)
@@ -116,7 +116,7 @@
                              'section' => 'alertlog');
         $string .= '    <td class="entity">' . generate_device_link($dev, short_hostname($dev['hostname']), $device_vars) . '</td>' . PHP_EOL;
       }
-      if ($list['alert_test_id']) { $string .= '     <td class="entity"><a href="'. generate_url(array('page' => 'alert_check', 'alert_test_id' => $alert_rule['alert_test_id'])). '">'. $alert_rule['alert_name']. '</a></td>'; }
+      if ($list['alert_test_id']) { $string .= '     <td class="entity"><a href="'. generate_url(array('page' => 'alert_check', 'alert_test_id' => $alert_rule['alert_test_id'])). '">'. escape_html($alert_rule['alert_name']). '</a></td>'; }
 
       if ($list['entity'])
       {
Index: html/includes/search/sensors.inc.php
===================================================================
--- html/includes/search/sensors.inc.php	(revision 6965)
+++ html/includes/search/sensors.inc.php	(working copy)
@@ -31,8 +31,8 @@
       'name' => $name, 'colour' => $tab_colour,
       'icon' => '<i class="'.$config['sensor_types'][$result['sensor_class']]['icon'].'"></i>',
       'data' => array(
-        htmlentities($result['hostname']),
-        highlight_search(htmlentities($result['location'], 0, 'UTF-8')) . ' | ' . nicecase($result['sensor_class']).' sensor'),
+        escape_html($result['hostname']),
+        highlight_search(escape_html($result['location'])) . ' | ' . nicecase($result['sensor_class']).' sensor'),
     );
 
   }
Index: html/includes/status-summary.inc.php
===================================================================
--- html/includes/status-summary.inc.php	(revision 6965)
+++ html/includes/status-summary.inc.php	(working copy)
@@ -162,7 +162,8 @@
   $navbar['options'][$type]['text'] = nicecase($type);
   foreach (get_type_groups($type) as $group)
   {
-    $navbar['options'][$type]['suboptions'][$group['group_id']]['text'] = $group['group_name'];
+    $navbar['options'][$type]['suboptions'][$group['group_id']]['text'] = escape_html($group['group_name']);
+    $navbar['options'][$type]['suboptions'][$group['group_id']]['icon'] = $config['entities'][$group['entity_type']]['icon'];
     $navbar['options'][$type]['suboptions'][$group['group_id']]['url']  = generate_url(array('page' => 'group', 'group_id' => $group['group_id']));
   }
 }
Index: html/pages/about.inc.php
===================================================================
--- html/pages/about.inc.php	(revision 6965)
+++ html/pages/about.inc.php	(working copy)
@@ -34,10 +34,10 @@
   </table>
   </div>
 
-  <div class="well info_box">
-    <div class="title"><i class="oicon-user-detective"></i> Development Team</div>
-    <div class="content">
-        <dl class="dl-horizontal" style="margin: 0px 0px 5px 0px;">
+  <div class="widget widget-table">
+    <div class="widget-header"><i class="oicon-user-detective"></i><h3>Development Team</h3></div>
+    <div class="widget-content">
+        <dl class="dl-horizontal" style="margin: 0px 0px 5px 0px;padding:5px;">
           <dt style="text-align: left;"><i class="icon-user"></i> Adam Armstrong</dt><dd>Project Leader</dd>
           <dt style="text-align: left;"><i class="icon-user"></i> Tom Laermans</dt><dd>Committer & Developer</dd>
           <dt style="text-align: left;"><i class="icon-user"></i> Mike Stupalov</dt><dd>Committer & Developer</dd>
@@ -45,10 +45,10 @@
     </div>
   </div>
 
-  <div class="well info_box">
-    <div class="title"><i class="oicon-users"></i> Acknowledgements</div>
-    <div class="content">
-        <dl class="dl-horizontal" style="margin: 0px 0px 5px 0px;">
+  <div class="widget widget-table">
+    <div class="widget-header"><i class="oicon-users"></i><h3>Acknowledgements</h3></div>
+    <div class="widget-content">
+        <dl class="dl-horizontal" style="margin: 0px 0px 5px 0px;padding:5px;">
           <dt style="text-align: left;"><i class="icon-user"></i> Twitter</dt><dd>Bootstrap CSS Framework</dd>
           <dt style="text-align: left;"><i class="icon-user"></i> <a href="mailto:p@yusukekamiyamane.com" data-alt="p@yusukekamiyamane.com">Yusuke Kamiyamane</a></dt><dd>Fugue Iconset</dd>
           <dt style="text-align: left;"><i class="icon-user"></i> Mark James</dt><dd>Silk Iconset</dd>
@@ -64,9 +64,9 @@
         </div>
       </div>
 
-  <div class="well info_box">
-    <div class="title"><i class="oicon-chart"></i> Statistics</div>
-    <div class="content">
+  <div class="widget widget-table">
+    <div class="widget-header"><i class="oicon-chart"></i><h3>Statistics</h3></div>
+    <div class="widget-content">
 
 <?php
 $stat_devices   = dbFetchCell("SELECT COUNT(*) FROM `devices`;");
@@ -148,12 +148,12 @@
   </div>
   <div class="col-md-6">
 
-  <div class="well info_box">
-    <div class="title"><i class="oicon-notebook"></i> License</div>
-    <div class="content">
-      <pre class="small">
+  <div class="widget widget-table">
+    <div class="widget-header"><i class="oicon-notebook"></i><h3>License</h3></div>
+    <div class="widget-content">
+      <div style="padding:5px;"><pre class="small">
         <?php include($config['install_dir']."/LICENSE"); ?>
-      </pre>
+      </pre></div>
     </div>
   </div>
   </div>
Index: html/pages/alert_check.inc.php
===================================================================
--- html/pages/alert_check.inc.php	(revision 6965)
+++ html/pages/alert_check.inc.php	(working copy)
@@ -113,7 +113,7 @@
   <div class="col-md-12">
     <div class="widget">
       <div class="widget-header">
-        <i class="oicon-bell"></i> Checker Details
+        <i class="oicon-bell"></i><h3>Checker Details</h3>
 <?php
   if ($_SESSION['userlevel'] == 10) { ?>
       <div class="widget-controls">
@@ -164,7 +164,7 @@
 <div class="row">
   <div class="col-md-4">
     <div class="widget">
-      <div class="widget-header"><i class="oicon-traffic-light"></i> Check Conditions
+      <div class="widget-header"><i class="oicon-traffic-light"></i><h3>Check Conditions</h3>
 <?php
   if ($_SESSION['userlevel'] == 10) {
    ?>
@@ -188,7 +188,7 @@
 
 foreach ($conditions as $condition)
 {
-  $condition_text_block[] = $condition['metric'].' '.$condition['condition'].' '.$condition['value'];
+  $condition_text_block[] = escape_html($condition['metric'].' '.$condition['condition'].' '.$condition['value']);
 }
 echo '<table class="table table-condensed table-bordered table-striped table-rounded">';
 echo '<tr><td>';
@@ -203,7 +203,7 @@
   </div>
   <div class="col-md-8">
     <div class="widget">
-      <div class="widget-header"><i class="oicon-sql-join-left"></i> Associations
+      <div class="widget-header"><i class="oicon-sql-join-left"></i><h3>Associations</h3>
 <?php
 if ($_SESSION['userlevel'] == 10) {
 ?>
@@ -333,7 +333,7 @@
     <div class="control-group">
       <label>Device match</label>
       <div class="controls">
-        <textarea class="col-md-12" rows="4" name="assoc_device_conditions">'.htmlentities(implode("\n", $assoc_dev_text)).'</textarea>
+        <textarea class="col-md-12" rows="4" name="assoc_device_conditions">'.escape_html(implode("\n", $assoc_dev_text)).'</textarea>
       </div>
     </div>
 
@@ -340,7 +340,7 @@
     <div class="control-group">
       <label>Entity match</label>
       <div class="controls">
-        <textarea class="col-md-12" rows="4" name="assoc_entity_conditions">'.htmlentities(implode("\n", $assoc_entity_text)).'</textarea>
+        <textarea class="col-md-12" rows="4" name="assoc_entity_conditions">'.escape_html(implode("\n", $assoc_entity_text)).'</textarea>
       </div>
     </div>
   </fieldset>
@@ -408,7 +408,7 @@
     </div>
     <div class="control-group">
       <div class="controls">
-        <textarea class="col-md-12" rows="4" name="check_conditions"><?php echo(htmlentities(implode($condition_text_block, PHP_EOL))); ?></textarea>
+        <textarea class="col-md-12" rows="4" name="check_conditions"><?php echo(escape_html(implode($condition_text_block, PHP_EOL))); ?></textarea>
       </div>
     </div>
   </fieldset>
@@ -524,7 +524,7 @@
     <div class="control-group">
       <label class="control-label" for="alert_name">Alert Name</label>
       <div class="controls">
-        <input type=text name="alert_name" size="32" value="<?php echo($check['alert_name']); ?>" placeholder="Alert name"/>
+        <input type="text" name="alert_name" size="32" value="<?php echo(escape_html($check['alert_name'])); ?>" placeholder="Alert name"/>
       </div>
     </div>
 
@@ -531,7 +531,7 @@
     <div class="control-group">
       <label class="control-label" for="alert_message">Message</label>
       <div class="controls">
-        <textarea class="form-control col-md-12" name="alert_message" rows="3" placeholder="Alert message."/><?php echo(escape_html($check['alert_message'])); ?></textarea>
+        <textarea class="form-control col-md-12" name="alert_message" rows="3" placeholder="Alert message."><?php echo(escape_html($check['alert_message'])); ?></textarea>
       </div>
     </div>
 
@@ -538,7 +538,7 @@
     <div class="control-group">
       <label class="control-label" for="alert_delay">Alert Delay</label>
       <div class="controls">
-        <input type=text name="alert_delay" size="40" value="<?php echo($check['delay']); ?>" placeholder="&#8470; of checks to delay alert."/>
+        <input type="text" name="alert_delay" size="40" value="<?php echo($check['delay']); ?>" placeholder="&#8470; of checks to delay alert." />
       </div>
     </div>
 
Index: html/pages/alert_checks.inc.php
===================================================================
--- html/pages/alert_checks.inc.php	(revision 6965)
+++ html/pages/alert_checks.inc.php	(working copy)
@@ -54,6 +54,7 @@
   } else {
     $navbar['options'][$thing['entity_type']]['url'] = generate_url($vars, array('page' => 'alert_checks', 'entity_type' => $thing['entity_type']));
   }
+  $navbar['options'][$thing['entity_type']]['icon'] = $config['entities'][$thing['entity_type']]['icon'];  
   $navbar['options'][$thing['entity_type']]['text'] = escape_html(nicecase($thing['entity_type']));
 }
 
@@ -137,7 +138,8 @@
   echo '<table class="table table-condensed table-bordered table-striped table-rounded table-hover">
   <thead>
     <tr>
-    <th class="state-marker"></th><th></th>
+    <th class="state-marker"></th>
+    <th style="width: 1px;"></th>
     <th style="width: 25px">Id</th>
     <th style="width: 250px">Name</th>
     <th style="width: 40px"></th>
@@ -162,7 +164,7 @@
 
   // Print the conditions applied by this alert
 
-  echo '<td><strong>' . $check['alert_test_id'] . '</td>';
+  echo '<td><strong>' . $check['alert_test_id'] . '</strong></td>';
 
   echo '<td><strong>';
   echo '<a href="', generate_url(array('page' => 'alert_check', 'alert_test_id' => $check['alert_test_id'])), '">' . escape_html($check['alert_name']). '</a></strong><br />';
@@ -176,7 +178,7 @@
   $text_block = array();
   foreach ($check['conditions'] as $condition)
   {
-    $text_block[] = $condition['metric'].' '.$condition['condition'].' '.$condition['value'];
+    $text_block[] = escape_html($condition['metric'].' '.$condition['condition'].' '.$condition['value']);
   }
   echo('<code>'.implode($text_block,'<br />').'</code>');
   echo('</td>');
@@ -189,13 +191,13 @@
   {
 
     echo('<tr>');
-    echo('<td width="50%">');
+    echo('<td style="width: 50%">');
     if (is_array($assoc['device_attribs']))
     {
       $text_block = array();
       foreach ($assoc['device_attribs'] as $attribute)
       {
-        $text_block[] = ''.$attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value'].'';
+        $text_block[] = escape_html($attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value']);
       }
       echo('<code>'.implode($text_block,'<br />').'</code>');
     } else {
@@ -210,7 +212,7 @@
       $text_block = array();
       foreach ($assoc['entity_attribs'] as $attribute)
       {
-        $text_block[] = ''.$attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value'].'';
+        $text_block[] = escape_html($attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value']);
       }
       echo('<code>'.implode($text_block,'<br />').'</code>');
     } else {
Index: html/pages/alerts.inc.php
===================================================================
--- html/pages/alerts.inc.php	(revision 6965)
+++ html/pages/alerts.inc.php	(working copy)
@@ -37,6 +37,7 @@
   } else {
     $navbar['options'][$thing['entity_type']]['url'] = generate_url($vars, array('page' => 'alerts', 'entity_type' => $thing['entity_type']));
   }
+  $navbar['options'][$thing['entity_type']]['icon'] = $config['entities'][$thing['entity_type']]['icon'];  
   $navbar['options'][$thing['entity_type']]['text'] = escape_html(nicecase($thing['entity_type']));
 }
 
Index: html/pages/bill/edit.inc.php
===================================================================
--- html/pages/bill/edit.inc.php	(revision 6965)
+++ html/pages/bill/edit.inc.php	(working copy)
@@ -41,9 +41,9 @@
       <form id="edit" name="edit" method="post" action="<?php echo($url); ?>" class="form-horizontal">
 <div class="row">
   <div class="col-md-6">
-   <div class="well info_box">
-    <div class="title"><i class="oicon-wrench"></i> Bill Properties</div>
-    <div class="content">
+   <div class="widget">
+    <div class="widget-header"><i class="oicon-wrench"></i><h3>Bill Properties</h3></div>
+    <div class="widget-content">
         <input type="hidden" name="action" value="update_bill">
         <script type="text/javascript">
           function billType() {
@@ -133,9 +133,9 @@
 
 */ ?>
 
-   <div class="well info_box">
-     <div class="title"><i class="oicon-information"></i> Optional Information</div>
-     <div class="content">
+   <div class="widget">
+     <div class="widget-header"><i class="oicon-information"></i><h3>Optional Information</h3></div>
+     <div class="widget-content">
         <fieldset>
           <div class="control-group">
             <label class="control-label" for="bill_custid">Customer&nbsp;Reference</label>
@@ -167,9 +167,9 @@
 </form>
 
   <div class="col-md-6">
-    <div class="well info_box">
-      <div class="title"><i class="oicon-network-ethernet"></i> Bill Ports</div>
-      <div class="content">
+    <div class="widget">
+      <div class="widget-header"><i class="oicon-network-ethernet"></i><h3>Bill Ports</h3></div>
+      <div class="widget-content">
 
       <form class="form-horizontal">
         <fieldset>
@@ -218,9 +218,9 @@
     </form>
    </div>
   </div>
-  <div class="well info_box">
-    <div class="title"><i class="oicon-network-ethernet"></i> Add New Port</div>
-
+  <div class="widget">
+    <div class="widget-header"><i class="oicon-network-ethernet"></i> Add New Port</div>
+    <div class="widget-content">
     <form action="<?php echo($url); ?>" method="post" class="form-horizontal">
       <input type="hidden" name="action" value="add_bill_port" />
       <input type="hidden" name="bill_id" value="<?php echo $bill_id; ?>" />
@@ -255,5 +255,6 @@
         <button type="submit" class="btn btn-primary" name="Submit" value="Add"><i class="icon-plus-sign icon-white"></i> Add Interface</button>
       </div>
     </form>
+    </div>
   </div>
 </div>
Index: html/pages/bill/history.inc.php
===================================================================
--- html/pages/bill/history.inc.php	(revision 6965)
+++ html/pages/bill/history.inc.php	(working copy)
@@ -69,7 +69,7 @@
                    <th>Total</th>
                    <th>95th %ile</th>
                    <th style=\"text-align: center;\">Overusage</th>
-                   <th colspan=\"2\" style=\"text-align: right;\"><a class=\"btn btn-mini\" style=\"color: #555;\" href=\"".generate_url($vars, array('detail' => "all"))."\"><img src=\"images/16/chart_curve.png\" alt=\"Show details\" title=\"Show details\" /> Show all details</a></th>
+                   <th colspan=\"2\" style=\"text-align: right;\"><a class=\"btn btn-mini\" style=\"color: #555;\" href=\"".generate_url($vars, array('detail' => "all"))."\"><i class=\"oicon-chart\"></i> Show all details</a></th>
                  </tr>
                </thead>
                <tbody>");
@@ -141,7 +141,7 @@
                   <td>
                     <div class=\"btn-toolbar\" style=\"margin: 0px auto 0px auto;\">
                       <div class=\"btn-group\">
-                        <a class=\"btn btn-mini\" href=\"".$url."\"><img src=\"images/16/chart_curve.png\" data-tooltip=\"Show details\" title=\"Show details\" data-rel=\"tooltip\"/></a>");
+                        <a class=\"btn btn-mini\" href=\"".$url."\"><i class=\"oicon-chart\" title=\"Show details\"></i></a>");
                         // Don't show things people can't use!
                         //<a class=\"btn btn-mini\" disabled=\"disabled\" href=\"javascript:;\"><img src=\"images/16/page_white_acrobat.png\" data-tooltip=\"PDF Report\" title=\"PDF Report\" data-rel=\"tooltip\"/></a>
                         //<a href=\"pdf.php?type=billing&report=history&bill_id=".$bill_id."&history_id=".$history['bill_hist_id']."\"><img src=\"images/16/page_white_acrobat.png\" border=\"0\" align=\"absmiddle\" alt=\"PDF Report\" title=\"PDF Report\"/></a>
Index: html/pages/bill/infoboxes.inc.php
===================================================================
--- html/pages/bill/infoboxes.inc.php	(revision 6965)
+++ html/pages/bill/infoboxes.inc.php	(working copy)
@@ -133,9 +133,9 @@
 
 <div class="row" style="margin-bottom: 15px;">
   <div class="col-md-6">
-    <div class="well info_box">
-      <div class="title"><i class="oicon-chart"></i> Bill Summary</div>
-      <div class="content">
+    <div class="widget">
+      <div class="widget-header"><i class="oicon-chart"></i><h3>Bill Summary</h3></div>
+      <div class="widget-content">
 
         <table class="table table-striped table-bordered table-condensed table-rounded">
          <thead>
@@ -203,9 +203,9 @@
   </div>
 
   <div class="col-md-6">
-    <div class="well info_box">
-      <div class="title"><i class="oicon-information-button"></i> Bill Information</div>
-      <div class="content">
+    <div class="widget widget-table">
+      <div class="widget-header"><i class="oicon-information-button"></i><h3>Bill Information</h3></div>
+      <div class="widget-content">
         <table class="table table-striped table-bordered table-condensed table-rounded">
           <tr>
             <th style="width: 25%;">Billing period</th>
Index: html/pages/contact.inc.php
===================================================================
--- html/pages/contact.inc.php	(revision 6965)
+++ html/pages/contact.inc.php	(working copy)
@@ -79,8 +79,8 @@
 
         <table class="table table-bordered table-condensed">
           <tr><th>Transport Method</th><td><span class="label"><?php echo $contact['contact_method']?></span></td></tr>
-          <tr><th>Destination</th><td><?php echo $contact['contact_endpoint']?></td></tr>
-          <tr><th>Description</th><td><?php echo $contact['contact_descr']?></td></tr>
+          <tr><th>Destination</th><td><?php echo escape_html($contact['contact_endpoint'])?></td></tr>
+          <tr><th>Description</th><td><?php echo escape_html($contact['contact_descr'])?></td></tr>
           <tr><th>Status</th><td><?php echo ($contact['contact_disabled'] ?  '<span class="label label-error">disabled</span>' : '<span class="label label-success">enabled</span>') ?></td></tr>
         </table>
 
@@ -111,7 +111,7 @@
 
             echo('<tr><td width="40">'.$assoc['aca_id'].'</td>
                       <td width="150"><i class="'.$config['entities'][$alert_test['entity_type']]['icon'].'"></i> '.nicecase($alert_test['entity_type']).'</td>
-                      <td>'.$alert_test['alert_name'].'</td>
+                      <td>'.escape_html($alert_test['alert_name']).'</td>
                       <td width="25"><a href="'.generate_url(array('page' => 'contact', 'contact_id' => $contact['contact_id'], 'delete_contact_assoc' => $assoc['aca_id'])).'"><i class="oicon-minus-circle"></i></a></td>
                   </tr>');
 
Index: html/pages/contacts.inc.php
===================================================================
--- html/pages/contacts.inc.php	(revision 6965)
+++ html/pages/contacts.inc.php	(working copy)
@@ -53,7 +53,7 @@
     <th style="width: 100px">Method</th>
     <th style="width: 300px">Endpoint / Destination</th>
     <th>Description</th>
-    <th width="60">Used</th>
+    <th style="width: 60px">Used</th>
     <th style="width: 70px">Status</th>
     <th style="width: 30px"></th>
     </tr>
@@ -75,8 +75,8 @@
     echo '      <td></td>';
     echo '      <td>'.$contact['contact_id'].'</td>';
     echo '      <td><span class="label">'.$contact['contact_method'].'</span></td>';
-    echo '      <td><a href="' . generate_url(array('page' => 'contact', 'contact_id' => $contact['contact_id'])) . '">'.$contact['contact_endpoint'].'</a></td>';
-    echo '      <td>'.$contact['contact_descr'].'</td>';
+    echo '      <td><a href="' . generate_url(array('page' => 'contact', 'contact_id' => $contact['contact_id'])) . '">'.escape_html($contact['contact_endpoint']).'</a></td>';
+    echo '      <td>'.escape_html($contact['contact_descr']).'</td>';
     echo '      <td><span class="label label-info">'.$num_assocs.'</span></td>';
     echo '      <td>' . ($contact['contact_disabled'] ?  '<span class="label label-error">disabled</span>' : '<span class="label label-success">enabled</span>') . '</td>';
     echo '      <td><a href="#contact_del_modal_' . $contact['contact_id'] . '" data-toggle="modal"><i class="oicon-minus-circle"></i></a></td>';
Index: html/pages/deleted-ports.inc.php
===================================================================
--- html/pages/deleted-ports.inc.php	(revision 6965)
+++ html/pages/deleted-ports.inc.php	(working copy)
@@ -50,7 +50,7 @@
     echo('<tr class="list">');
     echo('<td style="width: 200px;" class="strong">'.generate_device_link($port).'</td>');
     echo('<td style="width: 350px;" class="strong">'.generate_port_link($port).'</td>');
-    echo('<td>'.htmlentities($port['ifAlias']).'</td>');
+    echo('<td>'.escape_html($port['ifAlias']).'</td>');
     echo('<td>'.formatUptime($since, 'short-2').' ago</td>');
     echo('<td style="width: 100px; text-align: right;"><a class="btn btn-danger btn-mini" href="'.generate_url(array('page'=>'deleted-ports', 'purge'=>$port['port_id'])).'" role="button"><i class="icon-remove icon-white"></i> Purge</a></td>');
     echo(PHP_EOL);
Index: html/pages/device/alert.inc.php
===================================================================
--- html/pages/device/alert.inc.php	(revision 6965)
+++ html/pages/device/alert.inc.php	(working copy)
@@ -65,9 +65,9 @@
 
 <div class="row">
   <div class="col-md-4">
-    <div class="widget">
+    <div class="widget widget-table">
       <div class="widget-header">
-        <i class="oicon-bell"></i> <h3>Alert Details</h3>
+        <i class="oicon-bell"></i><h3>Alert Details</h3>
       </div>
       <div class="widget-content">
         <table class="table table-condensed table-bordered table-striped table-rounded">
@@ -74,8 +74,8 @@
           <tbody>
             <tr><th>Type</th><td><?php echo '<i class="' . $config['entities'][$alert['entity_type']]['icon'] . '"></i> ' . nicecase($entry['entity_type']); ?></td></tr>
             <tr><th>Entity</th><td><?php echo generate_entity_link($entry['entity_type'], $entry['entity_id'], $entity['entity_name']); ?></td></tr>
-            <tr><th>Checker</th><td><a href="<?php echo generate_url(array('page' => 'alert_check', 'alert_test_id' => $alert['alert_test_id'])); ?>"><?php echo $alert['alert_name']; ?></a></td></tr>
-            <tr><th>Fail Msg</th><td><?php echo $alert['alert_message']; ?></td></tr>
+            <tr><th>Checker</th><td><a href="<?php echo generate_url(array('page' => 'alert_check', 'alert_test_id' => $alert['alert_test_id'])); ?>"><?php echo escape_html($alert['alert_name']); ?></a></td></tr>
+            <tr><th>Fail Msg</th><td><?php echo escape_html($alert['alert_message']); ?></td></tr>
           </tbody>
         </table>
       </div>
@@ -83,18 +83,18 @@
   </div>
 
   <div class="col-md-4">
-    <div class="widget">
+    <div class="widget widget-table">
       <div class="widget-header">
-        <i class="oicon-time"></i> <h3>Status</h3>
+        <i class="oicon-time"></i><h3>Status</h3>
       </div>
       <div class="widget-content">
 
         <table class="table table-condensed table-bordered table-striped table-rounded">
           <tr><th>Status</th><td><span class="<?php echo $entry['class']; ?>"><?php echo $entry['last_message']; ?></span></td></tr>
-          <tr><th>Last Checked</th><td><?php echo $entry['checked']; ?></span></td></tr>
-          <tr><th>Last Changed</th><td><?php echo $entry['changed']; ?></span></td></tr>
-          <tr><th>Last Alerted</th><td><?php echo $entry['alerted']; ?></span></td></tr>
-          <tr><th>Last Recovered</th><td><?php echo $entry['recovered']; ?></span></td></tr>
+          <tr><th>Last Checked</th><td><?php echo $entry['checked']; ?></td></tr>
+          <tr><th>Last Changed</th><td><?php echo $entry['changed']; ?></td></tr>
+          <tr><th>Last Alerted</th><td><?php echo $entry['alerted']; ?></td></tr>
+          <tr><th>Last Recovered</th><td><?php echo $entry['recovered']; ?></td></tr>
         </table>
       </div>
     </div>
@@ -101,9 +101,9 @@
   </div>
 
   <div class="col-md-4">
-    <div class="widget widget">
+    <div class="widget widget-table">
       <div class="widget-header">
-        <i class="oicon-gear"></i> <h3>Settings</h3>
+        <i class="oicon-gear"></i><h3>Settings</h3>
       </div>
       <div class="widget-content">
         <table class="table table-condensed table-bordered table-striped table-rounded">
Index: html/pages/device/alerts.inc.php
===================================================================
--- html/pages/device/alerts.inc.php	(revision 6965)
+++ html/pages/device/alerts.inc.php	(working copy)
@@ -36,6 +36,7 @@
 
   $navbar['options'][$entity_type]['url'] = generate_url(array('page' => 'device', 'device' => $device['device_id'],
                                                   'tab' => 'alerts', 'entity_type' => $entity_type));
+  $navbar['options'][$entity_type]['icon'] = $config['entities'][$entity_type]['icon'];
   $navbar['options'][$entity_type]['text'] = escape_html(nicecase($entity_type));
 }
 
@@ -55,6 +56,7 @@
 }
 
 print_navbar($navbar);
+unset($navbar);
 
 // Run actions
 
Index: html/pages/device/edit/sensors.inc.php
===================================================================
--- html/pages/device/edit/sensors.inc.php	(revision 6965)
+++ html/pages/device/edit/sensors.inc.php	(working copy)
@@ -77,7 +77,7 @@
     if (count($update_array))
     {
       dbUpdate($update_array, 'sensors', '`sensor_id` = ?', array($sensor['sensor_id']));
-      $msg = 'Sensor updated (custom): '.$sensor['sensor_class'].' '.$sensor['sensor_type'].' '.$sensor['sensor_id'].' '.htmlentities($sensor['sensor_descr']).' ';
+      $msg = 'Sensor updated (custom): '.$sensor['sensor_class'].' '.$sensor['sensor_type'].' '.$sensor['sensor_id'].' '.escape_html($sensor['sensor_descr']).' ';
       if ($update_array['sensor_limit_low']) { $msg .= '[L: '.$update_array['sensor_limit_low'].']'; }
       if ($update_array['sensor_limit_low_warn']) { $msg .= '[Lw: '.$update_array['sensor_limit_low_warn'].']'; }
       if ($update_array['sensor_limit_warn']) { $msg .= '[Hw: '.$update_array['sensor_limit_warn'].']'; }
@@ -108,6 +108,7 @@
 <table class="table table-bordered table-striped table-condensed">
   <thead>
     <tr>
+      <th class="state-marker"></th>
       <th style="width: 60px;">Index</th>
       <th style="width: 140px;">MIB Type</th>
       <th style="width: 100px;">Class</th>
@@ -144,19 +145,20 @@
     $limit_switch_class = '';
   }
 
-  echo('<tr>');
-  echo('<td style="vertical-align: middle;">'.htmlentities($sensor['sensor_index']).'</td>');
+  echo('<tr class="'.$sensor['row_class'].'">');
+  echo('<td class="state-marker"></td>');
+  echo('<td style="vertical-align: middle;">'.escape_html($sensor['sensor_index']).'</td>');
   echo('<td>'.$sensor['sensor_type'].'</td>');
   echo('<td>'.$sensor['sensor_class'].'</td>');
   echo('<td>'.escape_html($sensor['sensor_descr']).'</td>');
   echo('<td><span class="'.$sensor['state_class'].'">' . $sensor_value . $sensor['sensor_symbol'] . '</span></td>');
-  echo('<td><input class="'.$limit_class.'" name="sensors['.$sensor['sensor_id'].'][sensor_limit_low]" size="4" value="'.htmlentities($sensor['sensor_limit_low']).'" /></td>');
+  echo('<td><input class="'.$limit_class.'" name="sensors['.$sensor['sensor_id'].'][sensor_limit_low]" size="4" value="'.escape_html($sensor['sensor_limit_low']).'" /></td>');
   if ($warn_enable)
   {
-    echo('<td><input class="'.$limit_class.'" name="sensors['.$sensor['sensor_id'].'][sensor_limit_low_warn]" size="4" value="'.htmlentities($sensor['sensor_limit_low_warn']).'" /></td>');
-    echo('<td><input class="'.$limit_class.'" name="sensors['.$sensor['sensor_id'].'][sensor_limit_warn]" size="4" value="'.htmlentities($sensor['sensor_limit_warn']).'" /></td>');
+    echo('<td><input class="'.$limit_class.'" name="sensors['.$sensor['sensor_id'].'][sensor_limit_low_warn]" size="4" value="'.escape_html($sensor['sensor_limit_low_warn']).'" /></td>');
+    echo('<td><input class="'.$limit_class.'" name="sensors['.$sensor['sensor_id'].'][sensor_limit_warn]" size="4" value="'.escape_html($sensor['sensor_limit_warn']).'" /></td>');
   }
-  echo('<td><input class="'.$limit_class.'" name="sensors['.$sensor['sensor_id'].'][sensor_limit]" size="4" value="'.htmlentities($sensor['sensor_limit']).'" /></td>');
+  echo('<td><input class="'.$limit_class.'" name="sensors['.$sensor['sensor_id'].'][sensor_limit]" size="4" value="'.escape_html($sensor['sensor_limit']).'" /></td>');
   if (OBS_DEBUG)
   {
     echo('<td>'.$sensor['sensor_multiplier'].'</td>');
Index: html/pages/device/overview/alertlog.inc.php
===================================================================
--- html/pages/device/overview/alertlog.inc.php	(revision 6965)
+++ html/pages/device/overview/alertlog.inc.php	(working copy)
@@ -14,7 +14,7 @@
 ?>
   <div class="widget widget-table">
     <div class="widget-header">
-      <a href="<?php echo(generate_url(array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'logs', 'section' => 'syslog'))); ?>">
+      <a href="<?php echo(generate_url(array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'logs', 'section' => 'alertlog'))); ?>">
         <i class="oicon-bell--exclamation"></i><h3>Alert Log</h3>
       </a>
     </div>
Index: html/pages/device/overview/ports.inc.php
===================================================================
--- html/pages/device/overview/ports.inc.php	(revision 6965)
+++ html/pages/device/overview/ports.inc.php	(working copy)
@@ -48,10 +48,10 @@
 
   echo('</td></tr>
     <tr style="background-color: ' . $ports_colour . '; align: center;">
-      <td style="width: 25%; text-align: center;"><img src="images/16/connect.png" alt="" /> ' . $ports['total'] . '</td>
-      <td style="width: 25%; text-align: center;" class="green"><img src="images/16/if-connect.png" alt="" /> ' . $ports['up'] . '</td>
-      <td style="width: 25%; text-align: center;" class="red"><img src="images/16/if-disconnect.png" alt="" /> ' . $ports['down'] . '</td>
-      <td style="width: 25%; text-align: center;" class="grey"><img src="images/16/if-disable.png" alt="" /> ' . $ports['disabled'] . '</td>
+      <td style="width: 25%; text-align: center;"><i class="oicon-node-select-all" title="Total Ports"></i> ' . $ports['total'] . '</td>
+      <td style="width: 25%; text-align: center;" class="green"><i class="oicon-network-status" title="Up Ports"></i> ' . $ports['up'] . '</td>
+      <td style="width: 25%; text-align: center;" class="red"><i class="oicon-network-status-busy" title="Down Ports"></i> ' . $ports['down'] . '</td>
+      <td style="width: 25%; text-align: center;" class="grey"><i class="oicon-network-status-offline" title="Disabled Ports"></i> ' . $ports['disabled'] . '</td>
     </tr>');
 
   echo('<tr><td colspan=4 style="padding-left: 10px; font-size: 11px; font-weight: bold;">');
Index: html/pages/device/perf.inc.php
===================================================================
--- html/pages/device/perf.inc.php	(revision 6965)
+++ html/pages/device/perf.inc.php	(working copy)
@@ -59,8 +59,8 @@
 
     echo('    <tr>
       <td><strong>'.$module.'</strong></td>
-      <td width="80">'.$time.'s</td>
-      <td width="70">'.$perc.'%</td>
+      <td style="width: 80px;">'.$time.'s</td>
+      <td style="width: 70px;">'.$perc.'%</td>
     </tr>');
   }
 }
Index: html/pages/device/wifi/accesspoint.inc.php
===================================================================
--- html/pages/device/wifi/accesspoint.inc.php	(revision 6965)
+++ html/pages/device/wifi/accesspoint.inc.php	(working copy)
@@ -31,7 +31,7 @@
   foreach ($radios as $radio)
   {
     $rrdfile = get_rrd_path($device, "wifi-radio-". $radio['serial'] . '-' . $radio['radio_number'].".rrd");
-    if (file_exists($rrdfile))
+    if (is_file($rrdfile))
     {
       $iid = $id;
       echo('<tr><td>');
Index: html/pages/device/wifi/accesspoints.inc.php
===================================================================
--- html/pages/device/wifi/accesspoints.inc.php	(revision 6965)
+++ html/pages/device/wifi/accesspoints.inc.php	(working copy)
@@ -35,7 +35,7 @@
     echo('<tr><td>');
     echo('<h4><a href="'. generate_url(array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'wifi', 'view' => 'accesspoint', 'accesspoint' => $accesspoint['wifi_accesspoint_id'])).'">' . $accesspoint['name'] .'</a></h4>');
 
-    echo($accesspoint['ap_number'].'</td><td>'.$accesspoint['model'].'</td><td>'.$accesspoint['location'].'</td><td>'.$accesspoint['serial'].'</br>'.$accesspoint['fingerprint']);
+    echo($accesspoint['ap_number'].'</td><td>'.$accesspoint['model'].'</td><td>'.$accesspoint['location'].'</td><td>'.$accesspoint['serial'].'<br />'.$accesspoint['fingerprint']);
 
     echo('</td></tr>');
   }
Index: html/pages/device/wifi/overview.inc.php
===================================================================
--- html/pages/device/wifi/overview.inc.php	(revision 6965)
+++ html/pages/device/wifi/overview.inc.php	(working copy)
@@ -24,8 +24,8 @@
 
   echo('<table class="table table-striped table-bordered table-condensed table-rounded">');
   echo('<tr><td style="width: 350px;">');
-  echo("<span>" . count($aps_ids) . " APs</span><br /><span>" . count($radios) . " radios</span></br>");
-  echo('</td><td><span>Models: ' . implode(", ",$models) .'</span></br><span>Sites: ' . implode(", ",$locations) . '</span></td>');
+  echo("<span>" . count($aps_ids) . " APs</span><br /><span>" . count($radios) . " radios</span><br />");
+  echo('</td><td><span>Models: ' . implode(", ",$models) .'</span><br /><span>Sites: ' . implode(", ",$locations) . '</span></td>');
   //  echo('<td><span>'. $radios[0]['serial'] ." </span></br><span>" . $radios[0]['fingerprint']. "</span></td></tr>");
   echo("</table>");
 }
Index: html/pages/devices.inc.php
===================================================================
--- html/pages/devices.inc.php	(revision 6965)
+++ html/pages/devices.inc.php	(working copy)
@@ -229,8 +229,7 @@
 
   $where_graphs = ' WHERE 1 ' . implode('', $where_graphs);
 
-  $query  = 'SELECT `graph` FROM `device_graphs`
-             LEFT JOIN `devices` ON `devices`.`device_id` = `device_graphs`.`device_id`';
+  $query  = 'SELECT `graph` FROM `device_graphs` LEFT JOIN `devices` USING (`device_id`)';
   $query .= $where_graphs . $query_permitted . ' AND `device_graphs`.`enabled` = 1 GROUP BY `graph`';
 
   foreach (dbFetchColumn($query) as $option)
Index: html/pages/edituser.inc.php
===================================================================
--- html/pages/edituser.inc.php	(revision 6965)
+++ html/pages/edituser.inc.php	(working copy)
@@ -114,7 +114,7 @@
       header('Location: '.$config['base_url']);
       dbInsert(array('user' => $_SESSION['origusername'], 'address' => $_SERVER["REMOTE_ADDR"], 'result' => 'Became ' . $_SESSION['username']), 'authlog');
 
-      include("includes/authenticate.inc.php");
+      include($config['html_dir']."/includes/authenticate.inc.php");
     }
 
     if ($vars['action'] == "perm_del")
@@ -195,7 +195,7 @@
   <div class="row">
     <div class="col-md-4">
       <div class="well">
-        <h2>Device Permissions</h2>
+        <h3>Device Permissions</h3>
 
 <?php
 
@@ -218,7 +218,7 @@
         $del_url = generate_url(array('page'=>'edituser', 'action'=>'perm_del', 'user_id'=>$vars['user_id'], 'entity_type'=>'device', 'entity_id'=>$device_id));
 
         echo '            <div class="btn-group" style="margin-bottom: 5px;">';
-        echo '              <button class="btn btn-danger" onclick="location.href=\''.$del_url.'\';"><i class="icon-minus-sign icon-white"></i> Delete</button>';
+        echo '              <button class="btn btn-danger" onclick="location.href=\''.$del_url.'\';"><i class="icon-remove icon-white"></i></button>';
         echo '              '.$devicebtn;
         echo '            </div><br />';
 
@@ -226,7 +226,7 @@
         $permdone = "yes";
       }
     } else {
-      echo('<div class="alert alert-danger">No permissions</div>');
+      print_warning('No Permissions');
     }
 ?>
 
@@ -236,7 +236,7 @@
     <form method="post" action="">
             <input type="hidden" name="action" value="perm_add">
             <input type="hidden" name="entity_type" value="device">
-            <select name="entity_id[]" class="selectpicker" data-width="60%" multiple>
+            <select multiple name="entity_id[]" class="selectpicker" data-selected-text-format="count>2" data-live-search="true" data-width="180px" data-size="20">
 
 <?php
 
@@ -259,7 +259,7 @@
     </div>
     <div class="col-md-4">
       <div class="well">
-        <h2>Port Permissions</h2>
+        <h3>Port Permissions</h3>
 
 <?php
 
@@ -284,7 +284,7 @@
       $del_url = generate_url(array('page'=>'edituser', 'action'=>'perm_del', 'user_id'=>$vars['user_id'], 'entity_type'=>'port', 'entity_id'=>$entity_id));
 
       echo '            <div class="btn-group" style="margin: 5px;">';
-      echo '              <button class="btn btn-danger" onclick="location.href=\''.$del_url.'\';"><i class="icon-minus-sign icon-white"></i> Delete</button>';
+      echo '              <button class="btn btn-danger" onclick="location.href=\''.$del_url.'\';"><i class="icon-remove icon-white"></i></button>';
       echo '              '.$devicebtn;
       echo '              '.$portbtn;
       echo '            </div>';
@@ -291,7 +291,7 @@
 
     }
    } else {
-    echo('<div class="alert alert-danger">No permissions</div>');
+    print_warning('No Permissions');
    }
 
 ?>
@@ -308,7 +308,7 @@
         <input type='hidden' name='entity_type' value='port'>
         <input type='hidden' name='action' value='perm_add'>
 
-        <select class='selectpicker' data-width='40%' id='device_id' name='device_id' onchange='getInterfaceList(this, \"port_entity_id\")'>
+        <select class='selectpicker' data-selected-text-format=\"count>2\" data-live-search=\"true\" data-width=\"150px\" data-size=\"20\" id='device_id' name='device_id' onchange='getInterfaceList(this, \"port_entity_id\")'>
           <option value=''>Select a device</option>");
 
     foreach ($cache['devices']['hostname'] as $hostname => $device_id)
@@ -321,7 +321,7 @@
 ?>
 
        </select>
-       <select class="selectpicker" id='port_entity_id' name='entity_id[]' data-width="40%" multiple>
+       <select multiple class="selectpicker" id='port_entity_id' name='entity_id[]' data-selected-text-format="count>2" data-live-search="true" data-width="150px" data-size="20">
        </select>
        <button class="btn pull-right" type="submit" name="Submit" value="Add"><i class="oicon-plus-circle"></i> Add</button>
     </form>
@@ -350,12 +350,12 @@
 
       $devicebtn = '<button class="btn"><i class="oicon-servers"></i> '.generate_device_link($device).'</button>';
 
-      $portbtn = '<button class="btn">'.generate_entity_link('sensor', $sensor).'</button>';
+      $portbtn = '<button class="btn"><i class="'.$config['sensor_types'][$sensor['sensor_class']]['icon'].'"></i> '.generate_entity_link('sensor', $sensor).'</button>';
 
       $del_url = generate_url(array('page'=>'edituser', 'action'=>'perm_del', 'user_id'=>$vars['user_id'], 'entity_type'=>'sensor', 'entity_id'=>$entity_id));
 
       echo '            <div class="btn-group" style="margin: 5px;">';
-      echo '              <button class="btn btn-danger" onclick="location.href=\''.$del_url.'\';"><i class="icon-minus-sign icon-white"></i> Delete</button>';
+      echo '              <button class="btn btn-danger" onclick="location.href=\''.$del_url.'\';"><i class="icon-remove icon-white"></i></button>';
       echo '              '.$devicebtn;
       echo '              '.$portbtn;
       echo '            </div>';
@@ -362,12 +362,12 @@
 
     }
    } else {
-    echo('<div class="alert alert-danger">No permissions</div>');
+    print_warning('No Permissions');
    }
 
 ?>
 
-
+    <hr />
         <h3>Grant new sensor permissions</h3>
 
 <?php
@@ -379,7 +379,7 @@
         <input type='hidden' name='entity_type' value='sensor'>
         <input type='hidden' name='action' value='perm_add'>
 
-        <select class='selectpicker' data-width='40%' id='device_id' name='device_id' onchange='getEntityList(this, \"entity_id\", \"sensor\")'>
+        <select class='selectpicker' data-selected-text-format=\"count>2\" data-live-search=\"true\" data-width=\"150px\" data-size=\"20\" id='device_id' name='device_id' onchange='getEntityList(this, \"entity_id\", \"sensor\")'>
           <option value=''>Select a device</option>");
 
     foreach ($cache['devices']['hostname'] as $hostname => $device_id)
@@ -399,11 +399,11 @@
       </div>
     </div>
 
-
-
+</div>
+  <div class="row">
     <div class="col-md-4">
       <div class="well">
-        <h2>Bill Permissions</h2>
+        <h3>Bill Permissions</h3>
 
 <?php
 
@@ -419,7 +419,7 @@
       $del_url = generate_url(array('page'=>'edituser', 'action'=>'perm_del', 'user_id'=>$vars['user_id'], 'entity_type'=>'bill', 'entity_id'=>$entity_id));
 
       echo '            <div class="btn-group" style="margin-bottom: 5px;">';
-      echo '              <button class="btn btn-danger" onclick="location.href=\''.$del_url.'\';"><i class="icon-minus-sign icon-white"></i> Delete</button>';
+      echo '              <button class="btn btn-danger" onclick="location.href=\''.$del_url.'\';"><i class="icon-remove icon-white"></i></button>';
       echo '              '.$button;
       echo '            </div>';
 
@@ -428,7 +428,7 @@
       $bpermdone = TRUE;
     }
   } else {
-    echo('<div class="alert alert-danger">No permissions</div>');
+    print_warning('No Permissions');
   }
 
 ?>
Index: html/pages/group.inc.php
===================================================================
--- html/pages/group.inc.php	(revision 6965)
+++ html/pages/group.inc.php	(working copy)
@@ -111,7 +111,7 @@
 <div class="row">
   <div class="col-md-5">
     <div class="widget">
-      <div class="widget-header"><i class="oicon-category"></i> Group Details
+      <div class="widget-header"><i class="oicon-category"></i><h3>Group Details</h3>
         <div class="widget-controls">
           <a href="#edit_group_modal" data-toggle="modal"><i class="oicon-gear--edit"></i> Edit</a>
           <a href="#delete_group_modal" data-toggle="modal"><i class="oicon-minus-circle"></i> Delete</a>
@@ -135,7 +135,7 @@
           <tr>
             <td>', $group['group_id'], '</td>
             <td><i class="', $entity_type['icon'], '"></i> ', nicecase($group['entity_type']), '</td>
-            <td><strong>', $group['group_name'], '</strong><br /><i>', $group['group_descr'], '</i></td>
+            <td><strong>', escape_html($group['group_name']), '</strong><br /><i>', escape_html($group['group_descr']), '</i></td>
             <td><span class="badge badge-info" style="float:right;">', $group['member_count'], '</span></td>
           </tr>
         </tbody>
@@ -148,7 +148,7 @@
 
   <div class="col-md-7">
     <div class="widget">
-      <div class="widget-header"><i class="oicon-sql-join-left"></i> Associations
+      <div class="widget-header"><i class="oicon-sql-join-left"></i><h3>Associations</h3>
         <div class="widget-controls">
           <a href="#add_assoc_modal" data-toggle="modal"><i class="oicon-plus-circle"></i> Add</a>
         </div>
@@ -177,9 +177,9 @@
   {
     foreach ($assoc['device_attribs'] as $attribute)
     {
-      echo($attribute['attrib'].' ');
-      echo($attribute['condition'].' ');
-      echo($attribute['value']);
+      echo(escape_html($attribute['attrib']).' ');
+      echo(escape_html($attribute['condition']).' ');
+      echo(escape_html($attribute['value']));
       echo('<br />');
       $assoc_dev_text[] = $attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value'];
     }
@@ -196,9 +196,9 @@
   {
     foreach ($assoc['entity_attribs'] as $attribute)
     {
-      echo($attribute['attrib'].' ');
-      echo($attribute['condition'].' ');
-      echo($attribute['value']);
+      echo(escape_html($attribute['attrib']).' ');
+      echo(escape_html($attribute['condition']).' ');
+      echo(escape_html($attribute['value']));
       echo('<br />');
       $assoc_entity_text[] = $attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value'];
     }
@@ -272,7 +272,7 @@
     <div class="control-group">
       <label>Device match</label>
       <div class="controls">
-        <textarea class="col-md-12" rows="4" name="assoc_device_conditions"><?php echo(htmlentities(implode("\n", $assoc_dev_text))); ?></textarea>
+        <textarea class="col-md-12" rows="4" name="assoc_device_conditions"><?php echo(escape_html(implode("\n", $assoc_dev_text))); ?></textarea>
       </div>
     </div>
 
@@ -279,7 +279,7 @@
     <div class="control-group">
       <label>Entity match</label>
       <div class="controls">
-        <textarea class="col-md-12" rows="4" name="assoc_entity_conditions"><?php echo(htmlentities(implode("\n", $assoc_entity_text))); ?></textarea>
+        <textarea class="col-md-12" rows="4" name="assoc_entity_conditions"><?php echo(escape_html(implode("\n", $assoc_entity_text))); ?></textarea>
       </div>
     </div>
   </fieldset>
@@ -308,7 +308,7 @@
 
   // Build group-specific navbar
 
-  $navbar = array('brand' => $group['group_name'], 'class' => "navbar-narrow");
+  $navbar = array('brand' => escape_html($group['group_name']), 'class' => "navbar-narrow");
 
   $navbar['options']['basic']     = array('text' => 'Basic');
   $navbar['options']['eventlog']     = array('text' => 'Event Log');
@@ -404,9 +404,16 @@
     case "port":
 
       echo('<table class="table table-condensed table-bordered table-striped table-rounded table-hover">');
+      echo(pagination($vars, $group['member_count']));
+
+      if ($vars['pageno'])
+      {
+        $members = array_chunk($members, $vars['pagesize']);
+        $members = $members[$vars['pageno']-1];
+      }
+      
       foreach ($members as $member)
       {
-
         // Get the entity array using the cache
         $entity = get_entity_by_id_cache($member['entity_type'], $member['entity_id']);
 
@@ -417,10 +424,12 @@
 
       }
       echo('</table>');
+      echo(pagination($vars, $group['member_count']));
     break;
 
     case "device":
       echo('<table class="table table-condensed table-bordered table-striped table-rounded table-hover">');
+
       foreach ($members as $member)
       {
         // Get the entity array using the cache
@@ -427,6 +436,7 @@
         $entity = get_entity_by_id_cache($member['entity_type'], $member['entity_id']);
         print_device_row($entity, $vars);
       }
+
       echo('</table>');
       break;
 
@@ -540,7 +550,7 @@
 
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="myModalLabel"><i class="oicon-minus-circle"></i> Delete Group <?php echo($group['group_name']); ?></h3>
+    <h3 id="myModalLabel"><i class="oicon-minus-circle"></i> Delete Group <?php echo(escape_html($group['group_name'])); ?></h3>
   </div>
   <div class="modal-body">
 
@@ -589,7 +599,7 @@
  <form id="add_assoc" name="add_assoc" method="post" class="form" action="">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="add_assoc_label"><i class="oicon-sql-join-inner"></i> Edit Association Conditions</h3>
+    <h3 id="add_assoc_label"><i class="oicon-sql-join-inner"></i> Add Association Conditions</h3>
   </div>
   <div class="modal-body">
 
@@ -638,7 +648,7 @@
     <div class="control-group">
       <label class="control-label" for="group_name">Group Name</label>
       <div class="controls">
-        <input type=text name="group_name" size="32" disabled value="<?php echo($group['group_name']); ?>" placeholder="group name"/>
+        <input type="text" name="group_name" size="32" disabled="disabled" value="<?php echo(escape_html($group['group_name'])); ?>" placeholder="group name"/>
       </div>
     </div>
 
Index: html/pages/group_add.inc.php
===================================================================
--- html/pages/group_add.inc.php	(revision 6965)
+++ html/pages/group_add.inc.php	(working copy)
@@ -96,9 +96,9 @@
 
 <div class="row">
   <div class="col-md-6">
-    <div class="well info_box">
-      <div class="title"><i class="oicon-bell"></i> Group Details</div>
-      <div class="content">
+    <div class="widget">
+      <div class="widget-header"><i class="oicon-bell"></i><h3>Group Details</h3></div>
+      <div class="widget-content">
   <fieldset>
   <div class="control-group">
     <label class="control-label" for="entity_type">Entity Type</label>
@@ -156,10 +156,11 @@
   </div> <!-- col -->
 
  <div class="col-md-6">
-    <div class="well info_box">
-      <div class="title"><i class="oicon-sql-join-left"></i> Initial Associations</div>
-      <div class="title" style="float: right; margin-bottom: -10px;"><a href="#" onclick="return false;" class="tooltip-from-element" data-tooltip-id="tooltip-help-associations"><i class="oicon-question"></i></a></div>
-      <div class="content">
+    <div class="widget">
+      <div class="widget-header"><i class="oicon-sql-join-left"></i><h3>Initial Associations</h3>
+      <div class="widget-controls"><a href="#" onclick="return false;" class="tooltip-from-element" data-tooltip-id="tooltip-help-associations"><i class="oicon-question"></i></a></div>
+      </div>
+      <div class="widget-content">
         <div class="control-group">
           <label>Device Association</label>
       <?php
Index: html/pages/groups.inc.php
===================================================================
--- html/pages/groups.inc.php	(revision 6965)
+++ html/pages/groups.inc.php	(working copy)
@@ -120,8 +120,8 @@
   //echo '</strong></td>';
 
   echo '<td><strong>';
-  echo '<a href="', generate_url(array('page' => 'group', 'group_id' => $group['group_id'])), '">' . $group['group_name']. '</a></strong><br />';
-  echo '<i>',$group['group_descr'],'</i>';
+  echo '<a href="', generate_url(array('page' => 'group', 'group_id' => $group['group_id'])), '">' . escape_html($group['group_name']). '</a></strong><br />';
+  echo '<i>',escape_html($group['group_descr']),'</i>';
   echo '</td>';
 
   // Print the count of entities this alert applies to and a popup containing a list and Print breakdown of entities by status.
@@ -146,7 +146,7 @@
       $text_block = array();
       foreach ($assoc['device_attribs'] as $attribute)
       {
-        $text_block[] = ''.$attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value'].'';
+        $text_block[] = escape_html($attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value']);
       }
       echo('<code>'.implode($text_block,'<br />').'</code>');
     } else {
@@ -161,7 +161,7 @@
       $text_block = array();
       foreach ($assoc['entity_attribs'] as $attribute)
       {
-        $text_block[] = ''.$attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value'].'';
+        $text_block[] = escape_html($attribute['attrib'].' '.$attribute['condition'].' '.$attribute['value']);
       }
       echo('<code>'.implode($text_block,'<br />').'</code>');
 
Index: html/pages/health.inc.php
===================================================================
--- html/pages/health.inc.php	(revision 6965)
+++ html/pages/health.inc.php	(working copy)
@@ -77,13 +77,13 @@
   if ($group['group_id'] == $vars['group'] || in_array($group['group_id'], $vars['group']) )
   {
     $navbar['options']['group']['class'] = 'active';
-    $navbar['options']['group']['text'] .= " (".$group['group_name'].')';
+    $navbar['options']['group']['text'] .= ' ('.escape_html($group['group_name']).')';
     $navbar['options']['group']['suboptions'][$group['group_id']]['url'] = generate_url($vars, array('group' => NULL));
     $navbar['options']['group']['suboptions'][$group['group_id']]['class'] = 'active';
   } else {
     $navbar['options']['group']['suboptions'][$group['group_id']]['url'] = generate_url($vars, array('group' => $group['group_id']));
   }
-  $navbar['options']['group']['suboptions'][$group['group_id']]['text'] = $group['group_name'];
+  $navbar['options']['group']['suboptions'][$group['group_id']]['text'] = escape_html($group['group_name']);
 }
 
 $navbar['options']['graphs']['text']  = 'Graphs';
Index: html/pages/locations.inc.php
===================================================================
--- html/pages/locations.inc.php	(revision 6965)
+++ html/pages/locations.inc.php	(working copy)
@@ -48,7 +48,7 @@
     $hostalerts = dbFetchCell("SELECT COUNT(device_id) FROM devices AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = ? AND location = ? AND status = '0'", array($_SESSION['user_id'], $location));
   }
 
-  if ($hostalerts) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
+  if ($hostalerts) { $alert = '<i class="oicon-exclamation-red"></i>'; } else { $alert = ""; }
 
   if ($location === '') { $location = OBS_VAR_UNSET; }
   $value = var_encode($location);
Index: html/pages/search.inc.php
===================================================================
--- html/pages/search.inc.php	(revision 6965)
+++ html/pages/search.inc.php	(working copy)
@@ -45,7 +45,8 @@
     include($config['html_dir'].'/pages/search/'.$vars['search'].'.inc.php');
     break;
   default:
-    echo("<h2>Error. Please report this to observium developers.</h2>");
+      print_error("<h4>Error</h4>
+               This should not happen. Please ensure you are on the latest release and then report this to the Observium developers if it continues.");
     break;
 }