diff --git a/src/main/resources/public/views/configuration.html b/src/main/resources/public/views/configuration.html
index 2011316..b4f799a 100644
--- a/src/main/resources/public/views/configuration.html
+++ b/src/main/resources/public/views/configuration.html
@@ -1,11 +1,9 @@
-
-<h2>Configuration <a class="btn btn-primary pull-right" href="#/editor"><i
-		class="icon-plis-sign icon-white"></i> Manual Add</a>
-		<a class="btn btn-primary pull-right" href="#/verascenes"><i
-		class="icon-plis-sign icon-white"></i> Vera Scenes</a>
-		<a class="btn btn-primary pull-right" href="#/veradevices"><i
-		class="icon-plis-sign icon-white"></i> Vera Devices</a>
-	</h2>
+      <ul class="nav nav-pills" role="tablist">
+        <li role="presentation" class="active"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#/veradevices">Vera Devices</a></li>
+        <li role="presentation"><a href="#/verascenes">Vera Scenes</a></li>
+        <li role="presentation"><a href="#/editor">Manual Add</a></li>
+      </ul>
 
 	<div class="panel panel-default bridgeServer">
 		<div class="panel-heading">
diff --git a/src/main/resources/public/views/editdevice.html b/src/main/resources/public/views/editdevice.html
index a2b648d..1bcf49f 100644
--- a/src/main/resources/public/views/editdevice.html
+++ b/src/main/resources/public/views/editdevice.html
@@ -1,7 +1,10 @@
-<h2>
-	Device Editor <a class="btn btn-primary pull-right" href="/">
-		Configuration</a>
-</h2>
+      <ul class="nav nav-pills" role="tablist">
+        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#/veradevices">Vera Devices</a></li>
+        <li role="presentation"><a href="#/verascenes">Vera Scenes</a></li>
+        <li role="presentation"><a href="#/editor">Manual Add</a></li>
+        <li role="presentation" class="active"><a href="#/editdevice">Edit Device</a></li>
+      </ul>
 
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">
diff --git a/src/main/resources/public/views/editor.html b/src/main/resources/public/views/editor.html
index b5990db..357d696 100644
--- a/src/main/resources/public/views/editor.html
+++ b/src/main/resources/public/views/editor.html
@@ -1,7 +1,9 @@
-<h2>
-	Manual Add <a class="btn btn-primary pull-right" href="/">
-		Configuration</a>
-</h2>
+      <ul class="nav nav-pills" role="tablist">
+        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#/veradevices">Vera Devices</a></li>
+        <li role="presentation"><a href="#/verascenes">Vera Scenes</a></li>
+        <li role="presentation" class="active"><a href="#/editor">Manual Add</a></li>
+      </ul>
 
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">
diff --git a/src/main/resources/public/views/veradevice.html b/src/main/resources/public/views/veradevice.html
index 1dc148f..edda376 100644
--- a/src/main/resources/public/views/veradevice.html
+++ b/src/main/resources/public/views/veradevice.html
@@ -1,7 +1,9 @@
-<h2>
-	Vera Device <a class="btn btn-primary pull-right" href="/">
-		Configuration</a>
-</h2>
+      <ul class="nav nav-pills" role="tablist">
+        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation" class="active"><a href="#/veradevices">Vera Devices</a></li>
+        <li role="presentation"><a href="#/verascenes">Vera Scenes</a></li>
+        <li role="presentation"><a href="#/editor">Manual Add</a></li>
+      </ul>
 
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">
diff --git a/src/main/resources/public/views/verascene.html b/src/main/resources/public/views/verascene.html
index 9f22122..7d9210f 100644
--- a/src/main/resources/public/views/verascene.html
+++ b/src/main/resources/public/views/verascene.html
@@ -1,7 +1,9 @@
-<h2>
-	Vera Scene <a class="btn btn-primary pull-right" href="/">
-		Configuration</a>
-</h2>
+      <ul class="nav nav-pills" role="tablist">
+        <li role="presentation"><a href="#">Configuration</a></li>
+        <li role="presentation"><a href="#/veradevices">Vera Devices</a></li>
+        <li role="presentation" class="active"><a href="#/verascenes">Vera Scenes</a></li>
+        <li role="presentation"><a href="#/editor">Manual Add</a></li>
+      </ul>
 
 <div class="panel panel-default bridgeServer" ng-if="!bridge.error">
 	<div class="panel-heading">