diff --git a/html/pages/device/logs/syslog.inc.php b/html/pages/device/logs/syslog.inc.php
index 534c19a4fd..c3abdad808 100644
--- a/html/pages/device/logs/syslog.inc.php
+++ b/html/pages/device/logs/syslog.inc.php
@@ -42,10 +42,14 @@ if ($_POST['program'])
 
 $sql =  "SELECT *, DATE_FORMAT(timestamp, '%Y-%m-%d %T') AS date from syslog WHERE device_id = ? $where";
 $sql .= " ORDER BY timestamp DESC LIMIT 1000";
-echo("<table cellspacing=0 cellpadding=2 width=100%>");
+echo('      <div class="panel panel-default panel-condensed">
+              <div class="panel-heading">
+                <strong>Eventlog entries</strong>
+              </div>
+              <table class="table table-hover table-condensed table-striped">');
 foreach (dbFetchRows($sql, $param) as $entry) { include("includes/print-syslog.inc.php"); }
-echo("</table>");
-
+echo('        </table>
+            </div>');
 $pagetitle[] = "Syslog";
 
 ?>
diff --git a/html/pages/front/default.php b/html/pages/front/default.php
index 69c6f6f489..ce172ca870 100644
--- a/html/pages/front/default.php
+++ b/html/pages/front/default.php
@@ -135,13 +135,24 @@ echo('
 
 if ($config['enable_syslog'])
 {
-  echo("<div class=front-syslog>
-    <h3>Recent Syslog Messages</h3>
-  ");
 
   $sql = "SELECT *, DATE_FORMAT(timestamp, '%D %b %T') AS date from syslog ORDER BY timestamp DESC LIMIT 20";
   $query = mysql_query($sql);
-  echo('<table class="table table-bordered">');
+
+  echo('<div class="container-fluid">
+          <div class="row">
+            <div class="col-md-12">
+              &nbsp;
+            </div>
+          </row>
+          <row>
+            <div class="col-md-12">
+              <div class="panel panel-default panel-condensed">
+              <div class="panel-heading">
+                <strong>Syslog entries</strong>
+              </div>
+              <table class="table table-hover table-condensed table-striped">');
+
   while ($entry = mysql_fetch_assoc($query))
   {
     $entry = array_merge($entry, device_by_id_cache($entry['device_id']));
@@ -150,6 +161,9 @@ if ($config['enable_syslog'])
   }
   echo("</table>");
   echo("</div>");
+  echo("</div>");
+  echo("</div>");
+  echo("</div>");
 
 } else {
   echo("<div class=front-eventlog>
diff --git a/html/pages/syslog.inc.php b/html/pages/syslog.inc.php
index 8f32498e67..ed2d098116 100644
--- a/html/pages/syslog.inc.php
+++ b/html/pages/syslog.inc.php
@@ -89,13 +89,20 @@ if ($_SESSION['userlevel'] >= '5')
   $array = array_merge(array($_SESSION['user_id']), $array);
 }
 
-echo("<table cellspacing=0 cellpadding=2 width=100%>");
+echo('<div class="panel panel-default panel-condensed">
+              <div class="panel-heading">
+                <strong>Eventlog entries</strong>
+              </div>
+              <table class="table table-hover table-condensed table-striped">');
+
 foreach (dbFetchRows($sql, $array) as $entry)
 {
   $entry = array_merge($entry, device_by_id_cache($entry['device_id']));
 
   include("includes/print-syslog.inc.php");
 }
-echo("</table>");
+
+echo("</table>
+</div>");
 
 ?>