diff --git a/_includes/footer.html b/_includes/footer.html
index 6e81898..7261e42 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,9 +2,9 @@
   <div class="cp--footer collaborative-projects">
     <div class="gray-diagonal">
       <div class="container">
-	<p>&copy; 2016 A Linux Foundation Collaborative Project. All Rights Reserved.</p>
-	<p>Linux Foundation is a registered trademark of The Linux Foundation. Linux is a registered <a href="http://www.linuxfoundation.org/programs/legal/trademark" title="Linux Mark Institute">trademark</a> of Linus Torvalds. Open vSwitch and OvS are trademarks of The Linux Foundation.</p>
-	<p>Please see our <a href="http://www.linuxfoundation.org/privacy">privacy policy</a> and <a href="http://www.linuxfoundation.org/terms">terms of use</a>.</p>
+        <p>&copy; 2016 A Linux Foundation Collaborative Project. All Rights Reserved.</p>
+        <p>Linux Foundation is a registered trademark of The Linux Foundation. Linux is a registered <a href="http://www.linuxfoundation.org/programs/legal/trademark" title="Linux Mark Institute">trademark</a> of Linus Torvalds. Open vSwitch and OvS are trademarks of The Linux Foundation.</p>
+        <p>Please see our <a href="http://www.linuxfoundation.org/privacy">privacy policy</a> and <a href="http://www.linuxfoundation.org/terms">terms of use</a>.</p>
       </div>
     </div>
   </div>
diff --git a/_includes/header.html b/_includes/header.html
index d541247..3125fec 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,22 +1,21 @@
 <div id="header">
-<header>
+  <header>
     <div class="cp--header collaborative-projects">
       <div class="gray-diagonal">
-	<div class="container">
-	  <a id="cp--logo" href="http://collabprojects.linuxfoundation.org">
-	    <img src="{{site.url}}/assets/lf/lfcollabprojects_logo_gray.png" alt="Linux Foundation Collaborative Projects" />
-	  </a>
-	</div>
+        <div class="container">
+          <a id="cp--logo" href="http://collabprojects.linuxfoundation.org">
+            <img src="{{site.url}}/assets/lf/lfcollabprojects_logo_gray.png" alt="Linux Foundation Collaborative Projects" />
+          </a>
+        </div>
       </div>
     </div>
     <div id="logo">
-        <a href="{{site.url}}/"><img src="{{site.url}}/assets/vswitch.png" alt="Open vSwitch" height="100" width="154"></a>
+      <a href="{{site.url}}/"><img src="{{site.url}}/assets/vswitch.png" alt="Open vSwitch" height="100" width="154"></a>
     </div>
-
     <nav>
-    <ul class="menu">
+      <ul class="menu">
         {% include menulist.html menu=site.data.nav url=site.url %}
-    </ul>
+      </ul>
     </nav>
-</header>
+  </header>
 </div>
diff --git a/_includes/menulist.html b/_includes/menulist.html
index d162702..fb66e54 100644
--- a/_includes/menulist.html
+++ b/_includes/menulist.html
@@ -1,10 +1,13 @@
 {% for item in include.menu %}
-    {% capture itemurl%}{{include.url}}{{item.url}}{% endcapture %}
-    <li><a href="{{itemurl}}"{% if item.subpages %} class="l2submenu"{% endif %}><div>{{item.title}}</div></a>
-        {% if item.subpages %}
-            <ul>
-                {% include menulist.html menu=item.subpages url=itemurl %}
-            </ul>
-        {% endif %}
-    </li>
+{% capture itemurl%}{{include.url}}{{item.url}}{% endcapture %}
+<li>
+  <a href="{{itemurl}}"{% if item.subpages %} class="l2submenu"{% endif %}>
+    <div>{{item.title}}</div>
+  </a>
+  {% if item.subpages %}
+  <ul>
+    {% include menulist.html menu=item.subpages url=itemurl %}
+  </ul>
+  {% endif %}
+</li>
 {% endfor %}
diff --git a/_includes/side-widgets.html b/_includes/side-widgets.html
index b696ea4..8db5c69 100644
--- a/_includes/side-widgets.html
+++ b/_includes/side-widgets.html
@@ -1,68 +1,68 @@
 <div class="widget">
-    <div class="widget-title">
-        Updates
-    </div>
-    <div class="textwidget">
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-November/000093.html>Nov 02 2016: Open vSwitch 2.6.1 Available</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-November/000092.html>Nov 01 2016: Final Reminder for OVS Fall 2016 Conference</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-September/000087.html>Sep 28 2016: Open vSwitch 2.6.0 and 2.5.1 Available</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-September/000086.html>Sep 19 2016: Registration Open for OVS Fall 2016 Conference</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-August/000085.html>Aug 31 2016: Open vSwitch Fall 2016 Conference: Call for  Participation</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-March/000083.html>Mar 29 2016: Open vSwitch 2.4.1 and 2.3.3 Available</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-March/000082.html>Mar 29 2016: CVE-2016-2074: MPLS buffer overflow vulnerabilities in Open vSwitch</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-February/000081.html>Feb 27 2016: Open vSwitch 2.5.0 Available</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2015-August/000078.html>Aug 21 2015: Open vSwitch 2.4.0 Available</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2015-August/000076.html>Aug 05 2015: Open vSwitch Fall 2015 Conference: Call for Participation</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2015-June/000075.html>Jun 18 2015: Open vSwitch 2.3.2 Available</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2014-December/000071.html>Dec 03 2014: Open vSwitch 2.3.1 Available</a>
-        <br>
-        <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2014-August/000067.html>Aug 14 2014: Open vSwitch 2.3.0, 2.1.3, and 2.0.2 Available</a>
-        <br>
-        <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-May/000066.html">May 15 2014: OpenStack: "Open vSwitch and the Intelligent Edge" Slides</a>
-        <br>
-        <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-May/000065.html">May 01 2014: Open vSwitch 2.1.2 Available</a>
-        <br><a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-April/000064.html">Apr 29 2014: Open vSwitch 2.1.1 Available</a>
-        <br>
-        <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-April/000063.html">Apr 8 2014: Open vSwitch repository moves to Github</a>
-        <br>
-        <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-March/000061.html">Mar 19 2014: Open vSwitch 2.1.0 Available</a>
-        <br>
-        <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-March/000060.html">Mar 04 2014: Announcing an Open vSwitch Hackathon March 26-27</a>
-    </div>
+  <div class="widget-title">
+    Updates
+  </div>
+  <div class="textwidget">
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-November/000093.html>Nov 02 2016: Open vSwitch 2.6.1 Available</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-November/000092.html>Nov 01 2016: Final Reminder for OVS Fall 2016 Conference</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-September/000087.html>Sep 28 2016: Open vSwitch 2.6.0 and 2.5.1 Available</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-September/000086.html>Sep 19 2016: Registration Open for OVS Fall 2016 Conference</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-August/000085.html>Aug 31 2016: Open vSwitch Fall 2016 Conference: Call for  Participation</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-March/000083.html>Mar 29 2016: Open vSwitch 2.4.1 and 2.3.3 Available</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-March/000082.html>Mar 29 2016: CVE-2016-2074: MPLS buffer overflow vulnerabilities in Open vSwitch</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2016-February/000081.html>Feb 27 2016: Open vSwitch 2.5.0 Available</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2015-August/000078.html>Aug 21 2015: Open vSwitch 2.4.0 Available</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2015-August/000076.html>Aug 05 2015: Open vSwitch Fall 2015 Conference: Call for Participation</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2015-June/000075.html>Jun 18 2015: Open vSwitch 2.3.2 Available</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2014-December/000071.html>Dec 03 2014: Open vSwitch 2.3.1 Available</a>
+    <br>
+    <a href=https://mail.openvswitch.org/pipermail/ovs-announce/2014-August/000067.html>Aug 14 2014: Open vSwitch 2.3.0, 2.1.3, and 2.0.2 Available</a>
+    <br>
+    <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-May/000066.html">May 15 2014: OpenStack: "Open vSwitch and the Intelligent Edge" Slides</a>
+    <br>
+    <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-May/000065.html">May 01 2014: Open vSwitch 2.1.2 Available</a>
+    <br><a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-April/000064.html">Apr 29 2014: Open vSwitch 2.1.1 Available</a>
+    <br>
+    <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-April/000063.html">Apr 8 2014: Open vSwitch repository moves to Github</a>
+    <br>
+    <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-March/000061.html">Mar 19 2014: Open vSwitch 2.1.0 Available</a>
+    <br>
+    <a href="https://mail.openvswitch.org/pipermail/ovs-announce/2014-March/000060.html">Mar 04 2014: Announcing an Open vSwitch Hackathon March 26-27</a>
+  </div>
 </div>
 <div class="widget">
-    <div class="widget-title">
-        Recent Releases
-    </div> 
-    <div class="textwidget">
-        Current release: <a href="http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz">2.6.1</a><br>
-        Current LTS series: <a href="http://openvswitch.org/releases/openvswitch-2.5.1.tar.gz">2.5.1</a><br>
-    </div>
+  <div class="widget-title">
+    Recent Releases
+  </div>
+  <div class="textwidget">
+    Current release: <a href="http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz">2.6.1</a><br>
+    Current LTS series: <a href="http://openvswitch.org/releases/openvswitch-2.5.1.tar.gz">2.5.1</a><br>
+  </div>
 </div>
 <div class="widget">
-    <div class="widget-title">
-        Mailing List Archives
-    </div>
-    <div class="textwidget">
-        {% include mailinglist-link.html %}
-    </div>
+  <div class="widget-title">
+    Mailing List Archives
+  </div>
+  <div class="textwidget">
+    {% include mailinglist-link.html %}
+  </div>
 </div>
 <div class="widget">
-    <div class="widget-title">
-        IRC
-    </div>
-    <div class="textwidget">
-        Visit #openvswitch on irc.<a href="http://freenode.net">freenode.net</a>.
-    </div>
+  <div class="widget-title">
+    IRC
+  </div>
+  <div class="textwidget">
+    Visit #openvswitch on irc.<a href="http://freenode.net">freenode.net</a>.
+  </div>
 </div>
diff --git a/_layouts/page.html b/_layouts/page.html
index f696d4e..ca0c19a 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -2,9 +2,9 @@
 layout: skel
 ---
 <div class="main-content">
-    <h1>{{page.title}}</h1>
-    {{ content }}
+  <h1>{{page.title}}</h1>
+  {{ content }}
 </div>
 <div class="side-widgets">
-    {% include side-widgets.html %}
+  {% include side-widgets.html %}
 </div>
diff --git a/_layouts/pagenosidewidget.html b/_layouts/pagenosidewidget.html
index 3700e90..c126cf9 100644
--- a/_layouts/pagenosidewidget.html
+++ b/_layouts/pagenosidewidget.html
@@ -2,6 +2,6 @@
 layout: skel
 ---
 <div class="main-content-no-side-widget">
-    <h1>{{page.title}}</h1>
-    {{ content }}
+  <h1>{{page.title}}</h1>
+  {{ content }}
 </div>
diff --git a/_layouts/skel.html b/_layouts/skel.html
index 8005dc4..2a8e0bf 100644
--- a/_layouts/skel.html
+++ b/_layouts/skel.html
@@ -1,18 +1,16 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="UTF-8">
-        <link rel="stylesheet" type="text/css" href="{{site.url}}/assets/style.css">
-	<link rel="shortcut icon" href="{{site.url}}/assets/vswitch.ico">
-        <title>{{ page.title }}</title>
-    </head>
-    <body {% if page.body_class %}class="{{ page.body_class }}"{% endif %}>
-        <div id="wholepage">
-            {% include header.html %}
-            <div class="page">
-                {{ content }}
-            </div>
-            {% include footer.html %}
-        </div>
-    </body>
+  <head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" type="text/css" href="{{site.url}}/assets/style.css">
+    <link rel="shortcut icon" href="{{site.url}}/assets/vswitch.ico">
+    <title>{{ page.title }}</title>
+  </head>
+  <body {% if page.body_class %}class="{{ page.body_class }}"{% endif %}>
+    {% include header.html %}
+    <div class="page">
+      {{ content }}
+    </div>
+    {% include footer.html %}
+  </body>
 </html>
diff --git a/index.html b/index.html
index 9b2ea7e..e5f2de2 100644
--- a/index.html
+++ b/index.html
@@ -23,55 +23,52 @@ comments: []
 ---
 <!--TODO mailing list links-->
 <div class="mainpage-top">
-    <h1 style="display:inline-block;">Production Quality, Multilayer Open Virtual Switch</h1>
-    <div class="halfcolumn">
-        <img width="440" height="300" src="{{site.url}}/assets/featured-image.jpg" alt="">
-    </div>
-    <div class="halfcolumn">
-        <h2><strong>What is Open vSwitch?</strong></h2>
-        <p>Open vSwitch is a production quality, multilayer virtual switch licensed under the open source <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</a> license.&nbsp; It is designed to enable massive network automation through programmatic extension, while still supporting standard management interfaces and protocols (e.g. NetFlow, sFlow, IPFIX, RSPAN,&nbsp;CLI, LACP, 802.1ag).&nbsp; In addition, it is designed to support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. See full feature list <a href="{{site.url}}/features">here</a></p>
-        <a href="{{site.url}}/download">
-            <div class="featured-button">
-                <p>Download</p>
-            </div>
-        </a>
-    </div>
+  <h1 style="display:inline-block;">Production Quality, Multilayer Open Virtual Switch</h1>
+  <div class="halfcolumn">
+    <img width="440" height="300" src="{{site.url}}/assets/featured-image.jpg" alt="">
+  </div>
+  <div class="halfcolumn">
+    <h2><strong>What is Open vSwitch?</strong></h2>
+    <p>Open vSwitch is a production quality, multilayer virtual switch licensed under the open source <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</a> license.&nbsp; It is designed to enable massive network automation through programmatic extension, while still supporting standard management interfaces and protocols (e.g. NetFlow, sFlow, IPFIX, RSPAN,&nbsp;CLI, LACP, 802.1ag).&nbsp; In addition, it is designed to support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. See full feature list <a href="{{site.url}}/features">here</a></p>
+    <a href="{{site.url}}/download">
+      <div class="featured-button">
+        <p>Download</p>
+      </div>
+    </a>
+  </div>
 </div>
+
 <div class="columncontainer">
-    <div class="onethirdcolumn widget">
-        <div class="widget-title">
-            Introducing Open vSwitch
-        </div>
-        <div class="textwidget">
-            <p>To understand why virtualized environments require a new approach to switching, read the <a href="{{site.gitfileviewerurl}}WHY-OVS.rst">WHY-OVS</a> document that is distributed with the source code.</p>
-            <p>Open vSwitch is used in multiple products and runs in many large production environments (some very, very large). Each stable release is run through a regression suite of hundreds of system-level tests and over a thousand unit tests.</p>
-        </div>
+  <div class="onethirdcolumn widget">
+    <div class="widget-title">
+      Introducing Open vSwitch
+    </div>
+    <div class="textwidget">
+      <p>To understand why virtualized environments require a new approach to switching, read the <a href="{{site.gitfileviewerurl}}WHY-OVS.rst">WHY-OVS</a> document that is distributed with the source code.</p>
+      <p>Open vSwitch is used in multiple products and runs in many large production environments (some very, very large). Each stable release is run through a regression suite of hundreds of system-level tests and over a thousand unit tests.</p>
     </div>
+  </div>
 
-    <div class="onethirdcolumn widget">
-        <div class="widget-title">News</div>
-        <div class="textwidget">
-	  <p>
-	    Open vSwitch 2016 Fall Conference was held Nov. 7 and 8 in
-	    San Jose, CA.  <a href="support/ovscon2016">Slides and
-	    videos</a> are available.
-	  </p>
-	</div>
-        <div class="widget-title">
-            Join Open vSwitch Community
-        </div>
-        <div class="textwidget">
-            <p>{% include mailinglist-link.html %}</p>
-        </div>
+  <div class="onethirdcolumn widget">
+    <div class="widget-title">News</div>
+    <div class="textwidget">
+      <p>Open vSwitch 2016 Fall Conference was held Nov. 7 and 8 in San Jose, CA.  <a href="support/ovscon2016">Slides and videos</a> are available.</p>
     </div>
-    <div class="onethirdcolumn widget">
-        <div class="widget-title">
-            Supported Platform
-        </div>
-        <div class="textwidget">
-            <p>Open vSwitch can operate both as a soft switch running within the hypervisor, and as the control stack for switching silicon. It has been ported to multiple virtualization platforms and switching chipsets. It is the default switch in <a href="http://support.citrix.com/article/CTX130418">XenServer 6.0</a>, the <a href="http://xen.org/products/cloudxen.html">Xen Cloud Platform</a> and also supports <a href="http://www.xen.org">Xen</a>, <a href="http://www.linux-kvm.org">KVM</a>, <a href="http://pve.proxmox.com/wiki/Main_Page"> Proxmox VE </a> and <a href="http://www.virtualbox.org/">VirtualBox</a>. It has also been integrated into many virtual management systems including <a href="http://www.openstack.org/">OpenStack</a>, <a href="http://www.openqrm.com/">openQRM</a>, <a href="http://opennebula.org/">OpenNebula</a> and <a href="http://ovirt.org/">oVirt</a>. The kernel datapath is distributed with <a href="http://kernel.org/">Linux</a>,  and packages are availabl
 e for <a
  href="http://www.ubuntu.com/">Ubuntu</a>, <a href="http://www.debian.org/">Debian</a>, <a href="http://fedoraproject.org//">Fedora</a> and <a href="https://www.opensuse.org/">openSUSE</a>. Open vSwitch is also supported on <a href="http://freebsd.org">FreeBSD</a> and <a href="http://netbsd.org">NetBSD</a>.  The Open vSwitch release in development has been ported to <a href="http://dpdk.org">DPDK</a>.<br><br></p>
+    <div class="widget-title">
+      <p>Join Open vSwitch Community</p>
+    </div>
+    <div class="textwidget">
+      <p>{% include mailinglist-link.html %}</p>
+    </div>
+  </div>
 
-            <p>The bulk of the code is written in platform-independent C and is easily ported to other environments.</p>
-        </div>
+  <div class="onethirdcolumn widget">
+    <div class="widget-title">
+      Supported Platform
+    </div>
+    <div class="textwidget">
+      <p>Open vSwitch can operate both as a soft switch running within the hypervisor, and as the control stack for switching silicon. It has been ported to multiple virtualization platforms and switching chipsets. It is the default switch in <a href="http://support.citrix.com/article/CTX130418">XenServer 6.0</a>, the <a href="http://xen.org/products/cloudxen.html">Xen Cloud Platform</a> and also supports <a href="http://www.xen.org">Xen</a>, <a href="http://www.linux-kvm.org">KVM</a>, <a href="http://pve.proxmox.com/wiki/Main_Page"> Proxmox VE </a> and <a href="http://www.virtualbox.org/">VirtualBox</a>. It has also been integrated into many virtual management systems including <a href="http://www.openstack.org/">OpenStack</a>, <a href="http://www.openqrm.com/">openQRM</a>, <a href="http://opennebula.org/">OpenNebula</a> and <a href="http://ovirt.org/">oVirt</a>. The kernel datapath is distributed with <a href="http://kernel.org/">Linux</a>,  and packages are available for 
 <a href=
 "http://www.ubuntu.com/">Ubuntu</a>, <a href="http://www.debian.org/">Debian</a>, <a href="http://fedoraproject.org//">Fedora</a> and <a href="https://www.opensuse.org/">openSUSE</a>. Open vSwitch is also supported on <a href="http://freebsd.org">FreeBSD</a> and <a href="http://netbsd.org">NetBSD</a>.  The Open vSwitch release in development has been ported to <a href="http://dpdk.org">DPDK</a>.<br><br></p>
