Fix all of the issues with file extension
diff --git a/content/about.html b/content/about.html
index 11117cd..bc345b9 100644
--- a/content/about.html
+++ b/content/about.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>About CloudStack</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="about">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 	<div class="col-lg-12">
 		<div class="page-header">
 			<h1 id="indicators">Apache CloudStack: About</h1>
@@ -51,7 +165,17 @@
 
 <p>Apache projects are managed by a <a href="http://www.apache.org/dev/pmc.html#what-is-a-pmc">Project Management Committee</a> (PMC), and much of the work is done by the project's <a href="http://www.apache.org/dev/committers.html">committers</a>. Note that committer status is <em>not</em> limited to developers, but is conferred to individuals who have made sustained contributions of high quality, and have shown a committment to mentoring other contributors and following <a href="http://theapacheway.com">The Apache Way</a>.</p>
 
-<p>The current Vice President of Apache CloudStack and chair of the PMC is Sebastien Goasguen, a full list of PMC members and contributors is available on the page <em><a href="/who.html">Who We Are</a></em>.</p>
+<p>The current Vice President of Apache CloudStack and chair of the PMC is Sebastien Goasguen, a full list of PMC members and contributors is available on the page <em><a href="who.html">Who We Are</a></em>.</p>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/api.html b/content/api.html
index 672d7b2..e5e70b0 100644
--- a/content/api.html
+++ b/content/api.html
@@ -128,136 +128,6 @@
     </div>
     <div class="container">
         <div class="bs-docs-section">
-            <!doctype html>
-<html>  
-  <head>
-    <title>Apache CloudStack: Open Source Cloud Computing</title>
-
-    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
-
-    <meta itemprop="name" content="Apache Cloudstack">
-    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
-    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
-
-    <meta property="og:title" content="Apache Cloudstack">
-    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
-    <meta property="og:site_name" content="Apache Cloudstack"/>
-    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
-
-    <meta name="twitter:card" content="summary">
-    <meta name="twitter:title" content="Apache Cloudstack">
-    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
-    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
-
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
-
-    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
-    <link href="stylesheets/font-awesome.css" rel="stylesheet">
-    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
-    <link href="stylesheets/custom.css" rel="stylesheet">
-
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="icon" href="images/favicon.ico">
-
-<!-- Commenting out this template stuff until we figure out how to make it work with middleman
-    {% if headers.atom %}
-      <link rel="alternate" href="{{ headers.atom.url }}"
-            type="application/atom+xml" title="{{ headers.atom.title }}" />
-    {% endif %}
-
-    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
--->
-<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
-        <!-- Twitter Bootstrap and jQuery after this line. -->
-        <script src="https://code.jquery.com/jquery-latest.js"></script>
-        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
-        <script>
-            $('.dropdown-toggle').dropdown();
-            $('.nav-collapse').collapse();
-        </script>
-  </head>
-  <body>
-    <div class="navbar navbar-default navbar-fixed-top">
-        <div class="container">
-            <div class="navbar-header">
-                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
-                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-            </div>
-            <div class="navbar-collapse collapse" id="navbar-main">
-                <ul class="nav navbar-nav">
-            <li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
-              <ul class="dropdown-menu" aria-labelledby="about">
-                <li><a tabindex="-1" href="about.html">About</a></li>
-                <li class="divider"></li>
-                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="history.html">History</a></li>
-                <li><a tabindex="-1" href="features.html">Features</a></li>
-                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
-                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
-                <li><a tabindex="-1" href="security.html">Security</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
-              <ul class="dropdown-menu" aria-labelledby="community">
-                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
-                <li><a tabindex="-1" href="developers.html">Developers</a></li>
-                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
-                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
-              <ul class="dropdown-menu" aria-labelledby="users">
-                <li><a tabindex="-1" href="users.html">Known Users</a></li>
-                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
-                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
-              <ul class="dropdown-menu" aria-labelledby="docs">
-                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
-                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
-                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
-                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
-                <li class="divider"></li>
-                <li><a tabindex="-1">Archived Documentation</a></li>
-                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
-                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
-                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
-                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
-              <ul class="dropdown-menu" aria-labelledby="download">
-                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
-                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
-                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
-              </ul>
-            </li>
-			<li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
-              <ul class="dropdown-menu" aria-labelledby="apache">
-				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
-                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
-                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-              </ul>
-            </li>
-          </ul>
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="bs-docs-section">
             <div class="row">
 
 <div class="col-lg-12">
@@ -278,11 +148,6 @@
 we would welcome your help, please file a bug in the
 <a href="https://issues.apache.org/jira/browse/CLOUDSTACK">CloudStack bug tracker</a>
 or by submitting a patch.</p>
-<h2 id="x">4.12.0.0</h2>
-
-<ul>
-  <li><a href="api/apidocs-4.12/index.html">All API</a></li>
-</ul>
 
 <h2 id="x">4.11.x</h2>
 
@@ -332,16 +197,3 @@
 </div>
   </body>
 </html>
-
-
-            <footer>
-                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
-                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
-                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
-            </footer>
-
-        </div>
-    </div>
-</div>
-  </body>
-</html>
diff --git a/content/api_archives.html b/content/api_archives.html
index 1bfa30d..ec3b8a2 100644
--- a/content/api_archives.html
+++ b/content/api_archives.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack deprecated API Documentation</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="api_archives">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -38,60 +152,70 @@
 <h2 id="x">4.6.x</h2>
 
 <ul>
-  <li><a href="/api/apidocs-4.6/TOC_Root_Admin.html">Root Admin API</a></li>
-  <li><a href="/api/apidocs-4.6/TOC_Domain_Admin.html">Domain Admin API</a></li>
-  <li><a href="/api/apidocs-4.6/TOC_User.html">User API</a></li>
+  <li><a href="api/apidocs-4.6/TOC_Root_Admin.html">Root Admin API</a></li>
+  <li><a href="api/apidocs-4.6/TOC_Domain_Admin.html">Domain Admin API</a></li>
+  <li><a href="api/apidocs-4.6/TOC_User.html">User API</a></li>
 </ul>
 
 <h2 id="x-1">4.5.x</h2>
 
 <ul>
-  <li><a href="/api/apidocs-4.5/TOC_Root_Admin.html">Root Admin API</a></li>
-  <li><a href="/api/apidocs-4.5/TOC_Domain_Admin.html">Domain Admin API</a></li>
-  <li><a href="/api/apidocs-4.5/TOC_User.html">User API</a></li>
+  <li><a href="api/apidocs-4.5/TOC_Root_Admin.html">Root Admin API</a></li>
+  <li><a href="api/apidocs-4.5/TOC_Domain_Admin.html">Domain Admin API</a></li>
+  <li><a href="api/apidocs-4.5/TOC_User.html">User API</a></li>
 </ul>
 
 <h2 id="x-2">4.4.x</h2>
 
 <ul>
-  <li><a href="/api/apidocs-4.4/TOC_Root_Admin.html">Root Admin API</a></li>
-  <li><a href="/api/apidocs-4.4/TOC_Domain_Admin.html">Domain Admin API</a></li>
-  <li><a href="/api/apidocs-4.4/TOC_User.html">User API</a></li>
+  <li><a href="api/apidocs-4.4/TOC_Root_Admin.html">Root Admin API</a></li>
+  <li><a href="api/apidocs-4.4/TOC_Domain_Admin.html">Domain Admin API</a></li>
+  <li><a href="api/apidocs-4.4/TOC_User.html">User API</a></li>
 </ul>
 
 <h2 id="x-3">4.3.x</h2>
 
 <ul>
-  <li><a href="/api/apidocs-4.3/TOC_Root_Admin.html">Root Admin API</a></li>
-  <li><a href="/api/apidocs-4.3/TOC_Domain_Admin.html">Domain Admin API</a></li>
-  <li><a href="/api/apidocs-4.3/TOC_User.html">User API</a></li>
+  <li><a href="api/apidocs-4.3/TOC_Root_Admin.html">Root Admin API</a></li>
+  <li><a href="api/apidocs-4.3/TOC_Domain_Admin.html">Domain Admin API</a></li>
+  <li><a href="api/apidocs-4.3/TOC_User.html">User API</a></li>
 </ul>
 
 <h2 id="x-4">4.2.x</h2>
 
 <ul>
-  <li><a href="/api/apidocs-4.2/TOC_Root_Admin.html">Root Admin API</a></li>
-  <li><a href="/api/apidocs-4.2/TOC_Domain_Admin.html">Domain Admin API</a></li>
-  <li><a href="/api/apidocs-4.2/TOC_User.html">User API</a></li>
+  <li><a href="api/apidocs-4.2/TOC_Root_Admin.html">Root Admin API</a></li>
+  <li><a href="api/apidocs-4.2/TOC_Domain_Admin.html">Domain Admin API</a></li>
+  <li><a href="api/apidocs-4.2/TOC_User.html">User API</a></li>
 </ul>
 
 <h2 id="x-5">4.1.x</h2>
 
 <ul>
-  <li><a href="/api/apidocs-4.1/TOC_Root_Admin.html">Root Admin API</a></li>
-  <li><a href="/api/apidocs-4.1/TOC_Domain_Admin.html">Domain Admin API</a></li>
-  <li><a href="/api/apidocs-4.1/TOC_User.html">User API</a></li>
+  <li><a href="api/apidocs-4.1/TOC_Root_Admin.html">Root Admin API</a></li>
+  <li><a href="api/apidocs-4.1/TOC_Domain_Admin.html">Domain Admin API</a></li>
+  <li><a href="api/apidocs-4.1/TOC_User.html">User API</a></li>
 </ul>
 
 <h2 id="x-6">4.0.x</h2>
 
 <ul>
-  <li><a href="/api/apidocs-4.0.0/TOC_Root_Admin.html">Root Admin API</a></li>
-  <li><a href="/api/apidocs-4.0.0/TOC_Domain_Admin.html">Domain Admin API</a></li>
-  <li><a href="/api/apidocs-4.0.0/TOC_User.html">User API</a></li>
+  <li><a href="api/apidocs-4.0.0/TOC_Root_Admin.html">Root Admin API</a></li>
+  <li><a href="api/apidocs-4.0.0/TOC_Domain_Admin.html">Domain Admin API</a></li>
+  <li><a href="api/apidocs-4.0.0/TOC_User.html">User API</a></li>
 </ul>
 
 <p>Latest API documentation is located in the <a href="api.html">API page</a>.</p>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/archives.html b/content/archives.html
index 097341e..cfd9260 100644
--- a/content/archives.html
+++ b/content/archives.html
@@ -1,29 +1,156 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Archives</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="archives">
-    <h2 id="indicators">Archived Releases</h2>
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <h2 id="indicators">Archived Releases</h2>
 
 <ul>
-  <li>4.1
+  <li>4.12
+    <ul>
+      <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2">apache-cloudstack-4.12.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2.sha">SHA512</a> ]</li>
+    </ul>
+  </li>
+  <li>4.11
+    <ul>
+      <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2">apache-cloudstack-4.11.2.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.2.0/apache-cloudstack-4.11.2.0-src.tar.bz2.sha">SHA512</a> ]</li>
+      <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2">apache-cloudstack-4.11.1.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.1.0/apache-cloudstack-4.11.1.0-src.tar.bz2.sha">SHA512</a> ]</li>
+      <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2">apache-cloudstack-4.11.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2.sha">SHA512</a> ]</li>
+    </ul>
+  </li>
+  <li>4.10
     <ul>
       <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.10.0.0/apache-cloudstack-4.10.0.0-src.tar.bz2">apache-cloudstack-4.10.0.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.10.0.0/apache-cloudstack-4.10.0.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.10.0.0/apache-cloudstack-4.10.0.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.10.0.0/apache-cloudstack-4.10.0.0-src.tar.bz2.sha">SHA512</a> ]</li>
     </ul>
   </li>
   <li>4.9
     <ul>
+      <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.9.3.1/apache-cloudstack-4.9.3.1-src.tar.bz2">apache-cloudstack-4.9.3.1.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.3.1/apache-cloudstack-4.9.3.1-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.3.1/apache-cloudstack-4.9.3.1-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.3.1/apache-cloudstack-4.9.3.1-src.tar.bz2.sha">SHA512</a> ]</li>
       <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.9.3.0/apache-cloudstack-4.9.3.0-src.tar.bz2">apache-cloudstack-4.9.3.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.3.0/apache-cloudstack-4.9.3.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.3.0/apache-cloudstack-4.9.3.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.3.0/apache-cloudstack-4.9.3.0-src.tar.bz2.sha">SHA512</a> ]</li>
       <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.9.2.0/apache-cloudstack-4.9.2.0-src.tar.bz2">apache-cloudstack-4.9.2.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.2.0/apache-cloudstack-4.9.2.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.2.0/apache-cloudstack-4.9.2.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.2.0/apache-cloudstack-4.9.2.0-src.tar.bz2.sha">SHA512</a> ]</li>
       <li><a href="http://archive.apache.org/dist/cloudstack/releases/4.9.1.0/apache-cloudstack-4.9.1.0-src.tar.bz2">apache-cloudstack-4.9.1.0.src.tar.bz2</a> [ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.1.0/apache-cloudstack-4.9.1.0-src.tar.bz2.asc">PGP</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.1.0/apache-cloudstack-4.9.1.0-src.tar.bz2.md5">MD5</a> ][ <a href="http://archive.apache.org/dist/cloudstack/releases/4.9.1.0/apache-cloudstack-4.9.1.0-src.tar.bz2.sha">SHA512</a> ]</li>
@@ -98,6 +225,8 @@
 <h3>CloudMonkey release archives</h3>
 
 <ul>
+  <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/">apache-cloudstack-cloudmonkey-6.0.0</a></li>
+  <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/">apache-cloudstack-cloudmonkey-5.3.3</a></li>
   <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.2/">apache-cloudstack-cloudmonkey-5.3.2</a></li>
   <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/">apache-cloudstack-cloudmonkey-5.3.1</a></li>
   <li><a href="http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/">apache-cloudstack-cloudmonkey-5.3.0</a></li>
@@ -115,5 +244,15 @@
   <li><a href="http://sourceforge.net/projects/cloudstack/files/CloudStack%20Acton/3.0.2/CloudStack-oss-3.0.2-1-ubuntu10.04.tar.gz/download">Binaries for Ubuntu 10.04 LTS</a></li>
 </ul>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/bylaws.html b/content/bylaws.html
index 113c01f..cf6fb6d 100644
--- a/content/bylaws.html
+++ b/content/bylaws.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Project Bylaws</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="bylaws">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -398,5 +512,15 @@
 <p>Formal votes are open for a period of at least 72 hours to allow all active
 voters time to consider the vote.</p>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/cloudstack-faq.html b/content/cloudstack-faq.html
index 0c99fb8..1d034e8 100644
--- a/content/cloudstack-faq.html
+++ b/content/cloudstack-faq.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack FAQ</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="cloudstack-faq">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -30,12 +144,12 @@
 
 <p>This page is for Frequently Asked Questions (FAQ) having to do with Apache CloudStack as a project and its use.</p>
 
-<p>Have a question that's not answered here? You might want to ask on the <a href="/mailing-lists.html">CloudStack users mailing list</a>.</p>
+<p>Have a question that's not answered here? You might want to ask on the <a href="mailing-lists.html">CloudStack users mailing list</a>.</p>
 
 <ul>
-  <li><a href="/cloudstack-faq.html#what">What is Apache CloudStack?</a></li>
-  <li><a href="/cloudstack-faq.html#private">Can I create my own private templates?</a></li>
-  <li><a href="/cloudstack-faq.html#users">How are users, accounts, and domains handled in CloudStack?</a></li>
+  <li><a href="cloudstack-faq.html#what">What is Apache CloudStack?</a></li>
+  <li><a href="cloudstack-faq.html#private">Can I create my own private templates?</a></li>
+  <li><a href="cloudstack-faq.html#users">How are users, accounts, and domains handled in CloudStack?</a></li>
 </ul>
 
 <h3 id="what-is-apache-cloudstack">What is Apache CloudStack?</h3>
@@ -75,5 +189,15 @@
 
 <p>Multiple users can exist in an account.  Users are like aliases in the account.  Users in the same account are not isolated from each other.  Most installations need not surface the notion of users; they just have one user per account.</p>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/contribute.html b/content/contribute.html
index 9a3e5ba..7cde65f 100644
--- a/content/contribute.html
+++ b/content/contribute.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Getting Involved</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="contribute">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -30,15 +144,15 @@
 
 <p>Interested in helping out with Apache CloudStack? Great! We welcome participation from anybody willing to work <a href="http://theapacheway.com/">The Apache Way</a> and make a contribution.</p>
 
-<p>Note that you <strong>do not have to be a developer</strong> in order to contribute to Apache CloudStack. We need folks to help with documentation, translation, promotion, and having someone with snazzy Web design skills would not be a bad thing! Want to give a talk about Apache CloudStack, or even organize a CloudStack event? <a href="/mailing-lists.html">We're all ears – join us on the Marketing list and we'll help you get started</a>!</p>
+<p>Note that you <strong>do not have to be a developer</strong> in order to contribute to Apache CloudStack. We need folks to help with documentation, translation, promotion, and having someone with snazzy Web design skills would not be a bad thing! Want to give a talk about Apache CloudStack, or even organize a CloudStack event? <a href="mailing-lists.html">We're all ears – join us on the Marketing list and we'll help you get started</a>!</p>
 
-<p>Developers, of course, are also welcome. See the <a href="/developers.html">Developer Resources</a> page!</p>
+<p>Developers, of course, are also welcome. See the <a href="developers.html">Developer Resources</a> page!</p>
 
 <p>If you just want to report a bug, that's easily done in our <a href="https://issues.apache.org/jira/browse/CLOUDSTACK">Jira bug tracking tool</a>.</p>
 
 <h2 id="where-to-ask-for-help">Where To Ask For Help</h2>
 
-<p>Need some help getting started? Feel free to ask on the <a href="/mailing-lists.html">mailing list</a> or find us on one of the following IRC channels on irc.freenode.net:</p>
+<p>Need some help getting started? Feel free to ask on the <a href="mailing-lists.html">mailing list</a> or find us on one of the following IRC channels on irc.freenode.net:</p>
 
 <ul>
   <li>#cloudstack - General Apache CloudStack conversation and end user support</li>
@@ -46,5 +160,15 @@
   <li>#cloudstack-meeting - Weekly and ad-hoc meeting room for the Apache CloudStack community</li>
 </ul>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/developers.html b/content/developers.html
index 3bb5c6d..f09f47f 100644
--- a/content/developers.html
+++ b/content/developers.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Developer Resources for Apache CloudStack</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="developers">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -44,9 +158,10 @@
 </ul>
 </p>
 
-<p>Apache CloudStack has a read-only mirror on <a href="https://github.com/apache/cloudstack" target="_blank">GitHub</a> that is kept in sync with the canonical Git repo maintained by the Apache Software Foundation. Submitting GitHub pull requests is the easiest way to get your contribution upstream. For detailed instructions see the link below:</p>
-
-<br /><a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md" target="_blank">GitHub Contribution Guidelines</a>
+<p>Apache CloudStack has a read-only mirror on <a href="https://github.com/apache/cloudstack" target="_blank">GitHub</a> that is kept in sync with the 
+canonical Git repo maintained by the Apache Software Foundation. Submitting GitHub pull requests is the easiest way to get your contribution upstream. 
+For detailed instructions see the link below:<br />
+<a href="https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md" target="_blank">GitHub Contribution Guidelines</a></p>
 
 <h3>Submitting a patch through JIRA</h3>
 
@@ -58,56 +173,123 @@
 
 <p>In short, communication is a vital part of making a contribution to an Apache project.</p>
 
-<h3> Getting Started </h3>
+<h3>Getting Started</h3>
 
-<p>First, lets make sure that you've added your name and email to your `~/.gitconfig`:</p>
+<h4>Fork the code</h4>
+
+<p>In your browser, navigate to: <a href="https://github.com/apache/cloudstack">https://github.com/apache/cloudstack</a>.</p>
+
+<p>Fork the repository by clicking on the 'Fork' button on the top right hand side.  The fork will happen and you will be taken to your own
+fork of the repository. Copy the Git repository URL by clicking on the clipboard next to the URL on the right hand side of the page under '<b>HTTPS</b> clone URL'.
+You will paste this URL when doing the following <code>git clone</code> command.</p>
+
+On your computer, follow these steps to setup a local repository for working on ACS:
 
 <pre>
-$ git config --global user.name "Your Name"
-$ git config --global user.email you@domain.com
+$ git clone https://github.com/YOUR_ACCOUNT/cloudstack.git
+$ cd cloudstack
+$ git remote add upstream https://github.com/apache/cloudstack.git
+$ git checkout master
+$ git fetch upstream
+$ git rebase upstream/master
 </pre>
 
-<p>You'll grab the CloudStack source with git:</p>
+<h4>Making Changes</h4>
+
+<p>It is important that you create a new branch to make changes on and that you do not change the 
+<code>master</code> branch (other than to rebase in changes from <code>upstream/master</code>).  In this example I will assume you will be making your changes 
+to a branch called <code>feature_x</code>. This <code>feature_x</code> branch will be created on your local repository and will be pushed to your
+forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the ACS project.</p>
+
+<p>It is best practice to create a new branch each time you want to contribute to the project and only track the changes for that pull request in this branch.</p>
 
 <pre>
-$ git clone https://gitbox.apache.org/repos/asf/cloudstack.git
+$ git checkout -b feature_x
+   (make your changes)
+$ git status
+$ git add .
+$ git commit -a -m "descriptive commit message for your changes"
 </pre>
 
-<p>If you already have the source, make sure you're working with the most recent version. Do a `git pull` if you cloned the source more than a few hours ago. (Apache CloudStack development can move pretty fast!)</p>
+<blockquote>The <code>-b</code> specifies that you want to create a new branch called <code>feature_x</code>.  You only specify <code>-b</code> the first time you 
+checkout because you are creating a new branch.  Once the <code>feature_x</code> branch exists, you can later switch to it with only <code>git checkout feature_x</code>.</blockquote>
+
+<h4>Rebase <code>feature_x</code> to include updates from <code>upstream/master</code></h4>
+
+<p>It is important that you maintain an up-to-date <code>master</code> branch in your local repository.  This is done by rebasing in the code 
+changes from <code>upstream/master</code> (the official ACS project repository) into your local repository.  You will want to do this before you start 
+working on a feature as well as right before you submit your changes as a pull request. We recommend you do this process periodically while you work to make 
+sure you are working off the most recent project code.</p>
+
+<p>This process will do the following:</p>
+
+<ol>
+  <li>Checkout your local <code>master</code> branch;</li>
+  <li>Synchronize your local <code>master</code> branch with the <code>upstream/master</code> so you have all the latest changes from the project;</li>
+  <li>Rebase the latest project code into your <code>feature_x</code> branch so it is up-to-date with the upstream code.</li>
+</ol>
 
 <pre>
-$ git checkout -b mybranch
+$ git checkout master
+$ git fetch upstream
+$ git rebase upstream/master
+$ git checkout feature_x
+$ git rebase master
 </pre>
 
-<p>This does two things: One, it creates the branch <em>mybranch</em> and two, it changes your working branch to <em>mybranch</em>. Running `git branch` will show you which branch you're working on, with an asterisk next to the active branch, like so:</p>
+<blockquote>Now your <code>feature_x</code> branch is up-to-date with all the code in <code>upstream/master</code>.</blockquote>
+
+<h4>Make a GitHub pull request to contribute your changes</h4>
+
+<p>When you are happy with your changes and you are ready to contribute them, you will create a Pull Request on GitHub to do so.
+This is done by pushing your local changes to your forked repository (default remote name is <code>origin</code>) and then initiating a pull request on GitHub.</p>
+
+<p>Please include JIRA ID or GitHub ID, detailed information about the bug/feature, what all tests are executed, how the reviewer can test this
+feature etc. Incase of UI PRs, a screenshot is preferred.</p>
+
+<blockquote><b>IMPORTANT:</b>Make sure you have rebased your <code>feature_x</code> branch to include the latest code from <code>upstream/master</code> <b>before</b>
+you do this.</blockquote>
 
 <pre>
-[user@localhost cloudstack]$ git branch
-  master
-  * mybranch
-  </pre>
+$ git push origin master
+$ git push origin feature_x
+</pre>
 
-<p>Make whatever changes you're going to make, be sure to use <code>git add</code> to stage the changes, and then you're going to commit the changes to your working branch:</p>
+<p>Now that the <code>feature_x</code> branch has been pushed to your GitHub repository, you can initiate the pull request.</p>
 
-<pre>git commit -m "Insert a meaningful summary of changes here."</pre>
+<p>To initiate the pull request, do the following:</p>
 
-<p>Finally, you can create a patch and attach it to the JIRA issue that you created for the bug you are fixing.</p>
+<ol>
+<li>In your browser, navigate to your forked repository: <b>https://github.com/YOUR_ACCOUNT/cloudstack</b>;</li>
+<li>Click the new button called '<b>Compare &amp; pull request</b>' that showed up just above the main area in your forked repository;</li>
+<li>Validate the pull request will be into the upstream <code>master</code> and will be from your <code>feature_x</code> branch;</li>
+<li>Enter a detailed description of the work you have done and then click '<b>Send pull request</b>'.</li>
+</ol>
 
-<pre>git format-patch master --stdout &gt; ~/patch-name.patch</pre>
+<p>If you are requested to make modifications to your proposed changes, make the changes locally on your <code>feature_x</code> branch, re-push
+the <code>feature_x</code> branch to your fork. The existing pull request should automatically pick up the change and update accordingly.</p>
 
-<h3>Review</h3>
+<h4>Cleaning up after a successful pull request</h4>
 
-<p>Once you've submitted your pull request, you should receive a response within a few days. If you receive no response within a week, please ping the cloudstack-dev mailing list (dev@cloudstack.apache.org).</p>
+<p>Once the <code>feature_x</code> branch has been committed into the <code>upstream/master</code> branch, your local <code>feature_x</code> branch
+and the <code>origin/feature_x</code> branch are no longer needed. If you want to make additional changes, restart the process with a new branch.</p>
 
-<h3>Screencast</h3>
+<blockquote><b>IMPORTANT:</b>Make sure that your changes are in <code>upstream/master</code>before you delete your <code>feature_x</code>
+and <code>origin/feature_x</code> branches!</blockquote>
 
-<p>If you are new to git you might want to watch this screencast:</p>
+<p>You can delete these deprecated branches with the following:</p>
 
-<iframe width="560" height="315" src="//www.youtube.com/embed/3c5JIW4onGk?list=PLb899uhkHRoZCRE00h_9CRgUSiHEgFDbC" frameborder="0" allowfullscreen=""></iframe>
+<pre>
+$ git checkout master
+$ git branch -D feature_x
+$ git push origin :feature_x
+</pre>
 
 <h3>Further Reading</h3>
 
-<p>You might want to peruse the <a href="http://www.apache.org/foundation/getinvolved.html" target="_blank">Get Involved</a> page on Apache.org, and the <a href="http://commons.apache.org/patches.html" target="_blank">On Contributing Patches</a> doc as well. Note that some of that does not apply to Apache CloudStack, as we're using git rather than Subversion. But do respect the original style of the CloudStack code, and ensure that you're using spaces rather than tabs, and your patches have Unix line endings (LF) rather than Windows-type line endings (CRLF).</p>
+<p>You might want to peruse the <a href="http://www.apache.org/foundation/getinvolved.html" target="_blank">Get Involved</a> page on Apache.org. 
+Please, respect the original style of the CloudStack code, and ensure that you're using spaces rather than tabs, and your code have Unix line 
+endings (LF) rather than Windows-type line endings (CRLF).</p>
 
 </div>
 
@@ -142,7 +324,7 @@
 
 <div class="panel-heading">
                 
-<h3 class="panel-title">Git Repositories</h3>
+<h3 class="panel-title">CloudStack Git Repositories</h3>
               
 </div>
               
@@ -153,18 +335,17 @@
 <ul>
 <li><a href="https://gitbox.apache.org/repos/asf/cloudstack.git" target="_blank">Apache CloudStack source code</a></li>
 <li><a href="https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git" target="_blank">Apache CloudStack Cloudmonkey source code</a></li>
-<li><a href="https://github.com/apache/cloudstack-ec2stack" target="_blank">Apache CloudStack EC2stack Inteface</a></li>
-<li><a href="https://github.com/apache/cloudstack-gcestack" target="_blank">Apache CloudStack GCEstack Interface</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs" target="_blank">General Documentation</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-install" target="_blank">Installation Guide</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-admin" target="_blank">Administrative Guide</a></li>
-<li><a href="https://github.com/apache/cloudstack-docs-rn" target="_blank">Release Notes</a></li>
+<li><a href="https://github.com/apache/cloudstack-documentation" target="_blank">Documentation</a></li>
 <li><a href="https://github.com/apache/cloudstack-www" target="_blank">Apache CloudStack Website</a></li>
 </ul>
 
 <p>To get the most recent source for Apache CloudStack, use:</p>
 
 <pre>
+git clone https://github.com/apache/cloudstack.git
+</pre>
+or 
+<pre>
 git clone https://gitbox.apache.org/repos/asf/cloudstack.git
 </pre>
 
@@ -182,5 +363,15 @@
 </div>
 
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/downloads.html b/content/downloads.html
index 4791dd7..3162ef2 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -287,7 +287,7 @@
 <p>This is non-LTS release of CloudStack.</p>
 
 <p>
-    <a href="https://dist.apache.org/repos/dist/release/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2">
+    <a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.12.0.0/apache-cloudstack-4.12.0.0-src.tar.bz2">
         <button type="button" class="btn btn-primary btn-md">
             Get the 4.12.0.0 Source
         </button>
@@ -433,39 +433,23 @@
 
 <h4 id="source-release">Source Release</h4>
 
-<p>CloudMonkey's current release is 5.3.3.</p>
+<p>CloudMonkey's current release is 6.0.0.</p>
 
 <p>
-<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the 5.3.3 Source</button></a>
+<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the 6.0.0 Source</button></a>
 
 <a href="http://www.apache.org/dist/cloudstack/KEYS"><button type="button" class="btn btn-info btn-xs">KEYS</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.asc"><button type="button" class="btn btn-info btn-xs">PGP</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.md5"><button type="button" class="btn btn-info btn-xs">MD5</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2.asc"><button type="button" class="btn btn-info btn-xs">PGP</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2.md5"><button type="button" class="btn btn-info btn-xs">MD5</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-6.0.0/apache-cloudstack-cloudmonkey-6.0.0-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
 
 </p>
 
-<p>Instructions for building and installing from source can be found in the included <a href="https://gitbox.apache.org/repos/asf?p=cloudstack-cloudmonkey.git;a=blob_plain;f=README.md">README.md</a> file.</p>
+<h4 id="github-release">Binary Builds Release</h4>
 
-<h4 id="pypi-package">PyPi Package</h4>
+<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the python package to the <a href="https://github.com/apache/cloudstack-cloudmonkey/releases">Apache CloudStack CloudMonkey Github release</a> page.</p>
 
-<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the python package to the <a href="https://pypi.python.org/pypi/cloudmonkey/">Python Package Index</a>.</p>
-
-<p>For installing the package from pypi, use:</p>
-
-<pre><code>$ pip install cloudmonkey
-</code></pre>
-
-<p>To upgrade:</p>
-
-<pre><code>$ pip install --upgrade cloudmonkey
-</code></pre>
-
-<p>Though a clean upgrade is recommended:</p>
-
-<pre><code>$ pip uninstall cloudmonkey
-$ pip install cloudmonkey
-</code></pre>
+<p>For installing, upgrade, usage, please see the project <a href="https://github.com/apache/cloudstack-cloudmonkey/wiki/Getting-Started#installation">wiki</a>.</p>
 
 <p><a name="archives"></a></p>
 
@@ -478,15 +462,8 @@
 <h2 id="indicators">Archived Releases</h2>
 
 You can find links to all the releases of Apache CloudStack on the <a href="archives.html">archives page</a>.
-</div></div></div>
-
-
-            <footer>
-                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
-                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
-                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
-            </footer>
-
+</div></div>
+</div>
         </div>
     </div>
 </div>
diff --git a/content/features.html b/content/features.html
index 6271258..6f0e905 100644
--- a/content/features.html
+++ b/content/features.html
@@ -1,24 +1,138 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Features</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="features">
-    <h2 id="i-classicon-cloudi-apache-cloudstack-features"><i class="icon-cloud"></i> Apache CloudStack Features</h2>
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <h2 id="i-classicon-cloudi-apache-cloudstack-features"><i class="icon-cloud"></i> Apache CloudStack Features</h2>
 
 <p>As a mature and turnkey Infrastructure-as-a-Service (IaaS) platform, Apache CloudStack has a comprehensive set of features. This is an extensive, but not exhaustive, set of features.</p>
 
-<p>Have a feature request? We'd invite you to <a href="/mailing-lists.html">bring it up on the mailing list</a>, and consider <a href="https://issues.apache.org/jira/browse/CLOUDSTACK">filing a feature request in our bug tracker</a>.</p>
+<p>Have a feature request? We'd invite you to <a href="mailing-lists.html">bring it up on the mailing list</a>, and consider <a href="https://issues.apache.org/jira/browse/CLOUDSTACK">filing a feature request in our bug tracker</a>.</p>
 
 <table id="features" style="width: 100%;" border="1" cellpadding="2" cellspacing="2">
 <tbody>
@@ -198,5 +312,15 @@
 </table>
 
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/history.html b/content/history.html
index b51e2c3..fc715e7 100644
--- a/content/history.html
+++ b/content/history.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>History of Apache CloudStack</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="history">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -39,5 +153,15 @@
 <p>Apache CloudStack graduated from the Incubator on March 20, 2013, and the announcement was released on <a href="https://blogs.apache.org/cloudstack/entry/the_apache_software_foundation_announces">March 25, 2013</a>.</p>
 
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/mailing-lists.html b/content/mailing-lists.html
index a088458..6d39b7b 100644
--- a/content/mailing-lists.html
+++ b/content/mailing-lists.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Mailing Lists</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="mailing-lists">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -33,24 +147,31 @@
 <p>The project currently has several lists:</p>
 
 <ul>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-announce/">announce@</a>: Project release, security and other announcements. This is a very low volume list.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-users/">users@</a>: This list is for users of CloudStack to seek and provide support. This is a moderately high volume list.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-dev/">dev@</a>: Where discussions about development and the project itself happen. This is a high volume list.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-commits/">commits@</a>: This list is for commits to the CloudStack git repository. It's a high volume list with automated messages, probably of limited interest to anyone who is not actively developing Apache CloudStack.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-issues/">issues@</a>: Notifications from CloudStack's Jira project. This is a high volume list.</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-marketing/">marketing@</a>: Discussions about marketing CloudStack.</li>
+  <li><a href="https://lists.apache.org/list.html?announce@cloudstack.apache.org">announce@</a>: Project release, security and other announcements. This is a very low volume list.</li>
+  <li><a href="https://lists.apache.org/list.html?users@cloudstack.apache.org">users@</a>: This list is for users of CloudStack to seek and provide support. This is a moderately high volume list.</li>
+  <li><a href="https://lists.apache.org/list.html?dev@cloudstack.apache.org">dev@</a>: Where discussions about development and the project itself happen. This is a high volume list.</li>
+  <li><a href="https://lists.apache.org/list.html?commits@cloudstack.apache.org">commits@</a>: This list is for commits to the CloudStack git repository. It's a high volume list with automated messages, probably of limited interest to anyone who is not actively developing Apache CloudStack.</li>
+  <li><a href="https://lists.apache.org/list.html?issues@cloudstack.apache.org">issues@</a>: Notifications from CloudStack's Jira project. This is a high volume list.</li>
+  <li><a href="https://lists.apache.org/list.html?marketing@cloudstack.apache.org">marketing@</a>: Discussions about marketing CloudStack.</li>
 </ul>
 
 <p>The preferred language to use on the lists above is English. To support the global nature of the CloudStack user community, we also have the following regionally specific user lists:</p>
 
 <ul>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/cloudstack-users-cn/">users-cn@</a>: Chinese</li>
+  <li><a href="https://lists.apache.org/list.html?users-cn@cloudstack.apache.org">users-cn@</a>: Chinese</li>
 </ul>
 
-<form action="http://markmail.org/search/list:org.apache.incubator.cloudstack-*">
-<strong>Search the CloudStack Mailing Lists on MarkMail</strong>: <input type="text" name="q" size="50" />
-<input type="submit" value="Search" />
-</form>
+<div>
+	<strong>Search the CloudStack Mailing Lists</strong>: <input id="queryStringToSearchOnMailingList" type="text" name="q" size="60" />
+	<a id="searchOnCloudStackMailingLists" class="button" target="_blank" href="#">Search</a>
+</div>
+
+<script>
+	var searchEmailListBaseUrl = "https://lists.apache.org/list.html?users@cloudstack.apache.org:lte=1M&q=";
+	$('#queryStringToSearchOnMailingList').change(function(){
+		$('#searchOnCloudStackMailingLists').attr('href', searchEmailListBaseUrl + $(this).val());
+	});
+</script>
 
 <h2 id="to-subscribe-to-the-mailing-lists">To Subscribe to the Mailing Lists</h2>
 
@@ -86,5 +207,15 @@
 
 <p>We expect all participants on the mailing list to treat one another professionally and politely.</p>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/security.html b/content/security.html
index 721e793..fa4c007 100644
--- a/content/security.html
+++ b/content/security.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Security</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="security">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -85,5 +199,15 @@
 <p>Further information about Apache CloudStack's security practices can be found in the <a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Security">CloudStack Security wiki page</a>.</p>
 
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/software.html b/content/software.html
index c46cc9d..c05c403 100644
--- a/content/software.html
+++ b/content/software.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Open Source Cloud Computing</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="software">
-    <h2 id="i-classicon-cloudi-understanding-apache-cloudstack"><i class="icon-cloud"></i> Understanding Apache CloudStack</h2>
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <h2 id="i-classicon-cloudi-understanding-apache-cloudstack"><i class="icon-cloud"></i> Understanding Apache CloudStack</h2>
 
 <p><img src="/cloudstack/images/cloudstack-oss-architecture.png" class="illustration" width="294" height="333" /> 
 Apache CloudStack is open source software that forms the foundation for infrastructure clouds. Data center operators can quickly and easily build cloud services within their existing infrastructure to offer on-demand, elastic cloud services. Enterprises can use CloudStack to take on hybrid workloads, making it easier to manage legacy workloads while spinning up workloads that take advantage of the cloud model.</p>
@@ -45,7 +159,7 @@
   <li><strong>Robust RESTful API</strong> - CloudStack implements industry-standard APIs on top of a low-level CloudStack API with its own unique and innovative features. Although the CloudStack API is documented, maintained and supported, CloudStack does not assert it as your only option! We also have support for the EC2/S3 API and may implement other cloud API standards as they become available.</li>
 </ul>
 
-<p>For a full list of features, see <a href="/features.html">our feature list</a>.</p>
+<p>For a full list of features, see <a href="features.html">our feature list</a>.</p>
 
 <h3 id="benefits">Benefits</h3>
 
@@ -59,7 +173,17 @@
 
 <h3 id="download-now">Download Now</h3>
 
-<p>You can get started with CloudStack immediately. See our <a href="/downloads.html">downloads page</a> for source code and convenience binaries.</p>
+<p>You can get started with CloudStack immediately. See our <a href="downloads.html">downloads page</a> for source code and convenience binaries.</p>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/survey.html b/content/survey.html
index 7a3a903..29253c6 100644
--- a/content/survey.html
+++ b/content/survey.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Survey</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="survey">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -28,9 +142,19 @@
 
 </div>
 
-<iframe height="2000" allowtransparency="true" frameborder="0" scrolling="yes" style="width:100%;border:none" src="//www.formwize.com/run/survey3.cfm?id=7191&amp;embed">
-<a href="//www.formwize.com/run/survey3.cfm?id=7191" title="CloudStack Survey">Fill out my form</a>
+<iframe height="2000" allowtransparency="true" frameborder="0" scrolling="yes" style="width:100%;border:none" src="https://www.formwize.com/run/survey3.cfm?idx=505d040e080008&amp;embed">
+<a href="https://www.formwize.com/run/survey3.cfm?idx=505d040e080008" title="CloudStack Survey">Fill out my form</a>
 </iframe>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/trademark-guidelines.html b/content/trademark-guidelines.html
index 223c688..9a40bf9 100644
--- a/content/trademark-guidelines.html
+++ b/content/trademark-guidelines.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Trademark Guidelines</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="trademark-guidelines">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -173,5 +287,15 @@
 names is generally not "nominative fair use."</p>
 </blockquote>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/users.html b/content/users.html
index 6f1be11..104cf51 100644
--- a/content/users.html
+++ b/content/users.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Users</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="users">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -32,20 +146,20 @@
 
 <p>Our users include many major service providers running CloudStack to offer public cloud services, product vendors who incorporate or integrate with Cloudstack in their own products, organisations who have used Cloudstack to build their own private clouds, and systems integrators that offer CloudStack related services.</p>
 
-<p><strong>Are you using CloudStack ?</strong></p>
+<h2 id="how-to-add-your-company-in-the-list">How to Add your Company in The List</h2>
 
-<p>If you are using CloudStack in your organisation and your company is not listed here, please complete our brief adoption <a href="/survey.html">survey</a>. We’re happy to keep your company name anonymous if you require.</p>
+<p>If you are using CloudStack in your organisation and your company is not listed here, please send a pull request to the GitHub <a href="https://github.com/apache/cloudstack-www/blob/master/source/users.markdown">page</a>.</p>
 
-<p><strong>Noticed Something wrong ?</strong></p>
+<h2 id="how-to-request-the-entry-removal-or-change">How to Request the Entry Removal or Change</h2>
 
-<p>If you noticed something wrong  with your entry here (or if you’d like us to remove it), please complete our adoption <a href="/survey.html">survey</a>. We will use the information you give us in this survey to update the contents of this page</p>
+<p>If you noticed something wrong with your entry here (or if you’d like us to remove it), please send a pull request to the GitHub <a href="https://github.com/apache/cloudstack-www/blob/master/source/users.markdown">page</a> or write your concerns to the mail-list <strong>users@cloudstack.apache.org</strong>.</p>
 
 <ul>
   <li><a href="http://www.actonmagic.com">ActOnMagic</a></li>
   <li><a href="http://www.appcore.com">Appcore</a></li>
   <li><a href="http://axiomio.com">AxiomIO</a></li>
   <li><a href="http://www.ayaline.com">Ayaline</a></li>
-  <li><a href="http://www.bautzen-it.de">BIT.Group GmbH</a></li>
+  <li><a href="https://itelligencegroup.com/de/trends/cloud-loesungen/">Itelligence Global Managed Services GmbH</a></li>
   <li><a href="http://btcloud.bt.com">BT</a></li>
   <li><a href="http://www.cloudops.com">CloudOps</a></li>
   <li><a href="http://www.codero.com">Codero</a></li>
@@ -68,12 +182,14 @@
   <li><a href="http://nectar.org.au">Melbourne University</a></li>
   <li><a href="http://www.miriadis.com">Miriadis</a></li>
   <li><a href="http://neobitti.fi">Neobitti</a></li>
+  <li><a href="https://netpoint-dc.com/">NetPoint</a></li>
   <li><a href="http://www.openminds.be">Openminds</a></li>
   <li><a href="http://stacksquare.com">Overweb srl</a></li>
   <li><a href="http://polcom.com.pl">Polcom</a></li>
   <li><a href="http://www.reliablenetworks.com">Reliable Networks</a></li>
   <li><a href="http://www.redbridge.se">Redbridge</a></li>
   <li><a href="https://www.safeswisscloud.ch">SafeSwiss Cloud</a></li>
+  <li><a href="https://www.hiagdata.com">HIAG Data AG</a></li>
   <li><a href="http://www.sjcloud.cn/index.xhtml">SJC Inc</a></li>
   <li><a href="http://www.telia.lv">Telia Latvia</a></li>
   <li><a href="http://www.tqhosting.com">Tranquil Hosting</a></li>
@@ -97,7 +213,6 @@
   <li>Amdocs</li>
   <li>Amysta</li>
   <li>Angani</li>
-  <li>Anolim</li>
   <li>Apalia</li>
   <li>Appcara Inc.</li>
   <li>Appcore</li>
@@ -264,5 +379,15 @@
   <li>Zynga</li>
 </ul>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/videos.html b/content/videos.html
index 8235e94..89f59bc 100644
--- a/content/videos.html
+++ b/content/videos.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Videos on Apache CloudStack</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="videos">
-    <h2 id="i-classicon-filmi-videos-and-screencasts-on-apache-cloudstack"><i class="icon-film"></i> Videos and Screencasts on Apache CloudStack</h2>
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <h2 id="i-classicon-filmi-videos-and-screencasts-on-apache-cloudstack"><i class="icon-film"></i> Videos and Screencasts on Apache CloudStack</h2>
 
 <p>Looking for more info on Apache CloudStack? We've collected a number of videos that explore and explain Apache CloudStack.</p>
 
@@ -37,5 +151,15 @@
 <iframe width="560" height="315" src="http://www.youtube.com/embed/uSwisRfJVdM" frameborder="0" allowfullscreen=""></iframe>
 
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/content/who.html b/content/who.html
index 57b9882..7a35ea6 100644
--- a/content/who.html
+++ b/content/who.html
@@ -1,20 +1,134 @@
 <!doctype html>
-<html>
+<html>  
   <head>
-    <meta charset="utf-8">
+    <title>Apache CloudStack: Open Source Cloud Computing</title>
 
-    <!-- Always force latest IE rendering engine or request Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
 
-    <!-- Use title if it's in the page YAML frontmatter -->
-    <title>Apache CloudStack Project Membership</title>
+    <meta itemprop="name" content="Apache Cloudstack">
+    <meta itemprop="description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta itemprop="image" content="https://cloudstack.apache.org/images/monkey-144.png">
 
-    <link href="/stylesheets/normalize.css" rel="stylesheet" type="text/css" /><link href="/stylesheets/all.css" rel="stylesheet" type="text/css" />
-    <script src="/javascripts/all.js" type="text/javascript"></script>
+    <meta property="og:title" content="Apache Cloudstack">
+    <meta property="og:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta property="og:site_name" content="Apache Cloudstack"/>
+    <meta property="og:image" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Apache Cloudstack">
+    <meta name="twitter:description" content="CloudStack is open source cloud computing software for creating, managing, and deploying infrastructure cloud services">
+    <meta name="twitter:image:src" content="https://cloudstack.apache.org/images/monkey-144.png">
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1">
+
+    <link href="stylesheets/bootstrap.css" rel="stylesheet" media="screen">
+    <link href="stylesheets/font-awesome.css" rel="stylesheet">
+    <link href="stylesheets/bootswatch.min.css" rel="stylesheet">
+    <link href="stylesheets/custom.css" rel="stylesheet">
+
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
+
+<!-- Commenting out this template stuff until we figure out how to make it work with middleman
+    {% if headers.atom %}
+      <link rel="alternate" href="{{ headers.atom.url }}"
+            type="application/atom+xml" title="{{ headers.atom.title }}" />
+    {% endif %}
+
+    {% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
+-->
+<!--    {% if headers.notice %}{{ headers.notice }}{% endif %} -->
+        <!-- Twitter Bootstrap and jQuery after this line. -->
+        <script src="https://code.jquery.com/jquery-latest.js"></script>
+        <script src="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+        <script>
+            $('.dropdown-toggle').dropdown();
+            $('.nav-collapse').collapse();
+        </script>
   </head>
-
-  <body class="who">
-    <div class="row">
+  <body>
+    <div class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <a href="index.html" class="navbar-brand"><img class="" src="images/new-logo-sm.png" style="width: 200px" alt="Apache Cloudstack"></a>
+                <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-main">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+            </div>
+            <div class="navbar-collapse collapse" id="navbar-main">
+                <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="about">About <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="about">
+                <li><a tabindex="-1" href="about.html">About</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1" href="https://blogs.apache.org/cloudstack/" target="_blank">Blog<span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="history.html">History</a></li>
+                <li><a tabindex="-1" href="features.html">Features</a></li>
+                <li><a tabindex="-1" href="cloudstack-faq.html">FAQ</a></li>
+                <li><a tabindex="-1" href="who.html">Who We Are</a></li>
+                <li><a tabindex="-1" href="security.html">Security</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="community">Community <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="community">
+                <li><a tabindex="-1" href="contribute.html">Get Involved</a></li>
+                <li><a tabindex="-1" href="developers.html">Developers</a></li>
+                <li><a tabindex="-1" href="mailing-lists.html">Mailing Lists</a></li>
+                <li><a tabindex="-1" href="http://cloudstackcollab.org/" target="_blank">Events &amp; Meetups <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="users">Users <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="users">
+                <li><a tabindex="-1" href="users.html">Known Users</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies" target="_blank">Case Studies <span class="glyphicon glyphicon-share-alt pull-right"></span></a></li>
+                <li><a tabindex="-1" href="survey.html">Take Survey</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="docs">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="docs">
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org" target="_blank">CloudStack Documentation</span></a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home" target="_blank">Wiki</a></li>
+                <li><a tabindex="-1" href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+Books" target="_blank">Books</a></li>
+                <li><a tabindex="-1" href="api.html">API Documentation</a></li>
+                <li class="divider"></li>
+                <li><a tabindex="-1">Archived Documentation</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-getting-started" target="_blank">&nbsp;&nbsp;&nbsp;Getting Started Docs</span></a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-installation" target="_blank">&nbsp;&nbsp;&nbsp;Installation Docs</a></li> 
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-administration" target="_blank">&nbsp;&nbsp;&nbsp;Administration Docs</a></li>
+                <li><a tabindex="-1" href="http://docs.cloudstack.apache.org/projects/archived-cloudstack-release-notes" target="_blank">&nbsp;&nbsp;&nbsp;Release Notes</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="download">
+                <li><a tabindex="-1" href="downloads.html">CloudStack Releases</a></li>
+                <li><a tabindex="-1" href="downloads.html#cloudmonkey">CloudMonkey</a></li>
+                <li><a tabindex="-1" href="archives.html">Release Archive</a></li>
+              </ul>
+            </li>
+			<li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="apache">Apache <span class="caret"></span></a>
+              <ul class="dropdown-menu" aria-labelledby="apache">
+				<li><a tabindex="-1" href="http://apache.org">Apache Software Foundation</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/licenses/">License</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                <li><a tabindex="-1" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              </ul>
+            </li>
+          </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <div class="bs-docs-section">
+            <div class="row">
 
 <div class="col-lg-12">
 
@@ -32,194 +146,51 @@
 
 <h2 id="pmc">PMC</h2>
 
-<p>Active Project Management Committee contains (in alphabetical order of their usernames):</p>
-
-<table class="table-bordered">
-  <thead>
-    <tr>
-      <th>Username</th>
-      <th>Name</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>ahuang</td>
-      <td>Alex Huang</td>
-    </tr>
-    <tr>
-      <td>akarasulu</td>
-      <td>Alex Karasulu</td>
-    </tr>
-    <tr>
-      <td>alena1108</td>
-      <td>Alena Prokharchyk</td>
-    </tr>
-    <tr>
-      <td>animesh</td>
-      <td>Animesh</td>
-    </tr>
-    <tr>
-      <td>bhaisaab</td>
-      <td>Rohit Yadav</td>
-    </tr>
-    <tr>
-      <td>boris</td>
-      <td>Boris Schrijver</td>
-    </tr>
-    <tr>
-      <td>chipchilders</td>
-      <td>Chip Childers</td>
-    </tr>
-    <tr>
-      <td>chiradeep</td>
-      <td>Chiradeep Vittal</td>
-    </tr>
-    <tr>
-      <td>dahn</td>
-      <td>Daan</td>
-    </tr>
-    <tr>
-      <td>duffy</td>
-      <td>Ian Duffy</td>
-    </tr>
-    <tr>
-      <td>edison</td>
-      <td>Disheng Su</td>
-    </tr>
-    <tr>
-      <td>ekho</td>
-      <td>Wilder Rodrigues</td>
-    </tr>
-    <tr>
-      <td>erikw</td>
-      <td>Erik Weber</td>
-    </tr>
-    <tr>
-      <td>giles</td>
-      <td>Giles Sirett</td>
-    </tr>
-    <tr>
-      <td>gochiba</td>
-      <td>Go Chiba</td>
-    </tr>
-    <tr>
-      <td>hogstrom</td>
-      <td>Matt Richard Hogstrom</td>
-    </tr>
-    <tr>
-      <td>hugo</td>
-      <td>Hugo Trippaers</td>
-    </tr>
-    <tr>
-      <td>ilya</td>
-      <td>Ilya Musayev</td>
-    </tr>
-    <tr>
-      <td>jburwell</td>
-      <td>John Burwell</td>
-    </tr>
-    <tr>
-      <td>jim</td>
-      <td>Jim Jagielski</td>
-    </tr>
-    <tr>
-      <td>jlk</td>
-      <td>John Kinsella</td>
-    </tr>
-    <tr>
-      <td>jzb</td>
-      <td>Joe Brockmeier</td>
-    </tr>
-    <tr>
-      <td>karenv</td>
-      <td>Karen Vuong</td>
-    </tr>
-    <tr>
-      <td>ke4qqq</td>
-      <td>David Nalley</td>
-    </tr>
-    <tr>
-      <td>kluge</td>
-      <td>Kevin Kluge</td>
-    </tr>
-    <tr>
-      <td>milamber</td>
-      <td>Bruno Demion</td>
-    </tr>
-    <tr>
-      <td>mlsorensen</td>
-      <td>Marcus Sorensen</td>
-    </tr>
-    <tr>
-      <td>mnour</td>
-      <td>Mohammad Nour El-Din</td>
-    </tr>
-    <tr>
-      <td>mrhinkle</td>
-      <td>Mark R. Hinkle</td>
-    </tr>
-    <tr>
-      <td>mtutkowski</td>
-      <td>Mike Tutkowski</td>
-    </tr>
-    <tr>
-      <td>nslater</td>
-      <td>Naomi Slater</td>
-    </tr>
-    <tr>
-      <td>nux</td>
-      <td>Nux</td>
-    </tr>
-    <tr>
-      <td>olamy</td>
-      <td>Olivier Lamy</td>
-    </tr>
-    <tr>
-      <td>paul_a</td>
-      <td>Paul Angus</td>
-    </tr>
-    <tr>
-      <td>pdion891</td>
-      <td>Pierre-Luc Dion</td>
-    </tr>
-    <tr>
-      <td>rafael</td>
-      <td>Rafael Weingärtner</td>
-    </tr>
-    <tr>
-      <td>rajani</td>
-      <td>Rajani Karuturi</td>
-    </tr>
-    <tr>
-      <td>remi</td>
-      <td>Remi Bergsma</td>
-    </tr>
-    <tr>
-      <td>sebgoa</td>
-      <td>Sebastien Goasguen</td>
-    </tr>
-    <tr>
-      <td>sweller</td>
-      <td>Simon Weller</td>
-    </tr>
-    <tr>
-      <td>swill</td>
-      <td>Will Stevens</td>
-    </tr>
-    <tr>
-      <td>tsp</td>
-      <td>Prasanna</td>
-    </tr>
-    <tr>
-      <td>widodh</td>
-      <td>Wido den Hollander</td>
-    </tr>
-    <tr>
-      <td>willchan</td>
-      <td>William Chan</td>
-    </tr>
-  </tbody>
-</table>
+<p class="table-bordered">Active Project Management Committee contains (in alphabetical order of their usernames):</p>
+<p>| Username | Name |
+|———-|——|
+|akarasulu|Alex Karasulu|
+|alena1108|Alena Prokharchyk|
+|animesh|Animesh|
+|boris|Boris Schrijver|
+|chipchilders|Chip Childers|
+|chiradeep|Chiradeep Vittal|
+|dahn|Daan|
+|ekho|Wilder Rodrigues|
+|erikw|Erik Weber|
+|giles|Giles Sirett|
+|gochiba|Go Chiba|
+|hogstrom|Matt Richard Hogstrom|
+|hugo|Hugo Trippaers|
+|ilya|Ilya Musayev|
+|jburwell|John Burwell|
+|jlk|John Kinsella|
+|jzb|Joe Brockmeier|
+|karenv|Karen Vuong|
+|ke4qqq|David Nalley|
+|kluge|Kevin Kluge|
+|milamber|Bruno Demion|
+|mlsorensen|Marcus Sorensen|
+|mnour|Mohammad Nour El-Din|
+|mrhinkle|Mark R. Hinkle|
+|mtutkowski|Mike Tutkowski|
+|nslater|Naomi Slater|
+|nux|Nux|
+|paul_a|Paul Angus|
+|pdion891|Pierre-Luc Dion|
+|rafael|Rafael Weingärtner|
+|rajani|Rajani Karuturi|
+|remi|Remi Bergsma|
+|resmo|Rene Moser|
+|rohit|Rohit Yadav|
+|sebgoa|Sebastien Goasguen|
+|sweller|Simon Weller|
+|swill|Will Stevens|
+|syed|Syed Ahmed|
+|tsp|Prasanna|
+|weizhou|Wei Zhou|
+|widodh|Wido den Hollander|
+|willchan|William Chan|</p>
 
 <h2 id="emeritus-pmc-members">Emeritus PMC Members</h2>
 <p>PMC members who are no longer active include:</p>
@@ -235,467 +206,139 @@
 
 <p>Active list of committers (in alphabetical order of their usernames)</p>
 
-<table class="table-bordered">
-  <thead>
-    <tr>
-      <th>Username</th>
-      <th>Name</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>ahmad</td>
-      <td>Ahmad Emneina</td>
-    </tr>
-    <tr>
-      <td>ahuang</td>
-      <td>Alex Huang</td>
-    </tr>
-    <tr>
-      <td>akarasulu</td>
-      <td>Alex Karasulu</td>
-    </tr>
-    <tr>
-      <td>alena1108</td>
-      <td>Alena Prokharchyk</td>
-    </tr>
-    <tr>
-      <td>amoghvk</td>
-      <td>Amogh Vasekar</td>
-    </tr>
-    <tr>
-      <td>animesh</td>
-      <td>Animesh</td>
-    </tr>
-    <tr>
-      <td>anthonyxu</td>
-      <td>Anthony Xu</td>
-    </tr>
-    <tr>
-      <td>aprateek</td>
-      <td>Abhinandan Prateek</td>
-    </tr>
-    <tr>
-      <td>bfederle</td>
-      <td>Brian Federle</td>
-    </tr>
-    <tr>
-      <td>bhaisaab</td>
-      <td>Rohit Yadav</td>
-    </tr>
-    <tr>
-      <td>boris</td>
-      <td>Boris Schrijver</td>
-    </tr>
-    <tr>
-      <td>brett</td>
-      <td>Brett Porter</td>
-    </tr>
-    <tr>
-      <td>chipchilders</td>
-      <td>Chip Childers</td>
-    </tr>
-    <tr>
-      <td>chiradeep</td>
-      <td>Chiradeep Vittal</td>
-    </tr>
-    <tr>
-      <td>claytonweise</td>
-      <td>Clayton Weise</td>
-    </tr>
-    <tr>
-      <td>csuich2</td>
-      <td>Chris Suich</td>
-    </tr>
-    <tr>
-      <td>dahn</td>
-      <td>Daan</td>
-    </tr>
-    <tr>
-      <td>darren</td>
-      <td>Darren Shepherd</td>
-    </tr>
-    <tr>
-      <td>dcahill</td>
-      <td>Dave Cahill</td>
-    </tr>
-    <tr>
-      <td>demetriust</td>
-      <td>Demetrius Tsitrelis</td>
-    </tr>
-    <tr>
-      <td>devdeep</td>
-      <td>Devdeep Singh</td>
-    </tr>
-    <tr>
-      <td>duffy</td>
-      <td>Ian Duffy</td>
-    </tr>
-    <tr>
-      <td>edison</td>
-      <td>Disheng Su</td>
-    </tr>
-    <tr>
-      <td>ekho</td>
-      <td>Wilder Rodrigues</td>
-    </tr>
-    <tr>
-      <td>erikw</td>
-      <td>Erik Weber</td>
-    </tr>
-    <tr>
-      <td>frankzhang</td>
-      <td>Xin Zhang</td>
-    </tr>
-    <tr>
-      <td>gaurav</td>
-      <td>Gaurav Nandkumar Aradhye</td>
-    </tr>
-    <tr>
-      <td>gavinlee</td>
-      <td>Gavin Lee</td>
-    </tr>
-    <tr>
-      <td>giles</td>
-      <td>Giles Sirett</td>
-    </tr>
-    <tr>
-      <td>girish</td>
-      <td>Girish Prabhakar Shilamkar</td>
-    </tr>
-    <tr>
-      <td>gochiba</td>
-      <td>Go Chiba</td>
-    </tr>
-    <tr>
-      <td>haeena</td>
-      <td>Toshiaki Hatano</td>
-    </tr>
-    <tr>
-      <td>harikrishna</td>
-      <td>Harikrishna Patnala</td>
-    </tr>
-    <tr>
-      <td>higster</td>
-      <td>Geoff Higginbottom</td>
-    </tr>
-    <tr>
-      <td>hogstrom</td>
-      <td>Matt Richard Hogstrom</td>
-    </tr>
-    <tr>
-      <td>hugo</td>
-      <td>Hugo Trippaers</td>
-    </tr>
-    <tr>
-      <td>ilya</td>
-      <td>Ilya Musayev</td>
-    </tr>
-    <tr>
-      <td>isaacchiang</td>
-      <td>Isaac Chiang</td>
-    </tr>
-    <tr>
-      <td>jayapal</td>
-      <td>Jayapal</td>
-    </tr>
-    <tr>
-      <td>jbausewein</td>
-      <td>Jason Bausewein</td>
-    </tr>
-    <tr>
-      <td>jburwell</td>
-      <td>John Burwell</td>
-    </tr>
-    <tr>
-      <td>jessicawang</td>
-      <td>Jessica Wang</td>
-    </tr>
-    <tr>
-      <td>jim</td>
-      <td>Jim Jagielski</td>
-    </tr>
-    <tr>
-      <td>jlk</td>
-      <td>John Kinsella</td>
-    </tr>
-    <tr>
-      <td>jtomechak</td>
-      <td>Jessica Tomechak</td>
-    </tr>
-    <tr>
-      <td>jzb</td>
-      <td>Joe Brockmeier</td>
-    </tr>
-    <tr>
-      <td>karenv</td>
-      <td>Karen Vuong</td>
-    </tr>
-    <tr>
-      <td>kawai</td>
-      <td>Hiroaki Kawai</td>
-    </tr>
-    <tr>
-      <td>kdamage</td>
-      <td>Kelcey Damage</td>
-    </tr>
-    <tr>
-      <td>ke4qqq</td>
-      <td>David Nalley</td>
-    </tr>
-    <tr>
-      <td>kelveny</td>
-      <td>Kelven Yang</td>
-    </tr>
-    <tr>
-      <td>kirk</td>
-      <td>Kirk Kosinski</td>
-    </tr>
-    <tr>
-      <td>kishan</td>
-      <td>Kishan</td>
-    </tr>
-    <tr>
-      <td>kluge</td>
-      <td>Kevin Kluge</td>
-    </tr>
-    <tr>
-      <td>kocka</td>
-      <td>Laszlo Hornyak</td>
-    </tr>
-    <tr>
-      <td>koushik</td>
-      <td>Koushik Das</td>
-    </tr>
-    <tr>
-      <td>likithas</td>
-      <td>Likitha Shetty</td>
-    </tr>
-    <tr>
-      <td>mchen</td>
-      <td>Min Chen</td>
-    </tr>
-    <tr>
-      <td>mice</td>
-      <td>Mice Xia</td>
-    </tr>
-    <tr>
-      <td>milamber</td>
-      <td>Bruno Demion</td>
-    </tr>
-    <tr>
-      <td>mlsorensen</td>
-      <td>Marcus Sorensen</td>
-    </tr>
-    <tr>
-      <td>mnour</td>
-      <td>Mohammad Nour El-Din</td>
-    </tr>
-    <tr>
-      <td>mrhinkle</td>
-      <td>Mark R. Hinkle</td>
-    </tr>
-    <tr>
-      <td>msinhore</td>
-      <td>Marco Sinhoreli</td>
-    </tr>
-    <tr>
-      <td>mtutkowski</td>
-      <td>Mike Tutkowski</td>
-    </tr>
-    <tr>
-      <td>muralireddy</td>
-      <td>Murali Mohan Reddy</td>
-    </tr>
-    <tr>
-      <td>nitin</td>
-      <td>Nitin</td>
-    </tr>
-    <tr>
-      <td>noa</td>
-      <td>Noa Resare</td>
-    </tr>
-    <tr>
-      <td>nslater</td>
-      <td>Naomi Slater</td>
-    </tr>
-    <tr>
-      <td>nux</td>
-      <td>Nux</td>
-    </tr>
-    <tr>
-      <td>nvazquez</td>
-      <td>Nicolás Vázquez</td>
-    </tr>
-    <tr>
-      <td>olamy</td>
-      <td>Olivier Lamy</td>
-    </tr>
-    <tr>
-      <td>olgasmola</td>
-      <td>Olga Smola</td>
-    </tr>
-    <tr>
-      <td>paul_a</td>
-      <td>Paul Angus</td>
-    </tr>
-    <tr>
-      <td>pdion891</td>
-      <td>Pierre-Luc Dion</td>
-    </tr>
-    <tr>
-      <td>pnguyen</td>
-      <td>Phong Nguyen</td>
-    </tr>
-    <tr>
-      <td>prachidamle</td>
-      <td>Prachi Damle</td>
-    </tr>
-    <tr>
-      <td>pranavs</td>
-      <td>Pranav Saxena</td>
-    </tr>
-    <tr>
-      <td>pyr</td>
-      <td>Pierre-Yves Ritschard</td>
-    </tr>
-    <tr>
-      <td>radhika</td>
-      <td>Radhika Nair</td>
-    </tr>
-    <tr>
-      <td>rafael</td>
-      <td>Rafael Weingärtner</td>
-    </tr>
-    <tr>
-      <td>rajani</td>
-      <td>Rajani Karuturi</td>
-    </tr>
-    <tr>
-      <td>rajeshbattala</td>
-      <td>Rajesh Battala</td>
-    </tr>
-    <tr>
-      <td>remi</td>
-      <td>Remi Bergsma</td>
-    </tr>
-    <tr>
-      <td>resmo</td>
-      <td>Rene Moser</td>
-    </tr>
-    <tr>
-      <td>sailajamada</td>
-      <td>Sailaja Mada</td>
-    </tr>
-    <tr>
-      <td>saksham</td>
-      <td>Saksham Srivastava</td>
-    </tr>
-    <tr>
-      <td>sangeethah</td>
-      <td>Sangeetha Hariharan</td>
-    </tr>
-    <tr>
-      <td>sanjaytripathi</td>
-      <td>Sanjay Tripathi</td>
-    </tr>
-    <tr>
-      <td>sanjeev</td>
-      <td>Sanjeev Neelarapu</td>
-    </tr>
-    <tr>
-      <td>santhoshedukulla</td>
-      <td>Santhosh</td>
-    </tr>
-    <tr>
-      <td>sateesh</td>
-      <td>Sateesh Chodapuneedi</td>
-    </tr>
-    <tr>
-      <td>schhen</td>
-      <td>Sonny Heng Chhen</td>
-    </tr>
-    <tr>
-      <td>sebgoa</td>
-      <td>Sebastien Goasguen</td>
-    </tr>
-    <tr>
-      <td>serg38</td>
-      <td>Sergey Levitskiy</td>
-    </tr>
-    <tr>
-      <td>slriv</td>
-      <td>Sam Robertson</td>
-    </tr>
-    <tr>
-      <td>snuf</td>
-      <td>Funs Kessen</td>
-    </tr>
-    <tr>
-      <td>sowmya</td>
-      <td>Sowmya Krishnan</td>
-    </tr>
-    <tr>
-      <td>sudhap</td>
-      <td>Sudhap</td>
-    </tr>
-    <tr>
-      <td>swamy</td>
-      <td>Venkata Swamy</td>
-    </tr>
-    <tr>
-      <td>sweller</td>
-      <td>Simon Weller</td>
-    </tr>
-    <tr>
-      <td>swill</td>
-      <td>Will Stevens</td>
-    </tr>
-    <tr>
-      <td>syed</td>
-      <td>Syed Ahmed</td>
-    </tr>
-    <tr>
-      <td>talluri</td>
-      <td>Srikanteswararao Talluri</td>
-    </tr>
-    <tr>
-      <td>tsp</td>
-      <td>Prasanna</td>
-    </tr>
-    <tr>
-      <td>tuna</td>
-      <td>Anh Tu Nguyen</td>
-    </tr>
-    <tr>
-      <td>vijayendrabvs</td>
-      <td>Vijayendra Bhamidipati</td>
-    </tr>
-    <tr>
-      <td>weizhou</td>
-      <td>Wei Zhou</td>
-    </tr>
-    <tr>
-      <td>widodh</td>
-      <td>Wido den Hollander</td>
-    </tr>
-    <tr>
-      <td>willchan</td>
-      <td>William Chan</td>
-    </tr>
-    <tr>
-      <td>yasker</td>
-      <td>Sheng Yang</td>
-    </tr>
-    <tr>
-      <td>ynojima</td>
-      <td>Yoshikazu Nojima</td>
-    </tr>
-  </tbody>
-</table>
+<p class="table-bordered">Active list of committers (in alphabetical order of their usernames):</p>
+<p>| Username | Name |
+|———-|——|
+|ahmad|Ahmad Emneina|
+|akarasulu|Alex Karasulu|
+|alena1108|Alena Prokharchyk|
+|amoghvk|Amogh Vasekar|
+|andrijapanic|Andrija Panic|
+|animesh|Animesh|
+|anthonyxu|Anthony Xu|
+|aprateek|Abhinandan Prateek|
+|bfederle|Brian Federle|
+|boris|Boris Schrijver|
+|brett|Brett Porter|
+|bstoyanov|Boris Stoyanov|
+|chipchilders|Chip Childers|
+|chiradeep|Chiradeep Vittal|
+|claytonweise|Clayton Weise|
+|csuich2|Chris Suich|
+|dahn|Daan|
+|darren|Darren Shepherd|
+|dcahill|Dave Cahill|
+|demetriust|Demetrius Tsitrelis|
+|devdeep|Devdeep Singh|
+|dkonrad|Dennis Konrad|
+|dsonstebo|Dag Sonstebo|
+|ekho|Wilder Rodrigues|
+|erikw|Erik Weber|
+|fmaximus|Frank Maximus|
+|frankzhang|Xin Zhang|
+|gabriel|Gabriel Beims Bräscher|
+|gaurav|Gaurav Nandkumar Aradhye|
+|gavinlee|Gavin Lee|
+|giles|Giles Sirett|
+|girish|Girish Prabhakar Shilamkar|
+|gochiba|Go Chiba|
+|haeena|Toshiaki Hatano|
+|harikrishna|Harikrishna Patnala|
+|higster|Geoff Higginbottom|
+|hogstrom|Matt Richard Hogstrom|
+|hugo|Hugo Trippaers|
+|ilya|Ilya Musayev|
+|isaacchiang|Isaac Chiang|
+|jayapal|Jayapal|
+|jbausewein|Jason Bausewein|
+|jburwell|John Burwell|
+|jessicawang|Jessica Wang|
+|jim|Jim Jagielski|
+|jlk|John Kinsella|
+|jtomechak|Jessica Tomechak|
+|jzb|Joe Brockmeier|
+|karenv|Karen Vuong|
+|kawai|Hiroaki Kawai|
+|kdamage|Kelcey Damage|
+|ke4qqq|David Nalley|
+|kelveny|Kelven Yang|
+|kirk|Kirk Kosinski|
+|kishan|Kishan|
+|kluge|Kevin Kluge|
+|kocka|Laszlo Hornyak|
+|koushik|Koushik Das|
+|likithas|Likitha Shetty|
+|marcaurele|Marc-Aurèle Brothier|
+|mchen|Min Chen|
+|mice|Mice Xia|
+|milamber|Bruno Demion|
+|mlsorensen|Marcus Sorensen|
+|mnour|Mohammad Nour El-Din|
+|mrhinkle|Mark R. Hinkle|
+|msinhore|Marco Sinhoreli|
+|mtutkowski|Mike Tutkowski|
+|muralireddy|Murali Mohan Reddy|
+|nathanejohnson|Nathan Johnson|
+|nitin|Nitin|
+|noa|Noa Resare|
+|nslater|Naomi Slater|
+|nux|Nux|
+|nvazquez|Nicolás Vázquez|
+|olgasmola|Olga Smola|
+|paul_a|Paul Angus|
+|pdion891|Pierre-Luc Dion|
+|pnguyen|Phong Nguyen|
+|prachidamle|Prachi Damle|
+|pranavs|Pranav Saxena|
+|pyr|Pierre-Yves Ritschard|
+|radhika|Radhika Nair|
+|rafael|Rafael Weingärtner|
+|rajani|Rajani Karuturi|
+|rajeshbattala|Rajesh Battala|
+|remi|Remi Bergsma|
+|resmo|Rene Moser|
+|rohit|Rohit Yadav|
+|sailajamada|Sailaja Mada|
+|saksham|Saksham Srivastava|
+|sangeethah|Sangeetha Hariharan|
+|sanjaytripathi|Sanjay Tripathi|
+|sanjeev|Sanjeev Neelarapu|
+|santhoshedukulla|Santhosh|
+|sateesh|Sateesh Chodapuneedi|
+|schhen|Sonny Heng Chhen|
+|sebgoa|Sebastien Goasguen|
+|serg38|Sergey Levitskiy|
+|slriv|Sam Robertson|
+|snuf|Funs Kessen|
+|sowmya|Sowmya Krishnan|
+|sudhap|Sudhap|
+|svogel|Sven Vogel|
+|swamy|Venkata Swamy|
+|sweller|Simon Weller|
+|swill|Will Stevens|
+|syed|Syed Ahmed|
+|talluri|Srikanteswararao Talluri|
+|tsp|Prasanna|
+|tuna|Anh Tu Nguyen|
+|vijayendrabvs|Vijayendra Bhamidipati|
+|weizhou|Wei Zhou|
+|widodh|Wido den Hollander|
+|willchan|William Chan|
+|yasker|Sheng Yang|
+|ynojima|Yoshikazu Nojima|</p>
 
 <h2 id="emeritus-committers">Emeritus Committers</h2>
 <p>Committers who are no longer active include:</p>
 
+
+            <footer>
+                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
+                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
+                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
+            </footer>
+
+        </div>
+    </div>
+</div>
   </body>
 </html>
diff --git a/source/about.markdown b/source/about.html.markdown
similarity index 100%
rename from source/about.markdown
rename to source/about.html.markdown
diff --git a/source/api.markdown b/source/api.html.markdown
similarity index 100%
rename from source/api.markdown
rename to source/api.html.markdown
diff --git a/source/api_archives.markdown b/source/api_archives.html.markdown
similarity index 100%
rename from source/api_archives.markdown
rename to source/api_archives.html.markdown
diff --git a/source/archives.md.erb b/source/archives.html.markdown.erb
similarity index 100%
rename from source/archives.md.erb
rename to source/archives.html.markdown.erb
diff --git a/source/bylaws.markdown b/source/bylaws.html.markdown
similarity index 100%
rename from source/bylaws.markdown
rename to source/bylaws.html.markdown
diff --git a/source/cloudstack-faq.markdown b/source/cloudstack-faq.html.markdown
similarity index 100%
rename from source/cloudstack-faq.markdown
rename to source/cloudstack-faq.html.markdown
diff --git a/source/contribute.markdown b/source/contribute.html.markdown
similarity index 100%
rename from source/contribute.markdown
rename to source/contribute.html.markdown
diff --git a/source/developers.markdown b/source/developers.html.markdown
similarity index 100%
rename from source/developers.markdown
rename to source/developers.html.markdown
diff --git a/source/downloads.html.erb b/source/downloads.html.erb
index c5da6d1..65bd04f 100644
--- a/source/downloads.html.erb
+++ b/source/downloads.html.erb
@@ -161,7 +161,7 @@
 <% end %>
 
 <p>
-    <a href="https://dist.apache.org/repos/dist/release/cloudstack/releases/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%= data.cloudstack.versions.main %>-src.tar.bz2">
+    <a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%= data.cloudstack.versions.main %>-src.tar.bz2">
         <button type="button" class="btn btn-primary btn-md">
             Get the <%= data.cloudstack.versions.main %> Source
         </button>
@@ -307,39 +307,23 @@
 
 <h4 id="source-release">Source Release</h4>
 
-<p>CloudMonkey's current release is 5.3.3.</p>
+<p>CloudMonkey's current release is <%= data.cloudstack.cloudmonkey.version %>.</p>
 
 <p>
-<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the 5.3.3 Source</button></a>
+<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the <%= data.cloudstack.cloudmonkey.version %> Source</button></a>
 
 <a href="http://www.apache.org/dist/cloudstack/KEYS"><button type="button" class="btn btn-info btn-xs">KEYS</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.asc"><button type="button" class="btn btn-info btn-xs">PGP</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.md5"><button type="button" class="btn btn-info btn-xs">MD5</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.3/apache-cloudstack-cloudmonkey-5.3.3-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2.asc"><button type="button" class="btn btn-info btn-xs">PGP</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2.md5"><button type="button" class="btn btn-info btn-xs">MD5</button></a>
+<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
 
 </p>
 
-<p>Instructions for building and installing from source can be found in the included <a href="https://gitbox.apache.org/repos/asf?p=cloudstack-cloudmonkey.git;a=blob_plain;f=README.md">README.md</a> file.</p>
+<h4 id="github-release">Binary Builds Release</h4>
 
-<h4 id="pypi-package">PyPi Package</h4>
+<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the python package to the <a href="https://github.com/apache/cloudstack-cloudmonkey/releases">Apache CloudStack CloudMonkey Github release</a> page.</p>
 
-<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the python package to the <a href="https://pypi.python.org/pypi/cloudmonkey/">Python Package Index</a>.</p>
-
-<p>For installing the package from pypi, use:</p>
-
-<pre><code>$ pip install cloudmonkey
-</code></pre>
-
-<p>To upgrade:</p>
-
-<pre><code>$ pip install --upgrade cloudmonkey
-</code></pre>
-
-<p>Though a clean upgrade is recommended:</p>
-
-<pre><code>$ pip uninstall cloudmonkey
-$ pip install cloudmonkey
-</code></pre>
+<p>For installing, upgrade, usage, please see the project <a href="https://github.com/apache/cloudstack-cloudmonkey/wiki/Getting-Started#installation">wiki</a>.</p>
 
 <p><a name="archives"></a></p>
 
@@ -352,15 +336,8 @@
 <h2 id="indicators">Archived Releases</h2>
 
 You can find links to all the releases of Apache CloudStack on the <a href="archives.html">archives page</a>.
-</div></div></div>
-
-
-            <footer>
-                <p>Copyright © 2017 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. <br/>
-                "Apache", "CloudStack", "Apache CloudStack", the Apache CloudStack logo, the Apache CloudStack Cloud Monkey logo and the Apache feather logos are registered trademarks or trademarks of The Apache Software Foundation.</p>
-                <p><a href="/trademark-guidelines.html">Apache CloudStack Trademark Usage</a> - <a href="/bylaws.html">Apache CloudStack Community ByLaws</a></p>
-            </footer>
-
+</div></div>
+</div>
         </div>
     </div>
 </div>
diff --git a/source/downloads.md.erb b/source/downloads.md.erb
deleted file mode 100644
index 4ef2ef2..0000000
--- a/source/downloads.md.erb
+++ /dev/null
@@ -1,216 +0,0 @@
----
-title: Apache CloudStack Downloads
----
-
-<%
-    #
-    #  Version details in data/cloudstack.yml
-    #
-%>
-<div class="row">
-
-<div class="col-lg-12">
-
-<div class="page-header">
-
-<h1 id="indicators">Apache CloudStack: Downloads</h1>
-
-</div>
-
-</div>
-
-</div>
-
-<div class="bs-example">
-
-<div class="row">
-
-<div class="col-lg-6">
-
-<h2>Latest CloudStack Releases</h2>
-<p>The CloudStack community maintains two types of releases; the main releases and the LTS (Long Term Support) releases. The LTS releases receive bug and security fixes for a period of two years (for more details <a href="https://cwiki.apache.org/confluence/display/CLOUDSTACK/LTS"><i>click here</i></a>). The main releases receive only critical bug fixes for a short period. The general expectation is that the users of the 'main' will upgrade to a new version in order to receive fixes.</p>
-
-<h3>Source Releases</h3>
-<p>Apache CloudStack's most recent release is <%= data.cloudstack.versions.main %> and is an LTS release.
-</p>
-
-<p>
-    <a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%= data.cloudstack.versions.main %>-src.tar.bz2">
-        <button type="button" class="btn btn-primary btn-md">
-            Get the <%= data.cloudstack.versions.main %> Source
-        </button>
-    </a>
-    <a href="http://www.apache.org/dist/cloudstack/KEYS">
-        <button type="button" class="btn btn-info btn-xs">
-            KEYS
-        </button>
-    </a>
-    <a href="http://www.apache.org/dist/cloudstack/releases/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%=  data.cloudstack.versions.main %>-src.tar.bz2.asc">
-        <button type="button" class="btn btn-info btn-xs">
-            PGP
-        </button>
-    </a>
-    <a href="http://www.apache.org/dist/cloudstack/releases/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%=  data.cloudstack.versions.main %>-src.tar.bz2.md5">
-        <button type="button" class="btn btn-info btn-xs">
-            MD5
-        </button>
-    </a>
-    <a href="http://www.apache.org/dist/cloudstack/releases/<%= data.cloudstack.versions.main %>/apache-cloudstack-<%=     data.cloudstack.versions.main %>-src.tar.bz2.sha512">
-        <button type="button" class="btn btn-info btn-xs">
-            SHA512
-        </button>
-    </a>
-</p>
-
-<p>Full release notes can be found in the <a href="http://docs.cloudstack.apache.org/en/<%= data.cloudstack.versions.main %>/releasenotes/">version <%= data.cloudstack.versions.main %> Release Notes</a> website.</p><br/>
-
-<p>Apache CloudStack's previous LTS release was <%= data.cloudstack.versions.lts %>.
-</p>
-
-<p>
-    <a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/<%= data.cloudstack.versions.lts %>/apache-cloudstack-<%= data.cloudstack.versions.lts %>-src.tar.bz2">
-        <button type="button" class="btn btn-primary btn-md">
-            Get the <%= data.cloudstack.versions.lts %> Source
-        </button>
-    </a>
-    <a href="http://www.apache.org/dist/cloudstack/KEYS">
-        <button type="button" class="btn btn-info btn-xs">
-            KEYS
-        </button>
-    </a>
-    <a href="http://www.apache.org/dist/cloudstack/releases/<%= data.cloudstack.versions.lts %>/apache-cloudstack-<%=  data.cloudstack.versions.lts %>-src.tar.bz2.asc">
-        <button type="button" class="btn btn-info btn-xs">
-            PGP
-        </button>
-    </a>
-    <a href="http://www.apache.org/dist/cloudstack/releases/<%= data.cloudstack.versions.lts %>/apache-cloudstack-<%=  data.cloudstack.versions.lts %>-src.tar.bz2.md5">
-        <button type="button" class="btn btn-info btn-xs">
-            MD5
-        </button>
-    </a>
-    <a href="http://www.apache.org/dist/cloudstack/releases/<%= data.cloudstack.versions.lts %>/apache-cloudstack-<%=     data.cloudstack.versions.lts %>-src.tar.bz2.sha512">
-        <button type="button" class="btn btn-info btn-xs">
-            SHA512
-        </button>
-    </a>
-</p>
-
-<p>Full release notes can be found in the <a href="http://docs.cloudstack.apache.org/projects/cloudstack-release-notes/en/<%= data.cloudstack.versions.lts %>/">version <%= data.cloudstack.versions.lts %> Release Notes</a> website.</p>
-
-<p>Instructions for building from source and installing Apache CloudStack can be found in the <a href="http://docs.cloudstack.apache.org/en/4.11.2.0/installguide/">Installation Guide</a>. Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack <%= data.cloudstack.versions.main %> can be found in the upgrade section of the Release Notes (see above).</p>
-
-</div>
-
-<div class="col-lg-6">
-
-<div class="panel panel-default">
-
-<div class="panel-heading">
-
-<h3 class="panel-title">Verifying Downloads</h3>
-
-</div>
-
-<div class="panel-body">
-
-<p>
-It's essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures.
-The PGP signatures can be verified using PGP or GPG. First download the
-<a href="https://dist.apache.org/repos/dist/release/cloudstack/KEYS">KEYS</a> as well as the asc
-signature file for the relevant distribution. Make sure you get these files from the
-main distribution directory, rather than from a mirror. Then verify the signatures using:
-</p>
-<pre>
-    % pgpk -a KEYS
-    % pgpv apache-cloudstack-X.X.X-src.tar.bz2.asc
-</pre>
-<p>or</p>
-<pre>
-    % pgp -ka KEYS
-    % pgp apache-cloudstack-X.X.X-src.tar.bz2.asc
-</pre>
-<p>or</p>
-<pre>
-    % gpg --import KEYS
-    % gpg --verify apache-cloudstack-X.X.X-src.tar.bz2.asc
-</pre>
-<p>
-Additionally, you can verify the MD5 or SHA512 signatures on the files.
-</p>
-
-</div>
-</div>
-</div>
-</div>
-</div>
-
-<h2>Packages</h2>
-
-<h4>Community Packages</h4>
-<p>For easier installation or upgrades, the official source code release has been supplemented by community members who have chosen to provide package repositories that also include noredis libraries.</p>
-
-<ul>
-    <li>DEB repository: <a href="http://download.cloudstack.org/ubuntu">http://download.cloudstack.org/ubuntu</a></li>
-    <li>CentOS/RHEL 6 RPM repository: <a href="http://download.cloudstack.org/centos/6/">http://download.cloudstack.org/centos/6/</a></li>
-    <li>CentOS/RHEL 7 RPM repository: <a href="http://download.cloudstack.org/centos/7/">http://download.cloudstack.org/centos/7/</a></li>
-</ul>
-
-<p>Instructions for using these community provided repositories can be found in the <a href="http://docs.cloudstack.apache.org/en/4.11.2.0/installguide/management-server/#configure-package-repository">Configure Package Repository</a> section of the Installation Guide.</p>
-
-<h4>Packages hosted by 3rd Parties</h4>
-
-<ul>
-    <li>CloudStack (noredist) Packages by ShapeBlue: <a href="http://shapeblue.com/packages/">http://shapeblue.com/packages</a></li>
-</ul>
-
-<div class="row">
-
-<div class="col-lg-12">
-
-<div class="page-header">
-
-<h2 id="cloudmonkey">Latest CloudMonkey Release</h2>
-
-</div>
-
-</div>
-
-</div>
-
-Apache CloudStack's CloudMonkey tool is a CLI and shell environment designed for interacting with CloudStack-based clouds.
-
-#### Source Release
-
-CloudMonkey's current release is <%= data.cloudstack.cloudmonkey.version %>.
-
-<p>
-<a href="http://www.apache.org/dyn/closer.lua/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2"><button type="button" class="btn btn-primary btn-md">Get the <%= data.cloudstack.cloudmonkey.version %> Source</button></a>
-
-<a href="http://www.apache.org/dist/cloudstack/KEYS"><button type="button" class="btn btn-info btn-xs">KEYS</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2.asc"><button type="button" class="btn btn-info btn-xs">PGP</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2.md5"><button type="button" class="btn btn-info btn-xs">MD5</button></a>
-<a href="http://www.apache.org/dist/cloudstack/releases/cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>/apache-cloudstack-cloudmonkey-<%= data.cloudstack.cloudmonkey.version %>-src.tar.bz2.sha"><button type="button" class="btn btn-info btn-xs">SHA</button></a>
-
-</p>
-
-Instructions for building and installing from source can be found in the included [README.md](https://gitbox.apache.org/repos/asf?p=cloudstack-cloudmonkey.git;a=blob_plain;f=README.md) file.
-
-#### Binary Builds Release
-
-For easier installation or upgrades, the official source code release has been supplemented by community members who have pushed the binary builds to the [Apache CloudStack CloudMonkey Github release](https://github.com/apache/cloudstack-cloudmonkey/releases) page.
-
-For installing, upgrade, usage, please see the project wiki:
-
-    https://github.com/apache/cloudstack-cloudmonkey/wiki/Getting-Started#installation
-
-<a name="archives"></a>
-
-<div class="row">
-
-<div class="col-lg-12">
-
-<div class="page-header">
-
-<h2 id="indicators">Archived Releases</h2>
-
-You can find links to all the releases of Apache CloudStack on the <a href="archives.html">archives page</a>.
diff --git a/source/features.markdown b/source/features.html.markdown
similarity index 100%
rename from source/features.markdown
rename to source/features.html.markdown
diff --git a/source/history.markdown b/source/history.html.markdown
similarity index 100%
rename from source/history.markdown
rename to source/history.html.markdown
diff --git a/source/mailing-lists.markdown b/source/mailing-lists.html.markdown
similarity index 100%
rename from source/mailing-lists.markdown
rename to source/mailing-lists.html.markdown
diff --git a/source/security.markdown b/source/security.html.markdown
similarity index 100%
rename from source/security.markdown
rename to source/security.html.markdown
diff --git a/source/software.markdown b/source/software.html.markdown
similarity index 100%
rename from source/software.markdown
rename to source/software.html.markdown
diff --git a/source/survey.markdown b/source/survey.html.markdown
similarity index 100%
rename from source/survey.markdown
rename to source/survey.html.markdown
diff --git a/source/trademark-guidelines.markdown b/source/trademark-guidelines.html.markdown
similarity index 100%
rename from source/trademark-guidelines.markdown
rename to source/trademark-guidelines.html.markdown
diff --git a/source/users.markdown b/source/users.html.markdown
similarity index 100%
rename from source/users.markdown
rename to source/users.html.markdown
diff --git a/source/videos.markdown b/source/videos.html.markdown
similarity index 100%
rename from source/videos.markdown
rename to source/videos.html.markdown
diff --git a/source/who.markdown b/source/who.html.markdown
similarity index 100%
rename from source/who.markdown
rename to source/who.html.markdown