diff --git a/html/pages/device/collectd.inc.php b/html/pages/device/collectd.inc.php
index 84e61c8ff..af533292c 100644
--- a/html/pages/device/collectd.inc.php
+++ b/html/pages/device/collectd.inc.php
@@ -42,17 +42,8 @@ function dhtml_response_list(&$items, $method) {
 	print("</response>");
 }
 
+print_optionbar_start();
 
-echo("<div style='margin:auto; text-align: center; margin-top: 0px; margin-bottom: 10px;'>
-  <b class='rounded'>
-  <b class='rounded1'></b>
-  <b class='rounded2'></b>
-  <b class='rounded3'></b>
-  <b class='rounded4'></b>
-  <b class='rounded5'></b></b>
-  <div class='roundedfg' style='padding: 0px 5px;'>
-  <div style='margin: auto; text-align: left; padding: 2px 5px; padding-left: 11px; clear: both; display:block; height:20px;'>
-");
     $plugins = collectd_list_plugins($device['hostname']);
     foreach ($plugins as &$plugin) {
        if(!$_GET['opta']) { $_GET['opta'] = $plugin; }
@@ -64,16 +55,7 @@ echo("<div style='margin:auto; text-align: center; margin-top: 0px; margin-botto
     }
     unset ($sep);
 
-echo("</div>
-</div>
-  <b class='rounded'>
-  <b class='rounded5'></b>
-  <b class='rounded4'></b>
-  <b class='rounded3'></b>
-  <b class='rounded2'></b>
-  <b class='rounded1'></b></b>
-</div>");
-
+print_optionbar_end();
 
     $pinsts = collectd_list_pinsts($device['hostname'], $_GET['opta']);
     foreach ($pinsts as &$instance) {
diff --git a/html/pages/device/syslog.inc.php b/html/pages/device/syslog.inc.php
index 7e55be60a..b423c5abf 100644
--- a/html/pages/device/syslog.inc.php
+++ b/html/pages/device/syslog.inc.php
@@ -1,12 +1,9 @@
-<div style='margin:auto; text-align: center; margin-top: 0px; margin-bottom: 5px;'>
-  <b class='rounded'>
-  <b class='rounded1'></b>
-  <b class='rounded2'></b>
-  <b class='rounded3'></b>
-  <b class='rounded4'></b>
-  <b class='rounded5'></b></b>
-  <div class='roundedfg' style='padding: 0px 5px;'>
-  <div style='margin: auto; text-align: left; padding: 5px 5px; padding-left: 11px; clear: both; display:block;'>
+<?php 
+
+print_optionbar_start(); 
+
+?>
+
   <form method="post" action="">
   <label><strong>Search</strong>
     <input type="text" name="string" id="string" value="<?php  echo($_POST['string']); ?>" />
@@ -25,23 +22,14 @@
       ?>
     </select>
   </label>
-
   <input type=submit value=Search>
-
 </form>
-</div>
-</div>
-  <b class='rounded'>
-  <b class='rounded5'></b>
-  <b class='rounded4'></b>
-  <b class='rounded3'></b>
-  <b class='rounded2'></b>
-  <b class='rounded1'></b></b>
-</div>
-
 
 <?php
 
+print_optionbar_end();
+
+
 if($_POST['string']) {
   $where = " AND msg LIKE '%".$_POST['string']."%'";
 }