diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php
index 74c1e779..ead0cf84 100644
--- a/src/psm/Module/Server/Controller/ServerController.class.php
+++ b/src/psm/Module/Server/Controller/ServerController.class.php
@@ -273,16 +273,11 @@ class ServerController extends AbstractServerController {
 				'label' => $server_available['label'],
 			);
 		}
+		$this->tpl->addTemplateDataRepeat($this->getTemplateId(), 'options', $options);
+
 		$sidebar = new \psm\Util\Module\Sidebar($this->tpl);
 		$this->setSidebar($sidebar);
 
-		$sidebar->addDropdown(
-			'server',
-			$server['label'],
-			$options,
-			'th', 'success'
-		);
-
 		// check which module the user came from, and add a link accordingly
 		$back_to = isset($_GET['back_to']) && $_GET['back_to'] == 'server_status' ? $_GET['back_to'] : 'server';
 		$sidebar->addButton(
diff --git a/src/templates/main_sidebar.tpl.html b/src/templates/main_sidebar.tpl.html
index 897f8820..c5defbc5 100755
--- a/src/templates/main_sidebar.tpl.html
+++ b/src/templates/main_sidebar.tpl.html
@@ -23,8 +23,8 @@
 
 <!--%tpl_main_sidebar_types_dropdown-->
 <div class="btn-group">
-  <button class="btn btn-success dropdown-toggle" data-toggle="dropdown">
-	<i class="icon-th icon-white"></i>&nbsp;{label}
+  <button class="btn btn-{btn_class} dropdown-toggle" data-toggle="dropdown">
+	<i class="icon-{icon}"></i>&nbsp;{label}
 	<span class="caret"></span>
   </button>
   <ul class="dropdown-menu">
diff --git a/src/templates/server/view.tpl.html b/src/templates/server/view.tpl.html
index 461ce48d..f53bc634 100644
--- a/src/templates/server/view.tpl.html
+++ b/src/templates/server/view.tpl.html
@@ -5,7 +5,20 @@
 	</colgroup>
 	<thead>
 		<tr class="head">
-			<th colspan="2"><h4>{label}</h4></th>
+			<th colspan="2">
+				<div class="btn-group">
+				  <button class="btn btn-success dropdown-toggle" data-toggle="dropdown">
+					<i class="icon-th icon-white"></i>&nbsp;{label}
+					<span class="caret"></span>
+				  </button>
+				  <ul class="dropdown-menu">
+					<!--%tpl_repeat_options-->
+					<li class="{class_active}"><a href="{url}">{label}</a>
+					<!--%%tpl_repeat_options-->
+					{options}
+				  </ul>
+				</div>
+			</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/static/css/style.css b/static/css/style.css
index d453d968..564288b0 100755
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -11,9 +11,6 @@ body {
 	padding-left: 0;
 	padding-right: 0;
 }
-.sidebar-nav {
-	padding: 9px 0;
-}
 .sidebar-nav .btn {
 	margin: 5px 0;
 	min-width: 100px;