diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html
index a1b7f902e4da67882bf6858595007a8ae3e629a5..0b03310d42fbd198158660ead730d951b9fd00b7 100644
--- a/www/conservancy/templates/frontpage.html
+++ b/www/conservancy/templates/frontpage.html
@@ -17,27 +17,27 @@
 {% block content %}
 
 <div class="mt4 flex-ns">
-  <div class="w-70-ns mr3-ns mb3 mb0-ns pa2 ba bw1 b--light-blue">
+  <section class="w-70-ns mh2 mb3 mb0-ns pa2 ba bw1 b--light-blue">
     <img src="{% static 'img/remote.jpg' %}" alt="" class="fl pr2" style="width: 175px;" />
-    <p>Software Freedom Conservancy is a not-for-profit charity that
+    <p class="mb0">Software Freedom Conservancy is a not-for-profit charity that
       helps promote, improve, develop, and defend Free, Libre, and Open Source
       Software (FLOSS) projects.  Conservancy provides a non-profit home and
       infrastructure for FLOSS projects.  This allows FLOSS developers to
       focus on what they do best &mdash; writing and improving FLOSS for the
       general public &mdash; while Conservancy takes care of the projects' needs that
       do not relate directly to software development and documentation. <a href="#" class="orange">Learn more.</a></p>
-  </div>
-  <div class="w-30-ns pa3 bg-light-blue ba b--gray">
+  </section>
+  <section class="w-30-ns mh2 pa3 bg-light-blue ba b--gray">
     <h2 class="f4 ttu">Special message</h2>
 
     <p>Special message here special message here special message here special message here special message here.</p>
     <a href="#" class="f5 dib pa2 ttu b btn-orange">More information</a>
-  </div>
+  </section>
 </div>
 
 <div class="mt3 flex-ns">
-  <div class="w-70-ns mr3-ns pa2">
-    <section>
+  <div class="w-70-ns mh2">
+    <section class="mv3 ph2">
 <h2 class="f4 mt0 mb2 ttu"><a href="/feeds/news/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/news/" class="dark-gray">News</a></h2>
 {% for pressr in press_releases|slice:":5" %}
   {% if forloop.first or pressr.pub_date|date_within_past_days:365 %}
@@ -49,7 +49,7 @@
 <!-- <p><span class="continued"><a href="/news/">Conservancy News Archive&hellip;</a></span></p> -->
 </section>
 
-<section class="mt4 mb3">
+<section class="mt4 mb3 ph2">
 <h2 class="f4 mb2 ttu"><a href="/feeds/blog/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/blog/" class="dark-gray">Articles</a></h2>
 {% for entry in blog|slice:":5" %}
   {% if forloop.first or entry.pub_date|date_within_past_days:180 %}
@@ -62,19 +62,19 @@
 </section>
 </div>
 
-<div class="w-30-ns">
-  <div class="pa2 ba b--gray">
+<div class="w-30-ns mh2">
+  <div class="ph3 pv2 ba b--gray">
     <h3 class="ttu">Term of the week</h3>
     <h4 class="f5 i navy">auditability</h4>
     <p>Ability to inspect the exact software running on a device. This includes version information, modifications and licensing information.</p>
     <p><a href="#" class="orange ttu">Visit our glossary of terms</a></p>
   </div>
 
-  <div class="pt3 pl2">
+  <div class="mh3 pt3">
     <h2 class="f6 ttu mb1">Subscribe to our email list</h2>
-    <form method="post" action="#" class="ml2 flex">
-      <input type="email" class="pa2 ba b--gray br0" style="border-right: none;">
-      <button type="submit" class="bg-orange bn white pa2 pointer btn-orange">
+    <form method="post" action="#" class="ml2" style="display: flex;">
+      <input type="email" class="pa2 ba b--gray br0" style="x-border-right: none; flex: 1 1 auto; width: 1%;">
+      <button type="submit" class="bg-orange bn white pa2 pointer btn-orange" style="margin-left: -1px;">
         <svg style="color: white; width: 20px; height: 20px;"><use href="{% static 'img/font_awesome.svg' %}#envelope"></use></svg></a>
         </button>
     </form>
@@ -87,7 +87,7 @@
     <h2 class="f6 ttu mt2 mb1">Follow us</h2>
     <div class="ml2">
       {% include 'socials_partial.html' %}
-</div>
+    </div>
 
 <!-- <h2>Support Conservancy</h2>
      <p>As a 501(c)(3) non-profit charity, Conservancy relies on