diff --git a/public/assets/css/base.css b/public/assets/css/base.css
index 4c992e9fd4..448bb84253 100644
--- a/public/assets/css/base.css
+++ b/public/assets/css/base.css
@@ -10,9 +10,9 @@
      * small size     - used in common text, borders
      */
     --unit-size: 0.5rem;
-    --main-size: 1.15rem;
-    --medium-size: 0.9rem;
-    --small-size: 0.8rem;
+    --main-size: 1.4rem;
+    --medium-size: 1.2rem;
+    --small-size: 1rem;
 
     /* colours and shadows */
     --bg1: #242434;
@@ -78,7 +78,7 @@
     flex-wrap: wrap;
     justify-content: space-around;
     /*margin-top: calc(3 * var(--small-size) + var(--main-size));*/
-    margin-top: 3.3rem;
+    margin-top: 4.3rem;
 }
 
 /* THE FOCUSED (middle) DIV */
@@ -93,6 +93,35 @@
     max-width: 60%;
 }
 
+.markdown-blocks {
+    background-color: var(--translucent);
+    border-radius: 0 0 var(--unit-size) var(--unit-size);
+    border: solid 2px var(--bg2);
+    border-top: solid 2px var(--bg3);
+    padding: var(--unit-size);
+}
+.markdown-blocks ul {
+    margin-left: 1em;
+    list-style: disc;
+}
+.markdown-blocks ul li {
+    margin-bottom: 0.2em;
+}
+.doc-navigation {
+    background-color: var(--translucent);
+    border-radius: var(--unit-size) var(--unit-size) 0 0;
+    border: solid 2px var(--bg2);
+    border-bottom: none;
+    padding: var(--unit-size);
+}
+.doc-navigation ul {
+    display: flex;
+    justify-content: space-evenly;
+    font-size: var(--main-size);
+    font-family: var(--display-font);
+}
+
+
 /* NOTES */
 .h-feed,
 .notes {
@@ -109,6 +138,7 @@
 .note {
     background-color: var(--translucent);
     border: solid 2px var(--bg2);
+    border-top: solid 2px var(--bg3);
     border-radius: var(--unit-size);
 }
 
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 1ab719241e..6f7134f388 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -27,6 +27,7 @@
         {% endfor %}
     {% endfor %}
 </head>
+
 <body class="bg">
     {% block header %}
         <div id='header'>
@@ -52,9 +53,11 @@
     {% endblock header %}
 
     <div class="container">
-        {% block nav %}{% endblock %}
-        {% block body %}{% endblock %}
-        {% block javascripts %}{% endblock javascripts %}
+        <div class='content'>
+            {% block nav %}{% endblock %}
+            {% block body %}{% endblock %}
+            {% block javascripts %}{% endblock javascripts %}
+        </div>
     </div>
 
 </body>
diff --git a/templates/doc/faq/contact.html.twig b/templates/doc/faq/contact.html.twig
index a08af98ec4..3d05882a5c 100644
--- a/templates/doc/faq/contact.html.twig
+++ b/templates/doc/faq/contact.html.twig
@@ -1,11 +1,15 @@
 {% extends 'doc/faq/faq.html.twig' %}
 
-{% block title %}Help{% endblock %}
+{% block title %}Contact us!{% endblock %}
 
 {% block body %}
     {{ parent() }}
 {% endblock %}
 
+{% block nav %}
+    {{ parent() }}
+{% endblock %}
+
 {% block markdown %}
     {% apply markdown_to_html %}
         ## Bugs
diff --git a/templates/doc/faq/faq.html.twig b/templates/doc/faq/faq.html.twig
index cf4093867e..79227e33ba 100644
--- a/templates/doc/faq/faq.html.twig
+++ b/templates/doc/faq/faq.html.twig
@@ -1,55 +1,54 @@
-{% extends 'doc/base.html.twig' %}
+{% extends 'doc/privacy.html.twig' %}
 
 {% block title %}FAQ{% endblock %}
 
-{% block header %}{{ parent() }}{% endblock %}
-
 {% block body %}
-    <div class='content'>
-        <nav class='faq-nav'>
-            <ul>
-                <li>
-                    <a href="{{ path('doc_faq') }}"
-                       class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_faq' %}active{% endif %}'>FAQ</a>
-                </li>
-                <li>
-                    <a href="{{ path('doc_contact') }}"
-                       class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_contact' %}active{% endif %}'>Contact</a>
-                </li>
-                <li>
-                    <a href="{{ path('doc_tags') }}"
-                       class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_tags' %}active{% endif %}'>Tags</a>
-                </li>
-                <li>
-                    <a href="{{ path('doc_groups') }}"
-                       class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_groups' %}active{% endif %}'>Groups</a>
-                </li>
-                <li>
-                    <a href="{{ path('doc_openid') }}"
-                       class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_openid' %}active{% endif %}'>OpenID</a>
-                </li>
-            </ul>
-        </nav>
-        <div class='markd'>
-            {% block markdown %}
-                {% apply markdown_to_html %}
-                    ## What is this site?
-                    This is a social network, running the GNU social software.
-
-                    You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
-
-                    In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
-
-                    ## Help
-                    GNU social is a **social service**. Users can post short status messages which are shared to their friends and colleagues on the service and (optionally) onto the Web.
-
-                    You can also share other types of data, like bookmarks, event invitations, polls, and questions.
-
-                    If you'd like to try it out, first register a new account. Then, on the public timeline, enter your message into the text box at the top of the page, and click "Send". It will go out on the public timeline and to anyone who is subscribed to your notices.
-
-                    To subscribe to other people's notifications, go to their profile page and click the "subscribe" button. They'll get a notice that you're now subscribed to their notifications.
-                {% endapply %}
-            {% endblock %}
-        </div>
-    </div>
+    {{ parent() }}
 {% endblock %}
+
+{% block nav %}
+    <nav class='doc-navigation'>
+        <ul>
+            <li>
+                <a href="{{ path('doc_faq') }}"
+                   class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_faq' %}active{% endif %}'>FAQ</a>
+            </li>
+            <li>
+                <a href="{{ path('doc_contact') }}"
+                   class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_contact' %}active{% endif %}'>Contact</a>
+            </li>
+            <li>
+                <a href="{{ path('doc_tags') }}"
+                   class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_tags' %}active{% endif %}'>Tags</a>
+            </li>
+            <li>
+                <a href="{{ path('doc_groups') }}"
+                   class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_groups' %}active{% endif %}'>Groups</a>
+            </li>
+            <li>
+                <a href="{{ path('doc_openid') }}"
+                   class='hover-effect {% if app.request.attributes.get('_route') starts with 'doc_openid' %}active{% endif %}'>OpenID</a>
+            </li>
+        </ul>
+    </nav>
+{% endblock %}
+
+{% block markdown %}
+    {% apply markdown_to_html %}
+        ## What is this site?
+        This is a social network, running the GNU social software.
+
+        You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts.
+
+        In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices.
+
+        ## Help
+        GNU social is a **social service**. Users can post short status messages which are shared to their friends and colleagues on the service and (optionally) onto the Web.
+
+        You can also share other types of data, like bookmarks, event invitations, polls, and questions.
+
+        If you'd like to try it out, first register a new account. Then, on the public timeline, enter your message into the text box at the top of the page, and click "Send". It will go out on the public timeline and to anyone who is subscribed to your notices.
+
+        To subscribe to other people's notifications, go to their profile page and click the "subscribe" button. They'll get a notice that you're now subscribed to their notifications.
+    {% endapply %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/doc/faq/groups.html.twig b/templates/doc/faq/groups.html.twig
index 9f3ccc60d7..1a4b9b0a14 100644
--- a/templates/doc/faq/groups.html.twig
+++ b/templates/doc/faq/groups.html.twig
@@ -1,10 +1,14 @@
 {% extends 'doc/faq/faq.html.twig' %}
 
-{% block title %}Help{% endblock %}
+{% block title %}Groups{% endblock %}
 {% block body %}
     {{ parent() }}
 {% endblock %}
 
+{% block nav %}
+    {{ parent() }}
+{% endblock %}
+
 {% block markdown %}
     {% apply markdown_to_html %}
         ## Groups
diff --git a/templates/doc/faq/openid.html.twig b/templates/doc/faq/openid.html.twig
index 86c411dc54..26ae9ea944 100644
--- a/templates/doc/faq/openid.html.twig
+++ b/templates/doc/faq/openid.html.twig
@@ -1,11 +1,15 @@
 {% extends 'doc/faq/faq.html.twig' %}
 
-{% block title %}Help{% endblock %}
+{% block title %}OpenID{% endblock %}
 
 {% block body %}
     {{ parent() }}
 {% endblock %}
 
+{% block nav %}
+    {{ parent() }}
+{% endblock %}
+
 {% block markdown %}
     {% apply markdown_to_html %}
         ## Openid
diff --git a/templates/doc/faq/tags.html.twig b/templates/doc/faq/tags.html.twig
index 3ef187bce2..7ec5014017 100644
--- a/templates/doc/faq/tags.html.twig
+++ b/templates/doc/faq/tags.html.twig
@@ -1,11 +1,15 @@
 {% extends 'doc/faq/faq.html.twig' %}
 
-{% block title %}Help{% endblock %}
+{% block title %}Tags{% endblock %}
 
 {% block body %}
     {{ parent() }}
 {% endblock %}
 
+{% block nav %}
+    {{ parent() }}
+{% endblock %}
+
 {% block markdown %}
     {% apply markdown_to_html %}
         ## Tags
diff --git a/templates/doc/privacy.html.twig b/templates/doc/privacy.html.twig
index dd947262d4..1696b84938 100644
--- a/templates/doc/privacy.html.twig
+++ b/templates/doc/privacy.html.twig
@@ -1,35 +1,36 @@
-{% extends 'base.html.twig' %}
+{% extends 'stdgrid.html.twig' %}
 
 {% block title %}Privacy{% endblock %}
 {% block body %}
     {{ parent() }}
-    <div class='content'>
-        <div class='markd markd-single'>
-            {% block markdown %}
-                {% apply markdown_to_html %}
-                    ## Privacy
 
-                    This document outlines this service's respect for your personal privacy as a user of the service.
+    <div class='markdown-blocks'>
+        {% block markdown %}
+            {% apply markdown_to_html %}
+                ## Privacy
 
-                    - Almost all the text and files that users upload to this site is available under the site license (see the license block at the bottom of this page). Users agree to the license when they register to use the site for the first time. Typically that means that the data can be copied far and wide, for commercial and non-commercial purposes, and in modified or unmodified form. If you're not OK with that, don't use the service.
-                    The following data items are considered private data that won't be shared with other users, business partners, or the public at large:
-                    - your password
-                    - your email address
-                    - your IM address (AIM, Jabber, or other instant messaging address)
-                    - your phone number
-                    - your "private messages"
-                    - your login credentials (username and password) for other services (Twitter, Facebook, etc.)
-                    - Some private data may be published in aggregate, e.g. "30% of our users are registered with Hotmail addresses."
-                    - Your notices (including files) can be downloaded and re-used by other services, either one-by-one or in bulk as RSS files.
-                    - Your profile information (including subscriptions and avatars) can be downloaded and re-used by other services, either scraped from the HTML interface or in bulk as FOAF files.
-                    - Your notices will be forwarded to users who subscribe to them, including users on another microblogging service.
-                    - Your profile information will be sent to microblogging services for users who subscribe to you or to whom you subscribe.
-                    - Based on your email preferences, you may receive automated email messages for important system events, such as when others subscribe to your notices.
-                    - Based on your email preferences, you may receive an email newsletter. You can opt out of the newsletter if you don't want to receive it.
-                    - In urgent situations, administrators may send you email directly to your registered email address, even if you've requested no notices or newsletter. Administrators will use digitally-signed email.
-                    - This service will comply with court orders to turn over your private information.
-                {% endapply %}
-            {% endblock %}
-        </div>
+                This document outlines this service's respect for your personal privacy as a user of the service.
+
+                Almost all the text and files that users upload to this site is available under the site license (see the license block at the bottom of this page). Users agree to the license when they register to use the site for the first time. Typically that means that the data can be copied far and wide, for commercial and non-commercial purposes, and in modified or unmodified form. If you're not OK with that, don't use the service.
+
+                The following data items **are considered private data** that won't be shared with other users, business partners, or the public at large:
+
+                - Your Password;
+                - Your Email address;
+                - Your IM address (AIM, Jabber, or other instant messaging address);
+                - Your phone number;
+                - Your "private messages";
+                - Your login credentials (username and password) for other services (Twitter, Facebook, etc.);
+                - Some private data may be published in aggregate, e.g. "30% of our users are registered with Hotmail addresses.";
+                - Your notices (including files) can be downloaded and re-used by other services, either one-by-one or in bulk as RSS files;
+                - Your profile information (including subscriptions and avatars) can be downloaded and re-used by other services, either scraped from the HTML interface or in bulk as FOAF files;
+                - Your notices will be forwarded to users who subscribe to them, including users on another microblogging service;
+                - Your profile information will be sent to microblogging services for users who subscribe to you or to whom you subscribe;
+                - Based on your email preferences, you may receive automated email messages for important system events, such as when others subscribe to your notices;
+                - Based on your email preferences, you may receive an email newsletter. You can opt out of the newsletter if you don't want to receive it;
+                - In urgent situations, administrators may send you email directly to your registered email address, even if you've requested no notices or newsletter. Administrators will use digitally-signed email;
+                - This service will comply with court orders to turn over your private information;
+            {% endapply %}
+        {% endblock %}
     </div>
 {% endblock %}
diff --git a/templates/doc/source.html.twig b/templates/doc/source.html.twig
index 2bb5c4c0d8..5294bce667 100644
--- a/templates/doc/source.html.twig
+++ b/templates/doc/source.html.twig
@@ -1,24 +1,22 @@
-{% extends 'base.html.twig' %}
+{% extends 'doc/privacy.html.twig' %}
 
 {% block title %}Source{% endblock %}
+
 {% block body %}
     {{ parent() }}
-    <div class='content'>
-        <div class='markd markd-single'>
-            {% block markdown %}
-                {% apply markdown_to_html %}
-                    ## Source
+{% endblock %}
 
-                    This service uses a Free microblogging tool called GNU social. GNU social is available under the GNU Affero General Public License Version 3.0, a Free Software license for network services.
+{% block markdown %}
+    {% apply markdown_to_html %}
+        ## Source
 
-                    You can get a copy of the software by following links from the GNU social main site¹. The version of the software that runs on this site is unmodified from that version. The site also depends on certain libraries and other software; these are all bundled in the GNU social repository² and release archive files.
+        This service uses a Free microblogging tool called GNU social. GNU social is available under the GNU Affero General Public License Version 3.0, a Free Software license for network services.
 
-                    ## References
+        You can get a copy of the software by following links from the GNU social main site¹. The version of the software that runs on this site is unmodified from that version. The site also depends on certain libraries and other software; these are all bundled in the GNU social repository² and release archive files.
 
-                    - GNU social main site, https://gnu.io
-                    - GNU social repository, https://notabug.org/gnu/gnu-social
-                {% endapply %}
-            {% endblock %}
-        </div>
-    </div>
+        ## References
+
+        - GNU social main site, https://gnu.io
+        - GNU social repository, https://notabug.org/gnu/gnu-social
+    {% endapply %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/doc/tos.html.twig b/templates/doc/tos.html.twig
index e6bcaa6a59..0d089be6b4 100644
--- a/templates/doc/tos.html.twig
+++ b/templates/doc/tos.html.twig
@@ -1,89 +1,87 @@
-{% extends 'base.html.twig' %}
+{% extends 'doc/privacy.html.twig' %}
+
+{% block title %}Terms of Service{% endblock %}
 
-{% block title %}TOS{% endblock %}
 {% block body %}
     {{ parent() }}
-    <div class='content'>
-        <div class='markd markd-single'>
-            {% block markdown %}
-                {% apply markdown_to_html %}
-                    ## TOS
-                    ## The gist
-
-                    We run a service called GNU social and would love for you to use it. Our service is designed to give you as much control and ownership over what goes in your notice stream as possible and encourage you to express yourself freely. However, be responsible in what you post. In particular, make sure that none of the prohibited items listed below appear in your notice stream or get linked to from your notice stream (things like spam, viruses, or hate content).
-
-                    You can review our Public Stream to get a sense of the types of notices that are welcome on our service (or not!). If you find a GNU social account that you believe violates our terms of service, please check our Contact documentation.
-
-                    ##Terms of Service
-
-                    The following terms and conditions govern all use of the GNU social website and all content, services and products available at or through the website (taken together, the Website). The Website is owned and operated by xrevan86, saintfury, pztrn (“Operator”). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, Operator’s Privacy Policy) and procedures that may be published from time to time on this Site by Operator (collectively, the “Agreement”).
-
-                    Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by Operator, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
-                    1. *Your GNU social Account and Site.* If you create a notice stream on the Website, you are responsible for maintaining the security of your account and notice stream, and you are fully responsible for all activities that occur under the account and any other actions taken in connection with the notice stream. You must not describe or assign keywords to your notice stream in a misleading or unlawful manner, including in a manner intended to trade on the name or reputation of others, and Operator may change or remove any description or keyword that it considers inappropriate or unlawful, or otherwise likely to cause Operator liability. You must immediately notify Operator of any unauthorized uses of your notice stream, your account or any other breaches of security. Operator will not be liable for any acts or omissions by You, including any damages of any kind incurred as a result of such acts or omissions.
-
-                    2. *Responsibility of Contributors.* If you operate a notice stream, comment on a notice stream, post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, “Content”), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
-                    - the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
-
-                    - if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
-
-                    - you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
-
-                    - the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
-
-                    - the Content is not spam, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
-
-                    - if the Content is machine- or randomly-generated, it is for purposes of direct entertainment, information and/or utility for you or other users, and not for spam,
-
-                    - the Content is not libelous or defamatory (more info on what that means), does not contain threats or incite violence towards individuals or entities, and does not violate the privacy or publicity rights of any third party;
-
-                    - your notice stream is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, other notice streams and web sites, and similar unsolicited promotional methods;
-
-                    - your notice stream is not named in a manner that misleads your readers into thinking that you are another person or company. For example, your notice stream’s URL or name is not the name of a person other than yourself or company other than your own and you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by Operator or otherwise.
-
-                    By submitting Content to Operator for inclusion on your Website, you grant Operator a world-wide, royalty-free, and non-exclusive license to reproduce, modify, adapt and publish the Content solely for the purpose of displaying, distributing and promoting your notice stream.
-
-                    By submitting Content to Operator for inclusion on your Website, you grant all readers the right to use, re-use, modify and/or re-distribute the Content under the terms of the CC-BY-3.0.
-
-                    If you delete Content, Operator will use reasonable efforts to remove it from the Website, but you acknowledge that caching or references to the Content may not be made immediately unavailable.
-
-                    Without limiting any of those representations or warranties, Operator has the right (though not the obligation) to, in Operator’s sole discretion (i) refuse or remove any content that, in Operator’s reasonable opinion, violates any Operator policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in Operator’s sole discretion.
-
-                    ## Responsibility of Website Visitors.
-
-                    Operator has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, Operator does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. Operator disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
-                    ## Content Posted on Other Websites.
-
-                    We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which GNU social links, and that link to GNU social. Operator does not have any control over those external websites and webpages, and is not responsible for their contents or their use. By linking to a external website or webpage, Operator does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. Operator disclaims any responsibility for any harm resulting from your use of external websites and webpages.
-                    Copyright Infringement and DMCA Policy. As Operator asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by GNU social violates your copyright, you are encouraged to notify Operator in accordance with Operator’s Digital Millennium Copyright Act (”DMCA”) Policy. Operator will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. In the case of a visitor who may infringe or repeatedly infringes the copyrights or other intellectual property rights of Operator or others, Operator may, in its discretion, terminate or deny access to and use of the Website. In the case of such termination, Operator will have no obligation to provide a refund of any amounts previously paid to Operator.
-
-                    ## Intellectual Property.
-
-                    This Agreement does not transfer from Operator to you any Operator or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with Operator. GNU social, the GNU social logo, and all other trademarks, service marks, graphics and logos used in connection with GNU social, or the Website are trademarks or registered trademarks of Operator or Operator’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any Operator or third-party trademarks.
-                    Changes. Operator reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. Operator may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
-                    ## Termination.
-
-                    Operator may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your GNU social account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-                    Disclaimer of Warranties. The Website is provided “as is”. Operator and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither Operator nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s a treat. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
-                    ## Limitation of Liability.
-
-                    In no event will Operator, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement or substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to Operator under this agreement during the twelve (12) month period prior to the cause of action. Operator shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-                    General Representation and Warranty. You represent and warrant that (i) your use of the Website will be in strict accordance with the Operator Privacy Policy, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the United States or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
-                    ## Indemnification.
-
-                    You agree to indemnify and hold harmless Operator, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to out of your violation this Agreement.
-                    ## Miscellaneous.
-
-                    This Agreement constitutes the entire agreement between Operator and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of Operator, or by the posting by Operator of a revised version. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; Operator may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
-                    Originally published by Automattic, Inc. as the WordPress.com Terms of Service and made available by them under the Creative Commons Attribution-ShareAlike 3.0 License. Modifications to remove reference to "VIP services", rename "blog" to "notice stream", remove the choice-of-venue clause, and add variables specific to instances of this software made by Control Yourself, Inc. and made available under the terms of the same license.
-                {% endapply %}
-            {% endblock %}
-        </div>
-    </div>
 {% endblock %}
+
+{% block markdown %}
+    {% apply markdown_to_html %}
+        ## TOS
+        ## The gist
+
+        We run a service called GNU social and would love for you to use it. Our service is designed to give you as much control and ownership over what goes in your notice stream as possible and encourage you to express yourself freely. However, be responsible in what you post. In particular, make sure that none of the prohibited items listed below appear in your notice stream or get linked to from your notice stream (things like spam, viruses, or hate content).
+
+        You can review our Public Stream to get a sense of the types of notices that are welcome on our service (or not!). If you find a GNU social account that you believe violates our terms of service, please check our Contact documentation.
+
+        ##Terms of Service
+
+        The following terms and conditions govern all use of the GNU social website and all content, services and products available at or through the website (taken together, the Website). The Website is owned and operated by xrevan86, saintfury, pztrn (“Operator”). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, Operator’s Privacy Policy) and procedures that may be published from time to time on this Site by Operator (collectively, the “Agreement”).
+
+        Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by Operator, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
+
+        1. *Your GNU social Account and Site.* If you create a notice stream on the Website, you are responsible for maintaining the security of your account and notice stream, and you are fully responsible for all activities that occur under the account and any other actions taken in connection with the notice stream. You must not describe or assign keywords to your notice stream in a misleading or unlawful manner, including in a manner intended to trade on the name or reputation of others, and Operator may change or remove any description or keyword that it considers inappropriate or unlawful, or otherwise likely to cause Operator liability. You must immediately notify Operator of any unauthorized uses of your notice stream, your account or any other breaches of security. Operator will not be liable for any acts or omissions by You, including any damages of any kind incurred as a result of such acts or omissions.
+
+        2. *Responsibility of Contributors.* If you operate a notice stream, comment on a notice stream, post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, “Content”), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
+
+        - the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
+
+        - if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
+
+        - you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
+
+        - the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
+
+        - the Content is not spam, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
+
+        - if the Content is machine- or randomly-generated, it is for purposes of direct entertainment, information and/or utility for you or other users, and not for spam,
+
+        - the Content is not libelous or defamatory (more info on what that means), does not contain threats or incite violence towards individuals or entities, and does not violate the privacy or publicity rights of any third party;
+
+        - your notice stream is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, other notice streams and web sites, and similar unsolicited promotional methods;
+
+        - your notice stream is not named in a manner that misleads your readers into thinking that you are another person or company. For example, your notice stream’s URL or name is not the name of a person other than yourself or company other than your own and you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by Operator or otherwise.
+
+        By submitting Content to Operator for inclusion on your Website, you grant Operator a world-wide, royalty-free, and non-exclusive license to reproduce, modify, adapt and publish the Content solely for the purpose of displaying, distributing and promoting your notice stream.
+
+        By submitting Content to Operator for inclusion on your Website, you grant all readers the right to use, re-use, modify and/or re-distribute the Content under the terms of the CC-BY-3.0.
+
+        If you delete Content, Operator will use reasonable efforts to remove it from the Website, but you acknowledge that caching or references to the Content may not be made immediately unavailable.
+
+        Without limiting any of those representations or warranties, Operator has the right (though not the obligation) to, in Operator’s sole discretion (i) refuse or remove any content that, in Operator’s reasonable opinion, violates any Operator policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in Operator’s sole discretion.
+
+        ## Responsibility of Website Visitors.
+
+        Operator has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, Operator does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. Operator disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
+
+        ## Content Posted on Other Websites.
+
+        We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which GNU social links, and that link to GNU social. Operator does not have any control over those external websites and webpages, and is not responsible for their contents or their use. By linking to a external website or webpage, Operator does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. Operator disclaims any responsibility for any harm resulting from your use of external websites and webpages.
+        Copyright Infringement and DMCA Policy. As Operator asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by GNU social violates your copyright, you are encouraged to notify Operator in accordance with Operator’s Digital Millennium Copyright Act (”DMCA”) Policy. Operator will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. In the case of a visitor who may infringe or repeatedly infringes the copyrights or other intellectual property rights of Operator or others, Operator may, in its discretion, terminate or deny access to and use of the Website. In the case of such termination, Operator will have no obligation to provide a refund of any amounts previously paid to Operator.
+
+        ## Intellectual Property.
+
+        This Agreement does not transfer from Operator to you any Operator or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with Operator. GNU social, the GNU social logo, and all other trademarks, service marks, graphics and logos used in connection with GNU social, or the Website are trademarks or registered trademarks of Operator or Operator’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any Operator or third-party trademarks.
+        Changes. Operator reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. Operator may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
+
+        ## Termination.
+
+        Operator may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your GNU social account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
+        Disclaimer of Warranties. The Website is provided “as is”. Operator and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither Operator nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s a treat. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
+
+        ## Limitation of Liability.
+
+        In no event will Operator, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement or substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to Operator under this agreement during the twelve (12) month period prior to the cause of action. Operator shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
+        General Representation and Warranty. You represent and warrant that (i) your use of the Website will be in strict accordance with the Operator Privacy Policy, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the United States or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
+
+        ## Indemnification.
+
+        You agree to indemnify and hold harmless Operator, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to out of your violation this Agreement.
+        ## Miscellaneous.
+
+        This Agreement constitutes the entire agreement between Operator and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of Operator, or by the posting by Operator of a revised version. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; Operator may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
+
+        Originally published by Automattic, Inc. as the WordPress.com Terms of Service and made available by them under the Creative Commons Attribution-ShareAlike 3.0 License. Modifications to remove reference to "VIP services", rename "blog" to "notice stream", remove the choice-of-venue clause, and add variables specific to instances of this software made by Control Yourself, Inc. and made available under the terms of the same license.
+    {% endapply %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/doc/version.html.twig b/templates/doc/version.html.twig
index d9d7bf8c33..ceb0870ebd 100644
--- a/templates/doc/version.html.twig
+++ b/templates/doc/version.html.twig
@@ -1,29 +1,27 @@
-{% extends 'base.html.twig' %}
+{% extends 'doc/privacy.html.twig' %}
 
 {% block title %}Version{% endblock %}
+
 {% block body %}
     {{ parent() }}
-    <div class='content'>
-        <div class='markd markd-single'>
-            {% block markdown %}
-                {% apply markdown_to_html %}
-                    ## GNU social 3
+{% endblock %}
 
-                    This site is powered by GNU social version 3, Copyright 2010 Free Software Foundation, Inc.
+{% block markdown %}
+    {% apply markdown_to_html %}
+        ## GNU social 3
 
-                    ## Contributors
+        This site is powered by GNU social version 3, Copyright 2010 Free Software Foundation, Inc.
 
-                    See https://notabug.org/diogo/gnu-social/src/nightly/CREDITS.md for a full list of contributors.
+        ## Contributors
 
-                    ##License
+        See https://notabug.org/diogo/gnu-social/src/nightly/CREDITS.md for a full list of contributors.
 
-                    GNU social is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+        ##License
 
-                    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+        GNU social is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
-                    You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/agpl.html.
-                {% endapply %}
-            {% endblock %}
-        </div>
-    </div>
+        This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+
+        You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/agpl.html.
+    {% endapply %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/faq/home.html.twig b/templates/faq/home.html.twig
deleted file mode 100644
index d2b36be955..0000000000
--- a/templates/faq/home.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "base.html.twig" %}
diff --git a/templates/network/public.html.twig b/templates/network/public.html.twig
index 5674c2a690..a26760ae92 100644
--- a/templates/network/public.html.twig
+++ b/templates/network/public.html.twig
@@ -9,22 +9,19 @@
 
 {% block body %}
 
-    <div class="content">
-
-        {# Backwards compatibility with hAtom 0.1 #}
-        <div class="timeline">
-            <main class="h-feed hfeed notes">
-                {% if notes is defined and notes is not empty %}
-                    {% for conversation in notes %}
-                        {% include '/note/view.html.twig' with {'note': conversation['note'], 'have_user': have_user, 'replies': conversation['replies']} only %}
-                    {% endfor %}
-                {% else %}
-                    <div id="empty-notes"><h1>{% trans %}No notes here.{% endtrans %}</h1></div>
-                {% endif %}
-            </main>
-        </div>
-
+    {# Backwards compatibility with hAtom 0.1 #}
+    <div class="timeline">
+        <main class="h-feed hfeed notes">
+            {% if notes is defined and notes is not empty %}
+                {% for conversation in notes %}
+                    {% include '/note/view.html.twig' with {'note': conversation['note'], 'have_user': have_user, 'replies': conversation['replies']} only %}
+                {% endfor %}
+            {% else %}
+                <div id="empty-notes"><h1>{% trans %}No notes here.{% endtrans %}</h1></div>
+            {% endif %}
+        </main>
     </div>
+
 {% endblock body %}
 
 {% block javascripts %}{% endblock %}
diff --git a/templates/settings/base.html.twig b/templates/settings/base.html.twig
index 48b253ee88..02adfc0ad1 100644
--- a/templates/settings/base.html.twig
+++ b/templates/settings/base.html.twig
@@ -17,101 +17,98 @@
 {% endblock %}
 
 {% block body %}
-    <div class="content">
+    <nav class='main-nav fg'>
+        <h1>Settings</h1>
+        <ul>
+            <li>
+                <details class="section-title-settings">
+                    <summary>
+                        <h1>Profile {{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
 
-        <nav class='main-nav fg'>
-            <h1>Settings</h1>
-            <ul>
-                <li>
-                    <details class="section-title-settings">
-                        <summary>
-                            <h1>Profile {{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
+                        <em>Personal Information, Avatar and Profile</em>
+                    </summary>
 
-                            <em>Personal Information, Avatar and Profile</em>
-                        </summary>
+                    <section>
+                        <nav class='set-nav'>
+                            <ul>
+                                <li>
+                                    <details class="section-title-settings">
+                                        <summary>
+                                            <h1>Personal
+                                                Info{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
 
-                        <section>
-                            <nav class='set-nav'>
-                                <ul>
+                                            <em>Nickname, Homepage, Bio, Self Tags and more.</em>
+                                        </summary>
+
+                                        {% block form_profile %}
+                                            {% include '/settings/profile.html.twig' %}
+                                        {% endblock %}
+                                    </details>
+                                </li>
+
+                                <hr>
+
+                                {% set profile_tabs = handle_event('PopulateProfileSettingsTabs', app.request) %}
+                                {% for tab in profile_tabs %}
                                     <li>
                                         <details class="section-title-settings">
                                             <summary>
-                                                <h1>Personal
-                                                    Info{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
+                                                <h1>{{ tab['title'] }}{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
 
-                                                <em>Nickname, Homepage, Bio, Self Tags and more.</em>
+                                                <em>{{ tab['desc'] }}</em>
                                             </summary>
 
-                                            {% block form_profile %}
-                                                {% include '/settings/profile.html.twig' %}
-                                            {% endblock %}
+                                            {% include tab['controller']['_template'] with tab['controller'] only %}
+
+                                            {# <a href="{{ path(tab['route']) }}"
+                                                   class='hover-effect {{ active(tab['route']) }}'>{{ tab['title'] }}</a> #}
+
                                         </details>
                                     </li>
 
                                     <hr>
+                                {% endfor %}
+                            </ul>
+                        </nav>
+                    </section>
+                </details>
+            </li>
 
-                                    {% set profile_tabs = handle_event('PopulateProfileSettingsTabs', app.request) %}
-                                    {% for tab in profile_tabs %}
-                                        <li>
-                                            <details class="section-title-settings">
-                                                <summary>
-                                                    <h1>{{ tab['title'] }}{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
+            <hr>
 
-                                                    <em>{{ tab['desc'] }}</em>
-                                                </summary>
+            <li>
+                <details class="section-title-settings">
+                    <summary>
+                        <h1>Account{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
+                        <em>Email, Password and Language</em>
+                    </summary>
 
-                                                {% include tab['controller']['_template'] with tab['controller'] only %}
+                    <section>
+                        {% block form_account %}
+                            {% include '/settings/account.html.twig' %}
+                        {% endblock %}
+                    </section>
+                </details>
+            </li>
 
-                                                {# <a href="{{ path(tab['route']) }}"
-                                                   class='hover-effect {{ active(tab['route']) }}'>{{ tab['title'] }}</a> #}
+            <hr>
 
-                                            </details>
-                                        </li>
+            <li>
+                <details class="section-title-settings">
+                    <summary>
+                        <h1>Notifications{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
+                        <em>Enable/disable notifications (Email, XMPP, Replies...)</em>
+                    </summary>
 
-                                        <hr>
-                                    {% endfor %}
-                                </ul>
-                            </nav>
-                        </section>
-                    </details>
-                </li>
-
-                <hr>
-
-                <li>
-                    <details class="section-title-settings">
-                        <summary>
-                            <h1>Account{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
-                            <em>Email, Password and Language</em>
-                        </summary>
-
-                        <section>
-                            {% block form_account %}
-                                {% include '/settings/account.html.twig' %}
-                            {% endblock %}
-                        </section>
-                    </details>
-                </li>
-
-                <hr>
-
-                <li>
-                    <details class="section-title-settings">
-                        <summary>
-                            <h1>Notifications{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h1>
-                            <em>Enable/disable notifications (Email, XMPP, Replies...)</em>
-                        </summary>
-
-                        <section>
-                            {% block form_notify %}
-                                {% include '/settings/notifications.html.twig' %}
-                            {% endblock %}
-                        </section>
-                    </details>
-                </li>
-            </ul>
-        </nav>
-    </div>
+                    <section>
+                        {% block form_notify %}
+                            {% include '/settings/notifications.html.twig' %}
+                        {% endblock %}
+                    </section>
+                </details>
+            </li>
+        </ul>
+    </nav>
 {% endblock body %}
 
 {% block javascripts %}{% endblock %}
\ No newline at end of file
