diff --git a/src/main/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/main-config.jelly b/src/main/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/main-config.jelly
index 8d6eb4387..d13619f3c 100644
--- a/src/main/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/main-config.jelly
+++ b/src/main/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/main-config.jelly
@@ -1,14 +1,7 @@
-<div class="config">
-    <h2>Build Monitor</h2>
+<nav>
     <ul>
-        <li>
-            <a href="configure">Configure View</a>
-        </li>
-        <li>
-            <a href="delete">Delete View</a>
-        </li>
-        <li>
-            <a href="../../">Jenkins Home</a>
-        </li>
+        <!--<li><a class="icon font-decrease" href="#" title="Decrease font size">decrease font size</a></li>-->
+        <!--<li><a class="icon font-increase" href="#" title="Increase font size">increase font size</a></li>-->
+        <li><a class="icon settings" href="configure" title="Plugin settings">settings</a></li>
     </ul>
-</div>
\ No newline at end of file
+</nav>
\ No newline at end of file
diff --git a/src/main/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/main.jelly b/src/main/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/main.jelly
index 36b077e57..17b273b63 100644
--- a/src/main/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/main.jelly
+++ b/src/main/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/main.jelly
@@ -10,19 +10,15 @@
 
         <l:header>
             <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400,700"/>
-            <link rel="stylesheet" href="${resourcesURL}/css/normalize.css"/>
-            <link rel="stylesheet" href="${resourcesURL}/css/bootstrap-combined.2.3.2.min.css"/>
-            <link rel="stylesheet" href="${resourcesURL}/css/industrial.css"/>
-            <style type="text/css">
-                .dashboard { background: url('${resourcesURL}/images/background.png'); }
-                .config { background: url('${imagesURL}/16x16/help.png') top right no-repeat #73bfff; }
-            </style>
+            <link rel="stylesheet" href="${resourcesURL}/styles/normalize.css"/>
+            <link rel="stylesheet" href="${resourcesURL}/styles/bootstrap-combined.2.3.2.min.css"/>
+
+            <link rel="stylesheet" href="${resourcesURL}/themes/industrial.css"/>
 
             <script src="//ajax.googleapis.com/ajax/libs/angularjs/${angularVersion}/angular.min.js"></script>
             <script>window.angular || document.write('\x3Cscript src="${resourcesURL}/libs/angular-${angularVersion}.min.js">\x3C/script>')</script>
             <script src="${resourcesURL}/libs/ui-bootstrap-custom-tpls-0.4.0.js"></script>
 
-
             <script>
                 var buildMonitor = angular.
                     module('buildMonitor', ['ui.bootstrap.dialog', 'template/dialog/message.html']).
@@ -98,7 +94,7 @@
 
                 <st:include page="main-config.jelly"/>
 
-                <ul id="job-views" data-ng-controller="JobViewsController" ng-init="updateJobs()">
+                <ul id="job-views" data-ng-controller="JobViewsController" data-ng-class="font_size">
                     <li ng-repeat="job in jobs" class="{{job.status}}">
                         <div class="progress" style="width: {{job.progress}}%">
                             <span>{{job.progress}}%</span>
diff --git a/src/main/webapp/css/bootstrap-combined.2.3.2.min.css b/src/main/webapp/styles/bootstrap-combined.2.3.2.min.css
similarity index 70%
rename from src/main/webapp/css/bootstrap-combined.2.3.2.min.css
rename to src/main/webapp/styles/bootstrap-combined.2.3.2.min.css
index ae99547d6..afcd46221 100644
--- a/src/main/webapp/css/bootstrap-combined.2.3.2.min.css
+++ b/src/main/webapp/styles/bootstrap-combined.2.3.2.min.css
@@ -55,148 +55,6 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
 .btn-link{border-color:transparent;cursor:pointer;color:#0088cc;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent;}
 .btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333333;text-decoration:none;}
-[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;}
-.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");}
-.icon-glass{background-position:0 0;}
-.icon-music{background-position:-24px 0;}
-.icon-search{background-position:-48px 0;}
-.icon-envelope{background-position:-72px 0;}
-.icon-heart{background-position:-96px 0;}
-.icon-star{background-position:-120px 0;}
-.icon-star-empty{background-position:-144px 0;}
-.icon-user{background-position:-168px 0;}
-.icon-film{background-position:-192px 0;}
-.icon-th-large{background-position:-216px 0;}
-.icon-th{background-position:-240px 0;}
-.icon-th-list{background-position:-264px 0;}
-.icon-ok{background-position:-288px 0;}
-.icon-remove{background-position:-312px 0;}
-.icon-zoom-in{background-position:-336px 0;}
-.icon-zoom-out{background-position:-360px 0;}
-.icon-off{background-position:-384px 0;}
-.icon-signal{background-position:-408px 0;}
-.icon-cog{background-position:-432px 0;}
-.icon-trash{background-position:-456px 0;}
-.icon-home{background-position:0 -24px;}
-.icon-file{background-position:-24px -24px;}
-.icon-time{background-position:-48px -24px;}
-.icon-road{background-position:-72px -24px;}
-.icon-download-alt{background-position:-96px -24px;}
-.icon-download{background-position:-120px -24px;}
-.icon-upload{background-position:-144px -24px;}
-.icon-inbox{background-position:-168px -24px;}
-.icon-play-circle{background-position:-192px -24px;}
-.icon-repeat{background-position:-216px -24px;}
-.icon-refresh{background-position:-240px -24px;}
-.icon-list-alt{background-position:-264px -24px;}
-.icon-lock{background-position:-287px -24px;}
-.icon-flag{background-position:-312px -24px;}
-.icon-headphones{background-position:-336px -24px;}
-.icon-volume-off{background-position:-360px -24px;}
-.icon-volume-down{background-position:-384px -24px;}
-.icon-volume-up{background-position:-408px -24px;}
-.icon-qrcode{background-position:-432px -24px;}
-.icon-barcode{background-position:-456px -24px;}
-.icon-tag{background-position:0 -48px;}
-.icon-tags{background-position:-25px -48px;}
-.icon-book{background-position:-48px -48px;}
-.icon-bookmark{background-position:-72px -48px;}
-.icon-print{background-position:-96px -48px;}
-.icon-camera{background-position:-120px -48px;}
-.icon-font{background-position:-144px -48px;}
-.icon-bold{background-position:-167px -48px;}
-.icon-italic{background-position:-192px -48px;}
-.icon-text-height{background-position:-216px -48px;}
-.icon-text-width{background-position:-240px -48px;}
-.icon-align-left{background-position:-264px -48px;}
-.icon-align-center{background-position:-288px -48px;}
-.icon-align-right{background-position:-312px -48px;}
-.icon-align-justify{background-position:-336px -48px;}
-.icon-list{background-position:-360px -48px;}
-.icon-indent-left{background-position:-384px -48px;}
-.icon-indent-right{background-position:-408px -48px;}
-.icon-facetime-video{background-position:-432px -48px;}
-.icon-picture{background-position:-456px -48px;}
-.icon-pencil{background-position:0 -72px;}
-.icon-map-marker{background-position:-24px -72px;}
-.icon-adjust{background-position:-48px -72px;}
-.icon-tint{background-position:-72px -72px;}
-.icon-edit{background-position:-96px -72px;}
-.icon-share{background-position:-120px -72px;}
-.icon-check{background-position:-144px -72px;}
-.icon-move{background-position:-168px -72px;}
-.icon-step-backward{background-position:-192px -72px;}
-.icon-fast-backward{background-position:-216px -72px;}
-.icon-backward{background-position:-240px -72px;}
-.icon-play{background-position:-264px -72px;}
-.icon-pause{background-position:-288px -72px;}
-.icon-stop{background-position:-312px -72px;}
-.icon-forward{background-position:-336px -72px;}
-.icon-fast-forward{background-position:-360px -72px;}
-.icon-step-forward{background-position:-384px -72px;}
-.icon-eject{background-position:-408px -72px;}
-.icon-chevron-left{background-position:-432px -72px;}
-.icon-chevron-right{background-position:-456px -72px;}
-.icon-plus-sign{background-position:0 -96px;}
-.icon-minus-sign{background-position:-24px -96px;}
-.icon-remove-sign{background-position:-48px -96px;}
-.icon-ok-sign{background-position:-72px -96px;}
-.icon-question-sign{background-position:-96px -96px;}
-.icon-info-sign{background-position:-120px -96px;}
-.icon-screenshot{background-position:-144px -96px;}
-.icon-remove-circle{background-position:-168px -96px;}
-.icon-ok-circle{background-position:-192px -96px;}
-.icon-ban-circle{background-position:-216px -96px;}
-.icon-arrow-left{background-position:-240px -96px;}
-.icon-arrow-right{background-position:-264px -96px;}
-.icon-arrow-up{background-position:-289px -96px;}
-.icon-arrow-down{background-position:-312px -96px;}
-.icon-share-alt{background-position:-336px -96px;}
-.icon-resize-full{background-position:-360px -96px;}
-.icon-resize-small{background-position:-384px -96px;}
-.icon-plus{background-position:-408px -96px;}
-.icon-minus{background-position:-433px -96px;}
-.icon-asterisk{background-position:-456px -96px;}
-.icon-exclamation-sign{background-position:0 -120px;}
-.icon-gift{background-position:-24px -120px;}
-.icon-leaf{background-position:-48px -120px;}
-.icon-fire{background-position:-72px -120px;}
-.icon-eye-open{background-position:-96px -120px;}
-.icon-eye-close{background-position:-120px -120px;}
-.icon-warning-sign{background-position:-144px -120px;}
-.icon-plane{background-position:-168px -120px;}
-.icon-calendar{background-position:-192px -120px;}
-.icon-random{background-position:-216px -120px;width:16px;}
-.icon-comment{background-position:-240px -120px;}
-.icon-magnet{background-position:-264px -120px;}
-.icon-chevron-up{background-position:-288px -120px;}
-.icon-chevron-down{background-position:-313px -119px;}
-.icon-retweet{background-position:-336px -120px;}
-.icon-shopping-cart{background-position:-360px -120px;}
-.icon-folder-close{background-position:-384px -120px;width:16px;}
-.icon-folder-open{background-position:-408px -120px;width:16px;}
-.icon-resize-vertical{background-position:-432px -119px;}
-.icon-resize-horizontal{background-position:-456px -118px;}
-.icon-hdd{background-position:0 -144px;}
-.icon-bullhorn{background-position:-24px -144px;}
-.icon-bell{background-position:-48px -144px;}
-.icon-certificate{background-position:-72px -144px;}
-.icon-thumbs-up{background-position:-96px -144px;}
-.icon-thumbs-down{background-position:-120px -144px;}
-.icon-hand-right{background-position:-144px -144px;}
-.icon-hand-left{background-position:-168px -144px;}
-.icon-hand-up{background-position:-192px -144px;}
-.icon-hand-down{background-position:-216px -144px;}
-.icon-circle-arrow-right{background-position:-240px -144px;}
-.icon-circle-arrow-left{background-position:-264px -144px;}
-.icon-circle-arrow-up{background-position:-288px -144px;}
-.icon-circle-arrow-down{background-position:-312px -144px;}
-.icon-globe{background-position:-336px -144px;}
-.icon-wrench{background-position:-360px -144px;}
-.icon-tasks{background-position:-384px -144px;}
-.icon-filter{background-position:-408px -144px;}
-.icon-briefcase{background-position:-432px -144px;}
-.icon-fullscreen{background-position:-456px -144px;}
 .btn-group{position:relative;display:inline-block;*display:inline;*zoom:1;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;}
 .btn-group+.btn-group{margin-left:5px;}
 .btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px;}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px;}
diff --git a/src/main/webapp/css/normalize.css b/src/main/webapp/styles/normalize.css
similarity index 100%
rename from src/main/webapp/css/normalize.css
rename to src/main/webapp/styles/normalize.css
diff --git a/src/main/webapp/css/industrial.css b/src/main/webapp/themes/industrial.css
similarity index 75%
rename from src/main/webapp/css/industrial.css
rename to src/main/webapp/themes/industrial.css
index 0bf39d0f9..25c5427ab 100644
--- a/src/main/webapp/css/industrial.css
+++ b/src/main/webapp/themes/industrial.css
@@ -1,3 +1,13 @@
+/*
+ *   Hide Jenkins UI
+ */
+
+#header, #side-panel, #view-message { display: none; }
+
+/*
+ *   Colours & Typography
+ */
+
 html{color:#fff;font-family:'Open sans',sans-serif;font-size:16px;line-height:1.4;}
 h1,h2,h3,h4,h5,h6 {
     text-align:center;
@@ -10,12 +20,6 @@ header>h1 {
     text-shadow: 2px 2px rgba(0,0,0,0.5);
 }
 
-#header, #side-panel, #view-message { display: none; }
-
-/*
- *   Colours & Typography
- */
-
 .build-monitor a,
 .build-monitor a:visited {
     color:white;
@@ -224,22 +228,67 @@ header>h1 {
     font-size:2em;
 }
 
+/*
+ *   Images and icons
+ */
+.dashboard { background: url('industrial/background.png'); }
+
+.icon {
+    display:inline-block;
+    width:16px; height:16px;
+    *margin-right:.3em;
+    line-height:16px;
+    vertical-align:text-top;
+    background-image:url("industrial/glyphs.png");
+    background-position:0px 0px;
+    background-repeat:no-repeat;
+    margin-top:1px;
+    background-size:48px 16px; /* half of the size so that it looks descent on Retina */
+    text-indent: -9999px;
+}
+.icon.settings { background-position:0px 0px;}
+.icon.font-decrease { background-position:-16px 0px;}
+.icon.font-increase { background-position:-32px 0px;}
+
 
 /*
- *   Config box
+ *   Config nav
  */
 
-.config {
+.build-monitor nav {
     position: absolute; right:1%; top:1%;
     z-index:  999;
     margin:   0;     padding: 0;
-    width:    15px;  height:  16px;
-    overflow: hidden;
-    border-radius: 8px;
+    background: rgba(100, 100, 100, 0.3);
+    border-radius: 5px;
+    opacity: 0.6;
+}
+.build-monitor nav, .build-monitor nav .icon {
+    -webkit-transition: all 0.25s;
+    transition: all 0.25s;
 }
 
-.config:hover {
-    width:    auto; height: auto;
-    padding:  10px;
-    overflow: visible;
+.build-monitor nav:hover {
+    background: rgba(100, 100, 100, 0.75);
+    opacity: 1;
+}
+.build-monitor nav:hover .icon {
+    background-size: 96px 32px;
+    width:32px; height:32px;
+    line-height:32px;
+}
+.build-monitor nav:hover .icon.settings { background-position:0px 0px;}
+.build-monitor nav:hover .icon.font-decrease { background-position:-32px 0px;}
+.build-monitor nav:hover .icon.font-increase { background-position:-64px 0px;}
+
+.build-monitor nav ul {
+    list-style-type: none;
+    padding:0;
+}
+.build-monitor nav li {
+    display:inline-block;
+    margin:0 0.5em;
+}
+.build-monitor nav li:last-child {
+    margin:0 1em 0 1.5em;
 }
\ No newline at end of file
diff --git a/src/main/webapp/images/background.png b/src/main/webapp/themes/industrial/background.png
similarity index 100%
rename from src/main/webapp/images/background.png
rename to src/main/webapp/themes/industrial/background.png
diff --git a/src/main/webapp/themes/industrial/glyphs.png b/src/main/webapp/themes/industrial/glyphs.png
new file mode 100644
index 000000000..2b1ad18f9
Binary files /dev/null and b/src/main/webapp/themes/industrial/glyphs.png differ