diff --git a/html/pages/device/apps/drbd.inc.php b/html/pages/device/apps/drbd.inc.php
index 842e27440c..2d551d03f1 100644
--- a/html/pages/device/apps/drbd.inc.php
+++ b/html/pages/device/apps/drbd.inc.php
@@ -16,11 +16,14 @@ foreach ($graphs as $key => $text) {
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
 
-    echo '<h3>'.$text.'</h3>';
-
-    echo "<tr bgcolor='$row_colour'><td colspan=5>";
-
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }
diff --git a/html/pages/device/apps/mailscanner.inc.php b/html/pages/device/apps/mailscanner.inc.php
index 5a6bd6f340..c21a2dfd76 100644
--- a/html/pages/device/apps/mailscanner.inc.php
+++ b/html/pages/device/apps/mailscanner.inc.php
@@ -16,10 +16,14 @@ foreach ($graphs as $key => $text) {
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
 
-    echo '<h3>'.$text.'</h3>';
-    echo "<tr bgcolor='$row_colour'><td colspan=5>";
-
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }
diff --git a/html/pages/device/apps/memcached.inc.php b/html/pages/device/apps/memcached.inc.php
index d17b23d53b..05a6a2df33 100644
--- a/html/pages/device/apps/memcached.inc.php
+++ b/html/pages/device/apps/memcached.inc.php
@@ -19,11 +19,14 @@ foreach ($graphs as $key => $text) {
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
 
-    echo '<h3>'.$text.'</h3>';
-
-    echo "<tr bgcolor='$row_colour'><td colspan=5>";
-
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }
diff --git a/html/pages/device/apps/mysql.inc.php b/html/pages/device/apps/mysql.inc.php
index 8514987876..ac2aaf1ef0 100644
--- a/html/pages/device/apps/mysql.inc.php
+++ b/html/pages/device/apps/mysql.inc.php
@@ -70,11 +70,15 @@ foreach ($graphs[$vars['app_section']] as $key => $text) {
     $graph_array['to']     = $config['time']['now'];
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
-    echo '<h3>'.$text.'</h3>';
-
-    echo "<tr bgcolor='$row_colour'><td colspan=5>";
-
+    
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }
diff --git a/html/pages/device/apps/nginx.inc.php b/html/pages/device/apps/nginx.inc.php
index f78ba4d1b1..bab1738f08 100644
--- a/html/pages/device/apps/nginx.inc.php
+++ b/html/pages/device/apps/nginx.inc.php
@@ -14,11 +14,15 @@ foreach ($graphs as $key => $text) {
     $graph_array['to']     = $config['time']['now'];
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
-    echo '<h3>'.$text.'</h3>';
-
-    echo "<tr bgcolor='$row_colour'><td colspan=5>";
 
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }
diff --git a/html/pages/device/apps/ntp-client.inc.php b/html/pages/device/apps/ntp-client.inc.php
index 11980b4207..e00d777e8b 100644
--- a/html/pages/device/apps/ntp-client.inc.php
+++ b/html/pages/device/apps/ntp-client.inc.php
@@ -14,10 +14,15 @@ foreach ($graphs as $key => $text) {
     $graph_array['to']     = $config['time']['now'];
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
-    echo '<h3>'.$text.'</h3>';
-    echo "<tr bgcolor='$row_colour'><td colspan=5>";
-
+    
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }
diff --git a/html/pages/device/apps/ntpd-server.inc.php b/html/pages/device/apps/ntpd-server.inc.php
index 1b4adaf866..018fefeed5 100644
--- a/html/pages/device/apps/ntpd-server.inc.php
+++ b/html/pages/device/apps/ntpd-server.inc.php
@@ -19,10 +19,15 @@ foreach ($graphs as $key => $text) {
     $graph_array['to']     = $config['time']['now'];
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
-    echo '<h3>'.$text.'</h3>';
-    echo "<tr bgcolor='$row_colour'><td colspan=5>";
 
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }
diff --git a/html/pages/device/apps/powerdns.inc.php b/html/pages/device/apps/powerdns.inc.php
index 774b9af2a6..a83aa424d8 100644
--- a/html/pages/device/apps/powerdns.inc.php
+++ b/html/pages/device/apps/powerdns.inc.php
@@ -20,11 +20,14 @@ foreach ($graphs as $key => $text) {
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
 
-    echo '<h3>'.$text.'</h3>';
-
-    echo "<tr bgcolor='$row_colour'><td colspan=5>";
-
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }
diff --git a/html/pages/device/apps/shoutcast.inc.php b/html/pages/device/apps/shoutcast.inc.php
index b5deb39eb8..f2aadc7f18 100644
--- a/html/pages/device/apps/shoutcast.inc.php
+++ b/html/pages/device/apps/shoutcast.inc.php
@@ -30,12 +30,17 @@ if (isset($total) && $total === true) {
         $graph_array['to']     = $config['time']['now'];
         $graph_array['id']     = $app['app_id'];
         $graph_array['type']   = 'application_'.$key;
-        echo '<h3>'.$text.'</h3>';
-        echo "<tr bgcolor='$row_colour'><td colspan=5>";
 
+        echo '<div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">'.$text.'</h3>
+        </div>
+        <div class="panel-body">
+        <div class="row">';
         include 'includes/print-graphrow.inc.php';
-
-        echo '</td></tr>';
+        echo '</div>';
+        echo '</div>';
+        echo '</div>';
     }
 }
 
diff --git a/html/pages/device/apps/tinydns.inc.php b/html/pages/device/apps/tinydns.inc.php
index cae6c66912..94bc7f1a43 100644
--- a/html/pages/device/apps/tinydns.inc.php
+++ b/html/pages/device/apps/tinydns.inc.php
@@ -39,7 +39,15 @@ foreach ($graphs as $key => $text) {
     $graph_array['to']     = $config['time']['now'];
     $graph_array['id']     = $app['app_id'];
     $graph_array['type']   = 'application_'.$key;
-    echo "<h3>$text</h3><tr bgcolor='$row_colour'><td colspan=5>";
+    
+    echo '<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">'.$text.'</h3>
+    </div>
+    <div class="panel-body">
+    <div class="row">';
     include 'includes/print-graphrow.inc.php';
-    echo '</td></tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }