diff --git a/copyright.html b/copyright.html
index a675a55..f4c8ac0 100644
--- a/copyright.html
+++ b/copyright.html
@@ -1,15 +1,22 @@
 <div id="copyright">
   <p id="footer-links">
     {% block footer_links %}
-    <a href="http://www.mozilla.org/privacy-policy.html">{{ _('Privacy Policy') }}</a> &nbsp;|&nbsp;
-    <a href="http://www.mozilla.org/about/legal.html">{{ _('Legal Notices') }}</a> &nbsp;|&nbsp;
-    <a href="http://www.mozilla.org/legal/fraud-report/index.html">{{ _('Report Trademark Abuse') }}</a>
-    {% block extra_footer_links %}{% endblock %}
+      <a href="http://www.mozilla.org/privacy-policy.html">
+        {{ _('Privacy Policy') }}
+      </a> &nbsp;|&nbsp;
+      <a href="http://www.mozilla.org/about/legal.html">
+        {{ _('Legal Notices') }}
+      </a> &nbsp;|&nbsp;
+      <a href="http://www.mozilla.org/legal/fraud-report/index.html">
+        {{ _('Report Trademark Abuse') }}
+      </a>
+      {% block extra_footer_links %}{% endblock %}
     {% endblock %}
   </p>
   <p>
     {% trans %}
-      Except where otherwise <a href="http://www.mozilla.org/about/legal.html#site">noted</a>,
+      Except where otherwise
+      <a href="http://www.mozilla.org/about/legal.html#site">noted</a>,
       content on this site is licensed under the <br />
       <a href="http://creativecommons.org/licenses/by-sa/3.0/">
         Creative Commons Attribution Share-Alike License v3.0
diff --git a/footer.html b/footer.html
index 65120a1..17de815 100644
--- a/footer.html
+++ b/footer.html
@@ -3,7 +3,11 @@
     {% endblock %}
 </div>
 
-<div id="footer-logo"><a href="http://www.mozilla.org/" title="{{ _('Back to home page') }}">{{ _('Firefox') }}</a></div>
+<div id="footer-logo">
+  <a href="http://www.mozilla.org/" title="{{ _('Back to home page') }}">
+    {{ _('Firefox') }}
+  </a>
+</div>
 
 <div id="footer-menu" role="navigation">
   {% block menu_links %}
diff --git a/header.html b/header.html
index 57a966e..fdbcc10 100644
--- a/header.html
+++ b/header.html
@@ -4,8 +4,13 @@
     <a href="#lang_form">{{ _('switch language') }}</a>
   </div>
 
-  <h1><a href="http://www.mozilla.org/?ref=logo" title="{{ _('Back to Mozilla.com') }}">{{ _('Firefox') }}</a></h1>
-  <a class="mozilla" href="http://www.mozilla.org/?ref=logo">{{ _('visit <span>mozilla.org</span>')|safe }}</a>
+  <h1>
+    <a href="http://www.mozilla.org/?ref=logo"
+       title="{{ _('Back to Mozilla.com') }}">{{ _('Firefox') }}</a>
+  </h1>
+  <a class="mozilla" href="http://www.mozilla.org/?ref=logo">
+    {{ _('visit <span>mozilla.org</span>')|safe }}
+  </a>
 
   <div id="nav-main" role="navigation">
     {% block menu_links %}
diff --git a/menu_links.html b/menu_links.html
index b2968c5..4cafcbf 100644
--- a/menu_links.html
+++ b/menu_links.html
@@ -1,33 +1,33 @@
 <ul>
   {% block feature_links %}
-  <li class="first"><a href="http://www.mozilla.org/firefox/features/">{{ _('Features') }}</a>
-    <ul>
-      <li class="first"><a href="http://www.mozilla.org/firefox/features/">{{ _('Features') }}</a></li>
-      <li><a href="http://www.mozilla.org/firefox/security/">{{ _('Security') }}</a></li>
-      <li><a href="http://www.mozilla.org/firefox/performance/">{{ _('Performance') }}</a></li>
-      <li><a href="http://www.mozilla.org/firefox/customize/">{{ _('Customization') }}</a></li>
-      <li><a href="http://www.mozilla.org/firefox/video/">{{ _('Videos') }}</a></li>
-      <li><a href="http://www.mozilla.org/firefox/central/">{{ _('Tour') }}</a></li>
-      <li class="last"><a href="http://www.mozilla.org/en-US/firefox/channel/">{{ _('Future Releases') }}</a></li>
-    </ul>
-  </li>
+    <li class="first"><a href="http://www.mozilla.org/firefox/features/">{{ _('Features') }}</a>
+      <ul>
+        <li class="first"><a href="http://www.mozilla.org/firefox/features/">{{ _('Features') }}</a></li>
+        <li><a href="http://www.mozilla.org/firefox/security/">{{ _('Security') }}</a></li>
+        <li><a href="http://www.mozilla.org/firefox/performance/">{{ _('Performance') }}</a></li>
+        <li><a href="http://www.mozilla.org/firefox/customize/">{{ _('Customization') }}</a></li>
+        <li><a href="http://www.mozilla.org/en-US/firefox/technology/">{{ _('Technology') }}</a></li>
+        <li><a href="http://www.mozilla.org/firefox/video/">{{ _('Videos') }}</a></li>
+        <li><a href="http://www.mozilla.org/firefox/central/">{{ _('Tour') }}</a></li>
+        <li class="last"><a href="http://www.mozilla.org/en-US/firefox/channel/">{{ _('Future Releases') }}</a></li>
+      </ul>
+    </li>
   {% endblock %}
   {% block mobile_links %}
-  <li><a href="http://www.mozilla.org/mobile/">{{ _('Mobile') }}</a>
-    <ul>
-      <li class="first"><a href="http://www.mozilla.org/mobile/">{{ _('Mobile Overview') }}</a></li>
-      <li><a href="http://www.mozilla.org/mobile/download/">{{ _('Download') }}</a></li>
-      <li><a href="http://www.mozilla.org/mobile/features/">{{ _('Features') }}</a></li>
-      <li><a href="https://addons.mozilla.org/mobile/?browse=featured">{{ _('Customize') }}</a></li>
-      <li><a href="http://www.mozilla.org/mobile/sync/">{{ _('Sync') }}</a></li>
-      <li><a href="https://developer.mozilla.org/mobile">{{ _('Develop') }}</a></li>
-      <li><a href="http://www.mozilla.org/mobile/getinvolved/">{{ _('Get Involved') }}</a></li>
-      <li><a href="http://www.mozilla.org/mobile/faq/">{{ _('FAQ') }}</a></li>
-      <li><a href="https://blog.mozilla.com/mobile/">{{ _('Blog') }}</a></li>
-      <li><a href="http://www.mozilla.org/en-US/firefox/video?video=fx4-mobile-greatday">{{ _('Videos') }}</a></li>
-      <li class="last"><a href="http://www.mozilla.org/en-US/firefox/channel/">{{ _('Future Releases') }}</a></li>
-    </ul>
-  </li>
+    <li><a href="http://www.mozilla.org/mobile/">{{ _('Mobile') }}</a>
+      <ul>
+        <li class="first"><a href="http://www.mozilla.org/mobile/download/">{{ _('Download') }}</a></li>
+        <li><a href="http://www.mozilla.org/mobile/features/">{{ _('Features') }}</a></li>
+        <li><a href="https://addons.mozilla.org/mobile/?browse=featured">{{ _('Customize') }}</a></li>
+        <li><a href="http://www.mozilla.org/mobile/sync/">{{ _('Sync') }}</a></li>
+        <li><a href="https://developer.mozilla.org/mobile">{{ _('Develop') }}</a></li>
+        <li><a href="http://www.mozilla.org/mobile/getinvolved/">{{ _('Get Involved') }}</a></li>
+        <li><a href="http://www.mozilla.org/mobile/faq/">{{ _('FAQ') }}</a></li>
+        <li><a href="https://blog.mozilla.com/mobile/">{{ _('Blog') }}</a></li>
+        <li><a href="http://www.mozilla.org/en-US/firefox/video?video=fx4-mobile-greatday">{{ _('Videos') }}</a></li>
+        <li class="last"><a href="http://www.mozilla.org/en-US/firefox/channel/">{{ _('Future Releases') }}</a></li>
+      </ul>
+    </li>
   {% endblock %}
   {% block amo_links %}
     <li><a href="https://addons.mozilla.org/">{{ _('Add-ons') }}</a>
@@ -55,18 +55,19 @@
     </li>
   {% endblock %}
   {% block about_links %}
-  <li class="last"><a href="http://www.mozilla.org/about/">{{ _('About') }}</a>
-    <ul>
-      <li class="first"><a href="http://www.mozilla.org/about/">{{ _('About Firefox') }}</a></li>
-      <li><a href="http://www.mozilla.org/about/participate/">{{ _('Participate') }}</a></li>
-      <li><a href="http://www.mozilla.org/press/">{{ _('Communications') }}</a></li>
-      <li><a href="http://www.mozilla.org/en-US/firefox/brand/">{{ _('Brand Toolkit') }}</a></li>
-      <li><a href="http://www.mozilla.org/about/careers.html">{{ _('Careers') }}</a></li>
-      <li><a href="http://www.mozilla.org/about/partnerships.html">{{ _('Partnerships') }}</a></li>
-      <li><a href="http://www.mozilla.org/about/legal.html">{{ _('Legal') }}</a></li>
-      <li><a href="http://www.mozilla.org/about/contact.html">{{ _('Contact Us') }}</a></li>
-      <li class="last"><a href="http://blog.mozilla.com/">{{ _('Blog') }}</a></li>
-    </ul>
-  </li>
+    <li class="last"><a href="http://www.mozilla.org/about/">{{ _('About') }}</a>
+      <ul>
+        <li class="first"><a href="http://www.mozilla.org/about/">{{ _('About Firefox') }}</a></li>
+        <li><a href="http://www.mozilla.org/join">{{ _('Join Mozilla') }}</a></li>
+        <li><a href="http://www.mozilla.org/about/participate/">{{ _('Participate') }}</a></li>
+        <li><a href="http://www.mozilla.org/press/">{{ _('Communications') }}</a></li>
+        <li><a href="http://www.mozilla.org/en-US/firefox/brand/">{{ _('Brand Toolkit') }}</a></li>
+        <li><a href="http://www.mozilla.org/about/careers.html">{{ _('Careers') }}</a></li>
+        <li><a href="http://www.mozilla.org/about/partnerships.html">{{ _('Partnerships') }}</a></li>
+        <li><a href="http://www.mozilla.org/about/legal.html">{{ _('Legal') }}</a></li>
+        <li><a href="http://www.mozilla.org/about/contact.html">{{ _('Contact Us') }}</a></li>
+        <li class="last"><a href="http://blog.mozilla.com/">{{ _('Blog') }}</a></li>
+      </ul>
+    </li>
   {% endblock %}
 </ul>
diff --git a/minimal-header.html b/minimal-header.html
index 1fdcc22..8e51db6 100644
--- a/minimal-header.html
+++ b/minimal-header.html
@@ -1,3 +1,3 @@
 <div id="minimal-header"><a class="mozilla" href="http://www.mozilla.org/">
-    {{ _('visit <span>mozilla.org</span>')|safe }}
+  {{ _('visit <span>mozilla.org</span>')|safe }}
 </a></div>