community-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [comdev-site] branch asf-site updated: Updated asf-site from master at 99b9c571a4151c238ef55c25a2894ca8c2c40a83 using https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/33/
Date Sun, 20 Sep 2020 15:11:19 GMT
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/comdev-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new a517ae0  Updated asf-site from master at 99b9c571a4151c238ef55c25a2894ca8c2c40a83 using https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/33/
a517ae0 is described below

commit a517ae0e74b3078b1070f90858cbafcba23b31cb
Author: jenkins <builds@apache.org>
AuthorDate: Sun Sep 20 15:11:14 2020 +0000

    Updated asf-site from master at 99b9c571a4151c238ef55c25a2894ca8c2c40a83 using https://ci-builds.apache.org/job/Community%20Development/job/site/job/master/33/
---
 content/about.html                                 | 309 ++++++++++---------
 content/about/index.html                           | 309 ++++++++++---------
 content/apache-way.html                            | 309 ++++++++++---------
 .../apache-way/apache-project-maturity-model.html  | 309 ++++++++++---------
 content/boardreport.html                           | 309 ++++++++++---------
 content/calendars.html                             | 309 ++++++++++---------
 content/calendars/conferences.html                 | 309 ++++++++++---------
 content/calendars/index.html                       | 309 ++++++++++---------
 content/comdevboardreports.html                    | 309 ++++++++++---------
 content/comdevboardresolution.html                 | 309 ++++++++++---------
 content/committers.html                            | 309 ++++++++++---------
 content/committers/consensusBuilding.html          | 309 ++++++++++---------
 content/committers/decisionMaking.html             | 309 ++++++++++---------
 content/committers/funding-disclaimer.html         | 309 ++++++++++---------
 content/committers/index.html                      | 309 ++++++++++---------
 content/committers/lazyConsensus.html              | 309 ++++++++++---------
 content/committers/voting.html                     | 309 ++++++++++---------
 content/contactpoints.html                         | 309 ++++++++++---------
 content/contributors.html                          | 309 ++++++++++---------
 content/contributors/etiquette.html                | 309 ++++++++++---------
 content/contributors/index.html                    | 309 ++++++++++---------
 content/css/main.css                               |  26 +-
 content/events.html                                | 309 ++++++++++---------
 content/events/small-events.html                   | 309 ++++++++++---------
 content/gettingStarted.html                        | 309 ++++++++++---------
 content/gettingStarted/101.html                    | 309 ++++++++++---------
 content/gsoc-admin-tasks.html                      | 309 ++++++++++---------
 content/gsoc.html                                  | 309 ++++++++++---------
 content/guide-to-being-a-mentor.html               | 309 ++++++++++---------
 content/index.html                                 | 341 +++++++++++----------
 content/links.html                                 | 309 ++++++++++---------
 content/lists.html                                 | 309 ++++++++++---------
 content/localmentors.html                          | 309 ++++++++++---------
 content/mentee-ranking-process.html                | 309 ++++++++++---------
 content/mentor-request-mail.html                   | 309 ++++++++++---------
 content/mentoring.html                             | 309 ++++++++++---------
 content/mentoring/committer.html                   | 309 ++++++++++---------
 content/mentoring/experiences.html                 | 309 ++++++++++---------
 content/mentoring/firstpatch.html                  | 309 ++++++++++---------
 content/mentoring/index.html                       | 309 ++++++++++---------
 content/mentoring/mentor.html                      | 309 ++++++++++---------
 content/mentoring/pmc.html                         | 309 ++++++++++---------
 content/mentoringprogramme-icfoss-pilot.html       | 309 ++++++++++---------
 content/mentoringprogramme.html                    | 309 ++++++++++---------
 content/mentorprogrammeapplication.html            | 309 ++++++++++---------
 content/mentorprogrammeformaleducation.html        | 309 ++++++++++---------
 content/newbiefaq.html                             | 313 ++++++++++---------
 content/newcomers.html                             | 309 ++++++++++---------
 content/newcomers/index.html                       | 309 ++++++++++---------
 content/newcommitter.html                          | 309 ++++++++++---------
 content/newsletter.html                            | 309 ++++++++++---------
 content/newsletter/2017-04.html                    | 309 ++++++++++---------
 content/newsletter/2017-05.html                    | 309 ++++++++++---------
 content/newsletter/index.html                      | 309 ++++++++++---------
 content/projectIndependence.html                   | 309 ++++++++++---------
 content/proposals.html                             | 309 ++++++++++---------
 content/proposals/ZestProposal.html                | 309 ++++++++++---------
 content/sitemap.xml                                |   6 +-
 content/speakers.html                              | 309 ++++++++++---------
 content/speakers/index.html                        | 309 ++++++++++---------
 content/speakers/slides.html                       | 309 ++++++++++---------
 content/speakers/speakers.html                     | 309 ++++++++++---------
 ...se-the-comdev-issue-tracker-for-gsoc-tasks.html | 309 ++++++++++---------
 63 files changed, 10413 insertions(+), 8504 deletions(-)

diff --git a/content/about.html b/content/about.html
index 145b996..681553d 100644
--- a/content/about.html
+++ b/content/about.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Abouts</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,27 +174,44 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/about/index.html b/content/about/index.html
index 65594ae..cf73651 100644
--- a/content/about/index.html
+++ b/content/about/index.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Community Development: What we do</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -163,8 +177,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<h2 id="community-development-what-we-do">Community Development: What We Do</h2>
 <p>&ldquo;Community Development&rdquo; Is a very broad term, and means different things
 to different people. The Community Development (ComDev) project
@@ -256,23 +270,40 @@ Source code is hosted in a Git repository.</p>
 <p>See the <a href="https://github.com/apache/comdev-site/blob/master/README.md">README.md</a> for more info.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/apache-way.html b/content/apache-way.html
index d68b944..4a8424b 100644
--- a/content/apache-way.html
+++ b/content/apache-way.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Apache-ways</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,27 +174,44 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/apache-way/apache-project-maturity-model.html b/content/apache-way/apache-project-maturity-model.html
index b0a82ad..ae66ac8 100644
--- a/content/apache-way/apache-project-maturity-model.html
+++ b/content/apache-way/apache-project-maturity-model.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - A Maturity Model for Apache Projects</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>The <strong>Apache Project Maturity Model</strong> provides a suggested framework for evaluating the overall maturity of an Apache project community and the codebase that it maintains.  While this model is specific to Apache projects (i.e. hosted at the ASF) many of these factors are important for any open source project.</p>
 <h1 id="overview">Overview</h1>
 <p>The goal of this maturity model is to describe how Apache projects operate, in a concise and high-level way, and to provide a basic framework that projects may choose to use to evaluate themselves.</p>
@@ -470,23 +484,40 @@ with no hidden agendas.
 </ol>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/boardreport.html b/content/boardreport.html
index b8943a3..5007233 100644
--- a/content/boardreport.html
+++ b/content/boardreport.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - BoardReport</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,8 +174,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>Top-level projects report to the board once a quarter, Incubator podlings usually monthly.</p>
 <p>The ASF Board currently meets on the
 third Wednesday of every month, and projects need to report well in advance of that, as reports are
@@ -229,23 +243,40 @@ Have there been any releases from the project in the last quarter? [REQUIRED] If
 </code></pre>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/calendars.html b/content/calendars.html
index b471d4c..ec4f031 100644
--- a/content/calendars.html
+++ b/content/calendars.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Calendars</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,27 +174,44 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/calendars/conferences.html b/content/calendars/conferences.html
index c653e08..2c78828 100644
--- a/content/calendars/conferences.html
+++ b/content/calendars/conferences.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Apache Conferences Calendar</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<h2 id="deprecated---see-new-calendar-instead">Deprecated - See New Calendar instead</h2>
 <p>This calendar is no longer maintained; please see <a href="/calendars/">this page</a> instead.</p>
 <p>This Calendar is maintained by the Apache Community Development Committee (ComDev),
@@ -246,23 +260,40 @@ function render(data) {
 <script src="https://www.google.com/calendar/feeds/nerseigospses068jd57bk5ar8@group.calendar.google.com/public/full?alt=json-in-script&callback=render&orderby=starttime&max-results=30&singleevents=true&sortorder=ascending&futureevents=true"></script>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/calendars/index.html b/content/calendars/index.html
index ea31eb5..6ddf7ce 100644
--- a/content/calendars/index.html
+++ b/content/calendars/index.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Apache Related Event Calendars</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -163,8 +177,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>This calendar lists major events relating to The Apache Software Foundation
 and our many Apache projects.  We also have an automated
 <a href="https://www.apache.org/events/meetups.html">listing of upcoming Apache-related Meetups</a> (smaller events) available.</p>
@@ -196,23 +210,40 @@ as a <a href="http://lanyrd.com/guides/apache-software-and-technologies/">Lanyrd
 Apache project related events there.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/comdevboardreports.html b/content/comdevboardreports.html
index d27c089..f6c9595 100644
--- a/content/comdevboardreports.html
+++ b/content/comdevboardreports.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - ComDevBoardReports</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,8 +174,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>This page contains records of the Apache Community Development Project
 board reports. The official record of these reports is the minutes of the
 appropriate board meeting, they are provided here for convenience.</p>
@@ -720,23 +734,40 @@ will occur after GSoC has commenced)</p>
 </div>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/comdevboardresolution.html b/content/comdevboardresolution.html
index 4a64e0e..bcb0d37 100644
--- a/content/comdevboardresolution.html
+++ b/content/comdevboardresolution.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - ComDevBoardResolution</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,8 +174,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>The Apache Community Development Project was created in November 2009.</p>
 <DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>Board Resolution Creating the Apache Community Development Project</B></DIV><DIV class="codeContent panelContent">
        Establish the Apache Community Development Project
@@ -221,23 +235,40 @@ was approved by Unanimous Vote of the directors present.</p>
 </code></pre>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/committers.html b/content/committers.html
index 16272ea..4616118 100644
--- a/content/committers.html
+++ b/content/committers.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Committers</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,27 +174,44 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/committers/consensusBuilding.html b/content/committers/consensusBuilding.html
index b48ee91..ca5525c 100644
--- a/content/committers/consensusBuilding.html
+++ b/content/committers/consensusBuilding.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Consensus Building</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>In some cases there is no obvious path to take, or you might be a new community,
 or a new member of an existing community. In these cases people will often
 need to build consensus by making proposals and eliciting responses.</p>
@@ -211,23 +225,40 @@ or not.</p>
 the work under the <a href="/committers/lazyConsensus.html">lazy consensus</a> model.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/committers/decisionMaking.html b/content/committers/decisionMaking.html
index 2ccc0db..6df4421 100644
--- a/content/committers/decisionMaking.html
+++ b/content/committers/decisionMaking.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Decision Making</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>The most important thing about engaging with any Apache project is that everyone
 is equal. All people with an opinion are entitled to express that opinion and, where
 appropriate, have it considered by the community.</p>
@@ -194,23 +208,40 @@ have a measurable consensus. For example, when <a href="/committers/voting.html"
 to approve a release.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/committers/funding-disclaimer.html b/content/committers/funding-disclaimer.html
index 2f788f6..16feec8 100644
--- a/content/committers/funding-disclaimer.html
+++ b/content/committers/funding-disclaimer.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Funding campaign disclaimer</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>Some Apache committers have successfully run funding campaigns to work on their favorite Apache projects.</p>
 <p>This is ok in principle but you have to make it clear that the campaign is your own thing, and avoid any confusion about the role of the
 ASF and how its projects work.</p>
@@ -193,23 +207,40 @@ initiative is <em>not</em> affiliated or driven by the ASF, and also that any co
 through the usual Apache Groovy acceptance process.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/committers/index.html b/content/committers/index.html
index f92253b..573bc28 100644
--- a/content/committers/index.html
+++ b/content/committers/index.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Committer resources</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -163,8 +177,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>There are a number of useful Apache tools and services available for Apache projects
 and committers.  This is a brief set of pointers or signposts to information elsewhere.</p>
 <h2 id="apache-infrastructure-information">Apache Infrastructure Information</h2>
@@ -259,23 +273,40 @@ here are a few you might want to take a look at:</p>
 </ul>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/committers/lazyConsensus.html b/content/committers/lazyConsensus.html
index 71c10af..151e904 100644
--- a/content/committers/lazyConsensus.html
+++ b/content/committers/lazyConsensus.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Lazy Consensus</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>The concept of &ldquo;Lazy Consensus&rdquo; is very important in our project. Lazy
 Consensus means that when you are convinced that you know what the community
 would like to see happen you can simply assume that you already have consensus
@@ -212,23 +226,40 @@ remember, in a lazy consensus world silence is the equivalent to support. This
 can take some time to get used to.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/committers/voting.html b/content/committers/voting.html
index 86a0378..31d8107 100644
--- a/content/committers/voting.html
+++ b/content/committers/voting.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Voting</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>Occasionally a &ldquo;feel&rdquo; for consensus is not enough. Sometimes we need to
 have a measurable consensus. For example, when voting in new committers or
 to approve a release.</p>
@@ -193,23 +207,40 @@ but a formal vote.</p>
 of action that you are willing and able to implement (where appropriate).</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/contactpoints.html b/content/contactpoints.html
index 07a2d0a..a07a004 100644
--- a/content/contactpoints.html
+++ b/content/contactpoints.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - ContactPoints</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,8 +174,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>If you have a question about anything Apache, the ComDev project is here to help.<br>
 To help us help you, please try to direct your question to the right mailing list - our
 volunteer committers do all their work on mailing lists.</p>
@@ -204,23 +218,40 @@ response from the ASF&rsquo;s legal counsel to to
 page.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/contributors.html b/content/contributors.html
index 6a0f157..006a172 100644
--- a/content/contributors.html
+++ b/content/contributors.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Contributors</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,27 +174,44 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/contributors/etiquette.html b/content/contributors/etiquette.html
index fa7da1b..def9333 100644
--- a/content/contributors/etiquette.html
+++ b/content/contributors/etiquette.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Apache Community Etiquette Guidelines</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>The Apache Software Foundation (ASF) and our many Apache projects welcome all
 participants who are willing to respect our community guidelines.  There are
 many behavior or etiquette guides for online communities out there; we have a few
@@ -268,23 +282,40 @@ comment before closing out the issue.</p>
 </ul>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/contributors/index.html b/content/contributors/index.html
index 73dbb93..8dd4950 100644
--- a/content/contributors/index.html
+++ b/content/contributors/index.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Contributing to the Apache Software Foundation</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -163,8 +177,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>This page is intended for those people who are reasonably
 comfortable with open source development models but need a helping hand finding
 their way around The Apache Software Foundation and our way of developing software
@@ -235,23 +249,40 @@ list by sending a mail to
 <a href="mailto:dev@community.apache.org">dev@community.apache.org</a>.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/css/main.css b/content/css/main.css
index a6cb362..2587c57 100644
--- a/content/css/main.css
+++ b/content/css/main.css
@@ -1,4 +1,22 @@
-.feather {
-	background-image:url('http://www.apache.org/images/feather-small.gif');
-	background-repeat:no-repeat;
-}
\ No newline at end of file
+main.cd-main {
+  padding-top: 3.5rem;
+}
+
+footer.page-footer {
+  bottom: 0;
+  color: #fff;
+}
+
+footer.page-footer a {
+  color: #000000;
+}
+footer.page-footer a:hover {
+  color: #000000;
+}
+
+footer.page-footer .footer-copyright {
+  overflow: hidden;
+  color: rgba(255,255,255,0.6);
+  background-color: rgba(0,0,0,0.2);
+}
+
diff --git a/content/events.html b/content/events.html
index 8285937..b5c7d79 100644
--- a/content/events.html
+++ b/content/events.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Events</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,27 +174,44 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/events/small-events.html b/content/events/small-events.html
index c549bb0..702c837 100644
--- a/content/events/small-events.html
+++ b/content/events/small-events.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Requirements for organizers of small Apache-related events</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<h1 id="approval-of-small-apache-related-events">Approval of small Apache-related events</h1>
 <p>The Community Development PMC is responsible for assisting with the
 organisation and promotion of all Apache events.</p>
@@ -186,23 +200,40 @@ and then send an announcement of your event to
 <a href="../calendars/">events calendar</a>.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/gettingStarted.html b/content/gettingStarted.html
index bcf94c6..83018a4 100644
--- a/content/gettingStarted.html
+++ b/content/gettingStarted.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - GettingStarteds</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,27 +174,44 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/gettingStarted/101.html b/content/gettingStarted/101.html
index 3556eca..48cf3a8 100644
--- a/content/gettingStarted/101.html
+++ b/content/gettingStarted/101.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Getting started</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -166,8 +180,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<h1 id="where-do-i-start">Where do I start?</h1>
 <p>If you have no idea where to start with your engagement with an Apache project
 this is the page for you.</p>
@@ -223,23 +237,40 @@ foundations <a href="https://apache.org/foundation/how-it-works.html">How It Wor
 </ul>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/gsoc-admin-tasks.html b/content/gsoc-admin-tasks.html
index d411d65..39d7d5f 100644
--- a/content/gsoc-admin-tasks.html
+++ b/content/gsoc-admin-tasks.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - GSoC admins</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,8 +174,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p>A comprehensive guide to being the GSoC admins for the ASF</p>
 <p>List of duties:</p>
 <ol>
@@ -331,23 +345,40 @@ https://www.oanda.com/currency/historical-rates-classic?date_fmt=us&date=08/09/1
 </pre>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/gsoc.html b/content/gsoc.html
index 6f873b1..b2adab6 100644
--- a/content/gsoc.html
+++ b/content/gsoc.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - GSoC</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,8 +174,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<div class="card mb-3">
   <div class="card-header">
     Currently happening
@@ -316,23 +330,40 @@ date indicated.</p>
 </ul>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/guide-to-being-a-mentor.html b/content/guide-to-being-a-mentor.html
index 1c94f43..2c21e4c 100644
--- a/content/guide-to-being-a-mentor.html
+++ b/content/guide-to-being-a-mentor.html
@@ -5,143 +5,157 @@
 <head>
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - guide to being a mentor</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
-                <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
-                <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
-                <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
-                <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
-                <a class="dropdown-item" href="/committers/voting.html">Voting</a>
-                <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Mentoring
-              </a>
-              <div class="dropdown-menu" aria-labelledby="mentorDropdown">
-                <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
-                <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
-                <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
-                
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Events
-              </a>
-              <div class="dropdown-menu" aria-labelledby="eventDropdown">
-                <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
-                <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
-                <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
-                <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
-                <a class="dropdown-item" href="/speakers/">Speaker Information</a>
-                <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
-                <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Join the Conversation
-              </a>
-              <div class="dropdown-menu" aria-labelledby="conversDropdown">
-                <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
-                <a class="dropdown-item" href="/lists.html">Mailing List</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+  <header class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
+    
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="mainNavbar">
+      <div class="container"> 
+        <ul class="navbar-nav mr-auto">
+          <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              About
+            </a>
+            <div class="dropdown-menu" aria-labelledby="aboutDropdown">
+              <a class="dropdown-item" href="/about/">What We Do</a>
+              <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
+              <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
+              <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
+              <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
+              <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
+              <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
+              <a class="dropdown-item" href="/links.html">Links to additional material</a>
+              <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
+                  Development JIRA</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Contributors
+            </a>
+            <div class="dropdown-menu" aria-labelledby="contribDropdown">
+              <a class="dropdown-item" href="/newcomers/">Newcomers</a>
+              <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
+              <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
+              <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
+              <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
+              <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
+              <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
+              <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              For Committers/PMCs
+            </a>
+            <div class="dropdown-menu" aria-labelledby="commitDropdown">
+              <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
+              <a class="dropdown-item" href="/committers/">Useful Information for Committers</a>
+              <a class="dropdown-item" href="/committers/consensusBuilding.html">Consensus Building</a>
+              <a class="dropdown-item" href="/committers/lazyConsensus.html">Lazy Consensus</a>
+              <a class="dropdown-item" href="/committers/decisionMaking.html">Decision Making</a>
+              <a class="dropdown-item" href="/committers/voting.html">Voting</a>
+              <a class="dropdown-item" href="/committers/funding-disclaimer.html">Funding Campaign Disclaimer</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="mentorDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Mentoring
+            </a>
+            <div class="dropdown-menu" aria-labelledby="mentorDropdown">
+              <a class="dropdown-item" href="/mentoringprogramme.html">Mentoring Program</a>
+              <a class="dropdown-item" href="/mentorprogrammeformaleducation.html">Mentoring in Formal Education</a>
+              <a class="dropdown-item" href="/mentorprogrammeapplication.html">Applying for the Mentoring Program</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Additional Resources</a>
+              <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
+              <a class="dropdown-item" href="/mentor-request-mail.html">Mentor Request Email Example</a>
+              
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="eventDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Events
+            </a>
+            <div class="dropdown-menu" aria-labelledby="eventDropdown">
+              <a class="dropdown-item" href="https://apachecon.com/">ApacheCon - The official event of the ASF</a>
+              <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a>
+              <a class="dropdown-item" href="https://www.apache.org/events/meetups.html">Upcoming Apache-related meetups</a>
+              <a class="dropdown-item" href="https://www.apache.org/foundation/marks/events">Apache event branding policies</a>
+              <div class="dropdown-divider"></div>
+              <a class="dropdown-item text-uppercase disabled" href="#">Speakers</a>
+              <a class="dropdown-item" href="/speakers/">Speaker Information</a>
+              <a class="dropdown-item" href="/speakers/speakers.html">Finding Speakers / Listing Yourself as a Speaker</a>
+              <a class="dropdown-item" href="/speakers/slides.html">Apache-related Slides</a>
+            </div>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="conversDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Join the Conversation
+            </a>
+            <div class="dropdown-menu" aria-labelledby="conversDropdown">
+              <a class="dropdown-item" href="https://www.facebook.com/ApacheSoftwareFoundation">Facebook</a>
+              <a class="dropdown-item" href="https://twitter.com/ApacheCommunity">Twitter</a>
+              <a class="dropdown-item" href="/lists.html">Mailing List</a>
+            </div>
+          </li>
+        </ul>
+      </div>>
     </div>
+  </header>
 
-  <div class="container">
-    <section id="content" class="row">
-      <div class="col-9">
-        <h3 class="text-muted">The Apache Software Foundation</h3>
-      </div>
-      <div class="col-3 pull-right">
-        <div class="gcse-search"></div>
-  	  </div>
-      <div class="col-12"><h4 class="text-muted">Community &gt; Code</h4></div>
-    </section>
-    
+  <main class="cd-main" id="content" role="main">
+    <div class="container">
+      <section id="content" class="row">
+        <div class="col-md-9">
+          <h3 class="mt-3 text-muted">The Apache Software Foundation</h3>
+        </div>
+        <div class="col-md-3 pull-right">
+          <div class="gcse-search"></div>
+        </div>
+        <div class="col-md-12"><h4 class="text-muted">Community &gt; Code</h4></div>
+      </section>
+      
 
 <nav aria-label="breadcrumb">
   <ol class="breadcrumb">
@@ -160,8 +174,8 @@
 </nav>
 
 
-    <hr>
-    
+      <hr>
+      
 	<p><a name="guidetobeingamentor-Submittingideastothementoringprogramme"></a></p>
 <h1 id="submitting-ideas-to-the-mentoring-programme">Submitting ideas to the mentoring programme</h1>
 <p>All ASF projects are invited to submit their ideas for consideration in the
@@ -257,23 +271,40 @@ you have, as far as possible, confirmed the student is eligble to
 contribute.</p>
 
 
-  </div>
-  
-  <footer class="footer" align="center">
-    <div class="container">
-      <p>
-		Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
-        <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-        <br/>
-		Apache&reg;, the names of Apache projects, and the multicolor feather logo are
-        <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
-        Software Foundation in the United States and/or other countries.
-        <br/>
-        This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a> - patches welcome!
-      </p>
+    </div>
+  </main>
+
+  <footer class="page-footer bg-secondary mt-4 pt-3">
+    <div class="container text-center text-md-left mb-3">
+      <div class="row">
+        <div class="col-md-6 mt-md-0 mt-3">
+          <h5 class="text-uppercase">Trademarks</h5>
+          <p>
+            Apache&reg;, the names of Apache projects, and the multicolor feather logo are
+            <a href="https://www.apache.org/foundation/marks/list/">registered trademarks or trademarks</a> of the Apache
+            Software Foundation in the United States and/or other countries.
+          </p>
+        </div>
+
+        <hr class="clearfix w-100 d-md-none pb-3">
+
+        <div class="col-md-6 mb-md-0 mb-3">
+          <h5 class="text-uppercase">Website sources</h5>
+
+          <p>
+            This website is generated from the <a href="https://github.com/apache/comdev-site">comdev-site repository</a>.<br>
+            Patches are welcome!
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="footer-copyright text-center py-3">
+      <em>Copyright &copy; 2020, the Apache Software Foundation. Licensed under the
+      <a rel="license" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a></em>
     </div>
   </footer>
-  
+
   <script src="/js/jquery-1.9.1.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script>
diff --git a/content/index.html b/content/index.html
index 4ee6f9f..ab4ec0f 100644
--- a/content/index.html
+++ b/content/index.html
@@ -6,143 +6,157 @@
 	<meta name="generator" content="Hugo 0.63.2" />
   <meta name="description" content="Apache Community Development"/>
   <meta name="keywords" content="apache, apache community, community development, opensource"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   <title>Apache Community Development - Apache Community Development - Welcome</title>
   <link rel="shortcut icon" href="images/favicon.ico">
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link href="/css/main.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
   <link href="/css/bootstrap-responsive.css" rel="stylesheet">
   <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
+       
+      .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus {
+          -webkit-box-shadow:none;
+          box-shadow:none;
+          -moz-box-shadow:none;
+          border-radius:0px;
+      }
+
+       
+      .container {
+          margin-top:5px;
+      }
+      .footer {
+          text-align:center;
+          color:grey;
+          font-size:80%;
+          border-top: solid #ddd 1px;
+          margin-top:1em;
       }
-	   
-	   .gsc-search-box input.gsc-input, .gcse-search-box input.gsc-input:focus { -webkit-box-shadow:none; box-shadow:none; -moz-box-shadow:none; border-radius:0px; }
-		 
-		 .container { margin-top:5px; }
-		 .footer { text-align:center; color:grey; font-size:80%; border-top: solid #ddd 1px; margin-top:1em;}
   </style>
 </head>
 
 <body>
-    <div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-      
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-controls="mainNavbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="mainNavbar">
-        <div class="container"> 
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="aboutDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                About
-              </a>
-              <div class="dropdown-menu" aria-labelledby="aboutDropdown">
-                <a class="dropdown-item" href="/about/">What We Do</a>
-                <a class="dropdown-item" href="/newbiefaq.html">Frequently Asked Questions</a>
-                <a class="dropdown-item" href="/projectIndependence.html">Apache Project Independence</a>
-                <a class="dropdown-item" href="/apache-way/apache-project-maturity-model.html">Apache Project Maturity Model</a>
-                <a class="dropdown-item" href="/contactpoints.html">Contact Points Within the ASF</a>
-                <a class="dropdown-item" href="/comdevboardresolution.html">ComDev Original Board Resolution</a>
-                <a class="dropdown-item" href="https://whimsy.apache.org/board/minutes/Community_Development.html">ComDev Board Reports</a>
-                <a class="dropdown-item" href="/links.html">Links to additional material</a>
-                <a class="dropdown-item" href="https://issues.apache.org/jira/projects/COMDEV">Community
-                    Development JIRA</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="contribDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Contributors
-              </a>
-              <div class="dropdown-menu" aria-labelledby="contribDropdown">
-                <a class="dropdown-item" href="/newcomers/">Newcomers</a>
-                <a class="dropdown-item" href="/gettingStarted/101.html">Getting Started</a>
-                <a class="dropdown-item" href="/contributors/">Finding Your Way Around The Apache Software Foundation</a>
-                <a class="dropdown-item" href="https://www.apache.org/dev/">Technical Developer FAQs</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item text-uppercase disabled" href="#">Google Summer of Code</a>
-                <a class="dropdown-item" href="/gsoc.html">Google Summer Of Code Information</a>
-                <a class="dropdown-item" href="/mentee-ranking-process.html">Mentee Ranking Process</a>
-                <a class="dropdown-item" href="/mentoring/experiences.html">Past GSoC Experiences</a>
-                <a class="dropdown-item" href="/guide-to-being-a-mentor.html">Guide to being a Mentor</a>
-                <a class="dropdown-item" href="/use-the-comdev-issue-tracker-for-gsoc-tasks.html">Using ComDev's JIRA for GSoC Ideas</a>
-                <a class="dropdown-item" href="/gsoc-admin-tasks.html">Tasks of a GSoC Admin at the ASF</a>
-              </div>
-            </li>
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="commitDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                For Committers/PMCs
-              </a>
-              <div class="dropdown-menu" aria-labelledby="commitDropdown">
-                <a class="dropdown-item" href="/newcommitter.html">Recruiting New Committers</a>
... 11599 lines suppressed ...


Mime
View raw message