diff --git a/public/styles/normal.css b/public/styles/normal.css
index fd1de03..a8549ab 100644
--- a/public/styles/normal.css
+++ b/public/styles/normal.css
@@ -2,15 +2,11 @@
  * StatusBoard normal stylesheet
  *
  */
-@import url('http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css'); 
 @CHARSET "UTF-8";
 
 @media all {
     body {
-        margin: 0em;
-        margin-top: 60px;
         padding-top: 40px;
-        padding: 0em;
         font-family: verdana, helvetica, sans-serif;
         background: #F7F7F7;
     }
@@ -55,6 +51,17 @@
         list-style: none;
         margin-left: 0px;
     }
+    
+    /*
+        CV
+    */
+    #cv div.row {
+        margin-bottom: 1.0em;
+    }
+    
+    #cv h4 {
+        margin-top: 0.75em;
+    }
 }
 
 @media print {
diff --git a/source/webui/templates/cv.tpl b/source/webui/templates/cv.tpl
index 947b992..7dba895 100644
--- a/source/webui/templates/cv.tpl
+++ b/source/webui/templates/cv.tpl
@@ -1,12 +1,12 @@
 <h2 class="no-print">Curriculum Vitae</h2>
 
-<div class="container">
+<div class="container" id="cv">
 
     <div class="row no-print">
-        <div class="span4 column">
+        <div class="span2 column">
             <h3>Download</h3>
         </div>
-        <div class="span12 column">
+        <div class="span10 column">
             <p>
                 <a href="{$base_uri}files/BenRobertsCv.pdf" title="Ben Roberts' CV">
                     <img src="{$base_uri}images/acrobat.png" alt="Download PDF copy of Ben Roberts' CV" style="width: 3em; height: 3em; vertical-align: middle;" />
@@ -18,10 +18,10 @@
     </div>
 
     <div class="row" id="personal-info">
-        <div class="span4 column">
+        <div class="span2 column">
             <h3>Personal Information</h3>
         </div>
-        <div class="span12 column">
+        <div class="span10 column">
             <dl>
                 <dt>Full Name</dt>
                 <dd><p>Benjamin Austin Roberts</p></dd>
@@ -39,10 +39,10 @@
     </div>
         
     <div class="row" id="employment">
-        <div class="span4 column">
+        <div class="span2 column">
             <h3>Employment</h3>
         </div>
-        <div class="span12 column">
+        <div class="span10 column">
             <ol class="employment">
                 <li>
                     <h4>
@@ -114,11 +114,11 @@
     </div>
     
     <div class="row" id="certification">
-        <div class="span4 column">
+        <div class="span2 column">
             <h3>Certification</h3>
         </div>
-        <div class="span12 column">
-            <table>
+        <div class="span10 column">
+            <table class="table">
                 <thead>
                     <tr>
                         <th>Certification</th>
@@ -136,17 +136,17 @@
     </div>
         
     <div class="row" id="education">
-        <div class="span4 column">
+        <div class="span2 column">
             <h3>Education</h3>
         </div>
-        <div class="span12 column">
+        <div class="span10 column">
             <ol class="education">
                 <li>
                     <h4>
                         University of Southampton
                         <small>October 2005 - June 2010</small>
                     </h4>
-                    <table>
+                    <table class="table">
                         <thead>
                             <tr>
                                 <th>Subject</th>
@@ -173,7 +173,7 @@
                         <small>September 2003 - June 2005</small>
                     </h4>
                     
-                    <table>
+                    <table class="table">
                         <thead>
                             <tr>
                                 <th>Subject</th>
@@ -211,10 +211,10 @@
     </div>
         
     <div class="row" id="skills">
-        <div class="span4 column">
+        <div class="span2 column">
             <h3>Skills</h3>
         </div>
-        <div class="span12 column">
+        <div class="span10 column">
             <dl>
                 <dt>Networking<dt>
                 <dd>
@@ -297,10 +297,10 @@
     </div>
         
     <div class="row" id="interests">
-        <div class="span4 column">
+        <div class="span2 column">
             <h3>Interests</h3>
         </div>
-        <div class="span12 column">
+        <div class="span10 column">
             <p>
                 I am a supporter of the opensource movement, and try to use free/libre software
                 and code where I can. I also release all my code under free licenses where possible
diff --git a/source/webui/templates/index.tpl b/source/webui/templates/index.tpl
index fd6f172..78cadc1 100644
--- a/source/webui/templates/index.tpl
+++ b/source/webui/templates/index.tpl
@@ -5,6 +5,7 @@
         
         <!-- JQuery //-->
         <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
+        <link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/smoothness/jquery-ui.css" rel="Stylesheet" />        
         <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
         <!-- JQuery Plugins //-->
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/jquery.chained.js"></script>
@@ -13,6 +14,8 @@
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/less-1.1.5.min.js"></script>
         
         <!-- Bootstrap //-->
+        <link rel="stylesheet/less" href="{$base_uri}less/bootstrap.less" media="all" />
+        <link type="text/css" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet" />
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-alerts.js"></script>
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-twipsy.js"></script>
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-popover.js"></script>
@@ -21,25 +24,22 @@
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-modal.js"></script>
         
         <!-- Local //-->
-        <script type="text/javascript" src="{$base_uri}scripts/main.js"></script>
-        
-        <link type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/smoothness/jquery-ui.css" rel="Stylesheet" />        
-        <link rel="stylesheet/less" href="{$base_uri}less/bootstrap.less" media="all" />
         <link rel="stylesheet" type="text/css" href="{$base_uri}styles/normal.css" />
+        <script type="text/javascript" src="{$base_uri}scripts/main.js"></script>
 
     </head>
     <body>
-        <div class="topbar no-print">
-            <div class="topbar-inner">
+        <div class="navbar navbar-fixed-top no-print">
+            <div class="navbar-inner">
                 <div class="container-fluid">
                     {$page->include_template('navigation')}
-                </div><!-- /tobar-inner -->
+                </div><!-- /navbar-inner -->
             </div><!-- /container-fliud -->
         </div><!-- /topbar -->
 
         <div class="container">
             <div class="row">
-                <div class="span16">
+                <div class="span12">
                     <h1>
                         Ben Roberts
                         <small>MEng Computer Science @ ecs.soton.ac.uk</small>
@@ -80,11 +80,10 @@
                     Powered by 
                     <a href="https://github.com/optiz0r/homepage/" title="Homepage">Homepage</a>
                     and <a href="https://github.com/optiz0r/sihnon-php-lib/" title="Sihnon PHP Library">Sihnon PHP Lib</a>
-                    written by Ben Roberts.
+                    written by <a xmlns:cc="http://creativecommons.org/ns#" href="http://benroberts.net" property="cc:attributionName" rel="cc:attributionURL">Ben Roberts</a>.
                     <br />
                      
-                    This work by <a xmlns:cc="http://creativecommons.org/ns#" href="http://benroberts.net" property="cc:attributionName" rel="cc:attributionURL">Ben Roberts</a>
-                    is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
+                    This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
                     <br />
                     
                     <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">
diff --git a/source/webui/templates/navigation.tpl b/source/webui/templates/navigation.tpl
index 4a4f9f9..6d962de 100644
--- a/source/webui/templates/navigation.tpl
+++ b/source/webui/templates/navigation.tpl
@@ -10,7 +10,10 @@
     </li>
     
     <li class="dropdown {if $requested_page == "projects"}active{/if}" data-dropdown="dropdown">
-        <a href="#" class="dropdown-toggle" title="Projects">Projects</a>
+        <a href="#" class="dropdown-toggle" title="Projects">
+            Projects
+            <b class="caret"></b>
+        </a>
         <ul class="dropdown-menu">
             <li><a href="{$base_uri}projects/" title="Projects Home">Home</a></li>
             <li><a href="https://wiki.sihnon.net/" title="Sihnon Wiki">Sihnon Wiki</a></li>
@@ -24,16 +27,22 @@
     </li>
     
     <li class="dropdown" data-dropdown="dropdown">
-        <a href="#" class="dropdown-toggle" title="Code">Code</a>
+        <a href="#" class="dropdown-toggle" title="Code">
+            Code
+            <b class="caret"></b>
+        </a>
         <ul class="dropdown-menu">
-            <li><a href="https://git.sihnon.net/" title="Sihnon Git Repository Browser">Sihnon Git Repository Browser</a></li>
-            <li><a href="https://subversion.sihnon.net/" title="Sihnon SVN Repository Browser">Sihnon Subversion Repository Browser</a></li>
             <li><a href="http://github.com/optiz0r/" title="GitHub Repositores">GitHub Repositories</a></li>
+            <li><a href="https://git.sihnon.net/" title="Sihnon Git Repository Browser">Git Repositories</a></li>
+            <li><a href="https://subversion.sihnon.net/" title="Sihnon SVN Repository Browser">Subversion Repositories</a></li>
         </ul>
     </li>
     
     <li class="dropdown" data-dropdown="dropdown">
-        <a href="#" class="dropdown-toggle" title="Social Media">Social Media</a>
+        <a href="#" class="dropdown-toggle" title="Social Media">
+            Social Media
+            <b class="caret"></b>
+        </a>
         <ul class="dropdown-menu">
             <li><a href="https://twitter.com/optiz0r" title="optiz0r on Twitter">Twitter</a></li>
             <li><a href="https://plus.google.com/104283756158326784792/about" title="Ben Roberts on Google+">Google+</a></li>
diff --git a/source/webui/templates/projects/sihnon-framework.tpl b/source/webui/templates/projects/sihnon-framework.tpl
index e03552d..f3ef1e0 100644
--- a/source/webui/templates/projects/sihnon-framework.tpl
+++ b/source/webui/templates/projects/sihnon-framework.tpl
@@ -7,7 +7,7 @@
 
 <div class="container">
     <div class="row">
-        <div class="span10 column">
+        <div class="span7 column">
             <h3>Features</h3>
             <ul>
                 <li>Database abstraction</li>
@@ -20,13 +20,13 @@
                 <li>Input Validation</li>
             </ul>
         </div>
-        <div class="span6 column">
-            <img class="span6" src="{$base_uri}images/sihnon-framework/overview.png" alt="SihnonFramework Overview" />
+        <div class="span5 column">
+            <img class="span5" src="{$base_uri}images/sihnon-framework/overview.png" alt="SihnonFramework Overview" />
         </div>
     </div>
     
     <div class="row">
-        <div class="span16">
+        <div class="span12">
             <h3>Source</h3>
             <p>
                 View or clone a copy of the Git repositories from one of the mirrors listed below:
diff --git a/source/webui/templates/projects/status-board.tpl b/source/webui/templates/projects/status-board.tpl
index 7af3281..8341616 100644
--- a/source/webui/templates/projects/status-board.tpl
+++ b/source/webui/templates/projects/status-board.tpl
@@ -8,7 +8,7 @@
 
 <div class="container">
     <div class="row">
-        <div class="span8 column">
+        <div class="span7 column">
             <h3>Features</h3>
             <ul>
                 <li>Customisable list of Services and Sites.</li>
@@ -17,13 +17,13 @@
                 <li>Full admin UI.</li>
             </ul>
         </div>
-        <div class="span8 column">
-            <img class="span8" src="{$base_uri}images/status-board/overview.png" alt="StatusBoard Overview" />
+        <div class="span5 column">
+            <img class="span5" src="{$base_uri}images/status-board/overview.png" alt="StatusBoard Overview" />
         </div>
     </div>
     
     <div class="row">
-        <div class="span16">
+        <div class="span12">
             <h3>Source</h3>
             <p>
                 View or clone a copy of the Git repositories from one of the mirrors listed below: