diff --git a/Website/tmpl/footer.htm b/Website/tmpl/footer.htm
index e5743e7..420c489 100644
--- a/Website/tmpl/footer.htm
+++ b/Website/tmpl/footer.htm
@@ -1,28 +1,32 @@
-    <!-- ====================== Begin Standard Footer =========================== -->
-    </div>
-    <div class="footer">
-      <!-- FOOTER -->
-      <div class="container">
-        <p class="pull-left">
-          <a href="main.rss"><i class="fa fa-rss"></i></a> &nbsp;
-          <a href="https://plus.google.com/$GOOGLE_ID" rel="publisher" style="text-decoration:none;"><i class="fa fa-google-plus"></i></a> &nbsp;
-          <a href="https://twitter.com/$TWITTER_ID"><i class="fa fa-twitter"></i></a> &nbsp;
-          <a href="https://www.facebook.com/$FACEBOOK_PAGE"><i class="fa fa-facebook"></i></a>
-        </p>
-        <p class="pull-right"><a href="#">Back to top <span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span></a></p>
-      </div><!-- /.container -->
-      <center>
-          <a href="legal.html#privacy">Privacy policy</a> &middot; <a href="legal.html#terms">Terms of use</a> &middot;
-          Copyright &copy; 2015 Subflexion. All rights reserved.
-      </center>
-    </div>
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-    <!-- Latest compiled JavaScript -->
-    <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+  </div> <!-- end of container -->
+</div> <!-- end of content-wrapper -->
+
+<!-- ====================== Begin Standard Footer =========================== -->
+
+<div class="footer">
+  <!-- FOOTER -->
+  <div class="container">
+    <p class="pull-left">
+      <a href="main.rss"><i class="fa fa-rss"></i></a> &nbsp;
+      <a href="https://plus.google.com/$GOOGLE_ID" rel="publisher" style="text-decoration:none;"><i class="fa fa-google-plus"></i></a> &nbsp;
+      <a href="https://twitter.com/$TWITTER_ID"><i class="fa fa-twitter"></i></a> &nbsp;
+      <a href="https://www.facebook.com/$FACEBOOK_PAGE"><i class="fa fa-facebook"></i></a>
+    </p>
+    <p class="pull-right"><a href="#">Back to top <span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span></a></p>
+  </div><!-- /.container -->
+  <center>
+      <a href="legal.html#privacy">Privacy policy</a> &middot; <a href="legal.html#terms">Terms of use</a> &middot;
+      Copyright &copy; 2015 Subflexion. All rights reserved.
+  </center>
+</div>
+
+<!-- Bootstrap core JavaScript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<!-- Latest compiled JavaScript -->
+<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!-- <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script> -->
+    <script src="externals/bootstrap.min.js"></script>
   </body>
 </html>
 

diff --git a/Website/tmpl/footer.htm b/Website/tmpl/footer.htm
index e5743e7..420c489 100644
--- a/Website/tmpl/footer.htm
+++ b/Website/tmpl/footer.htm
@@ -1,28 +1,32 @@
-    <!-- ====================== Begin Standard Footer =========================== -->
-    </div>
-    <div class="footer">
-      <!-- FOOTER -->
-      <div class="container">
-        <p class="pull-left">
-          <a href="main.rss"><i class="fa fa-rss"></i></a> &nbsp;
-          <a href="https://plus.google.com/$GOOGLE_ID" rel="publisher" style="text-decoration:none;"><i class="fa fa-google-plus"></i></a> &nbsp;
-          <a href="https://twitter.com/$TWITTER_ID"><i class="fa fa-twitter"></i></a> &nbsp;
-          <a href="https://www.facebook.com/$FACEBOOK_PAGE"><i class="fa fa-facebook"></i></a>
-        </p>
-        <p class="pull-right"><a href="#">Back to top <span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span></a></p>
-      </div><!-- /.container -->
-      <center>
-          <a href="legal.html#privacy">Privacy policy</a> &middot; <a href="legal.html#terms">Terms of use</a> &middot;
-          Copyright &copy; 2015 Subflexion. All rights reserved.
-      </center>
-    </div>
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-    <!-- Latest compiled JavaScript -->
-    <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+  </div> <!-- end of container -->
+</div> <!-- end of content-wrapper -->
+
+<!-- ====================== Begin Standard Footer =========================== -->
+
+<div class="footer">
+  <!-- FOOTER -->
+  <div class="container">
+    <p class="pull-left">
+      <a href="main.rss"><i class="fa fa-rss"></i></a> &nbsp;
+      <a href="https://plus.google.com/$GOOGLE_ID" rel="publisher" style="text-decoration:none;"><i class="fa fa-google-plus"></i></a> &nbsp;
+      <a href="https://twitter.com/$TWITTER_ID"><i class="fa fa-twitter"></i></a> &nbsp;
+      <a href="https://www.facebook.com/$FACEBOOK_PAGE"><i class="fa fa-facebook"></i></a>
+    </p>
+    <p class="pull-right"><a href="#">Back to top <span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span></a></p>
+  </div><!-- /.container -->
+  <center>
+      <a href="legal.html#privacy">Privacy policy</a> &middot; <a href="legal.html#terms">Terms of use</a> &middot;
+      Copyright &copy; 2015 Subflexion. All rights reserved.
+  </center>
+</div>
+
+<!-- Bootstrap core JavaScript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<!-- Latest compiled JavaScript -->
+<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<!-- <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script> -->
+    <script src="externals/bootstrap.min.js"></script>
   </body>
 </html>
 
diff --git a/Website/tmpl/header.htm b/Website/tmpl/header.htm
index bd13b52..fd0ccc0 100644
--- a/Website/tmpl/header.htm
+++ b/Website/tmpl/header.htm
@@ -8,9 +8,16 @@
     <title>$SITE_NAME - $TITLE</title>
     <!-- Bootstrap -->
     <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+<!--
     <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://bootswatch.com/slate/bootstrap.min.css">
-    <link rel="stylesheet" href="https://bootswatch.com/assets/css/bootswatch.min.css">
+    <link rel="stylesheet" href="http://bootswatch.com/slate/bootstrap.min.css">
+    <link rel="stylesheet" href="http://bootswatch.com/assets/css/bootswatch.min.css">
+    <link rel="stylesheet" href="externals/font-awesome.min.css">
+-->
+    <link rel="stylesheet" href="externals/bootstrap.min.css">
+    <link rel="stylesheet" href="externals/bootstrap-slate.min.css">
+    <link rel="stylesheet" href="externals/bootswatch.min.css">
+
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
@@ -18,7 +25,18 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
     <style>
-        .footer { padding: 7px; background-color: #3a3f44; }
+html, body {
+  height: 100%;
+}
+.content-wrapper {
+  min-height: 100%;
+  margin-bottom: -65px;
+  padding-bottom: 65px;
+}
+.footer {
+  height: 65px;
+  padding: 7px; background-color: #3a3f44;
+}
 .spinner {
   width: 100px;
 }
@@ -59,20 +77,21 @@
   margin-top: 1px;
 }
     </style>
-
-<script>
-(function (\$) {
-  \$('.spinner .btn:first-of-type').on('click', function() {
-    \$('.spinner input').val( parseInt(\$('.spinner input').val(), 10) + 1);
-  });
-  \$('.spinner .btn:last-of-type').on('click', function() {
-    \$('.spinner input').val( parseInt(\$('.spinner input').val(), 10) - 1);
-  });
-})(jQuery);
-</script>
-
+    <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> -->
+    <script src="externals/jquery.min.js"></script>
+    <script>
+    (function (\$) {
+      \$('.spinner .btn:first-of-type').on('click', function() {
+        \$('.spinner input').val( parseInt(\$('.spinner input').val(), 10) + 1);
+      });
+      \$('.spinner .btn:last-of-type').on('click', function() {
+        \$('.spinner input').val( parseInt(\$('.spinner input').val(), 10) - 1);
+      });
+    })(jQuery);
+    </script>
   </head>
   <body id="home">
+<div class="content-wrapper">
     <!-- Fixed navbar -->
     <header id="header" class="site-header">
     <div class="navbar navbar-default navbar-fixed-top navbar-transparent">
@@ -87,23 +106,27 @@
         </div>
         <div id="navbar-main" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
+<!--
             <li$(if [ "$TITLE" == "About"       ] ; then echo ' class="active"'; fi)><a href="index.html">About</a></li>
-            <li$(if [ "$TITLE" == "Downloads"   ] ; then echo ' class="active"'; fi)><a href="download.html">Download</a></li>
+-->
             <li$(if [ "$TITLE" == "Features"    ] ; then echo ' class="active"'; fi)><a href="features.html">Features</a></li>
             <li$(if [ "$TITLE" == "Screenshots" ] ; then echo ' class="active"'; fi)><a href="screenshots.html">Screenshots</a></li>
+            <li$(if [ "$TITLE" == "Downloads"   ] ; then echo ' class="active"'; fi)><a href="download.html">Download</a></li>
+            <li$(if [ "$TITLE" == "Register"    ] ; then echo ' class="active"'; fi)><a href="register.html">Register</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right">
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">More <span class="caret"></span></a>
               <ul class="dropdown-menu">
+<!--
                 <li><a href="help.html">Help</a></li>
+-->
                 <li><a href="support.html">Support</a></li>
                 <li><a href="faq.html">FAQ</a></li>
                 <li role="separator" class="divider"></li>
                 <li><a href="news.html">News</a></li>
                 <li><a href="documentation.html">Documentation</a></li>
                 <li><a href="community.html">Community</a></li>
-                <li><a href="register.html">Register</a></li>
                 <li role="separator" class="divider"></li>
                 <li><a href="contact.html">Contact</a></li>
                 <li><a href="legal.html">Legal</a></li>
@@ -111,8 +134,10 @@
                 <li role="separator" class="divider"></li>
                 <li><a href="http://builtwithbootstrap.com/" target="_blank">Built With Bootstrap</a></li>
                 <li><a href="https://wrapbootstrap.com/?ref=bsw" target="_blank">WrapBootstrap</a></li>
-                // http://getbootstrap.com/components/
-                // Link back to Glyphicons  http://glyphicons.com/
+                /\*
+                   http://getbootstrap.com/components/
+                   Link back to Glyphicons  http://glyphicons.com/
+                \*/
                 -->
               </ul>
             </li>