diff --git a/static/css/style.css b/static/css/style.css
index d12df66..62b87c9 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -128,7 +128,7 @@ main {
 }
 
 footer {
-    max-width: 900px;
+    max-width: 800px;
     margin: 0 auto;
     padding: 0 0 10px 0;
     color: var(--color-text-duller);
@@ -136,31 +136,7 @@ footer {
     font-size: 90%;
 }
 
-body:not(.no-sidebar) footer {
-    position: fixed;
-    bottom: 0;
-    right: calc((100vw - 920px)/2);
-    width: 250px;
-    margin: 0;
-    padding: 5px;
-    display: flex;
-    flex-wrap: wrap;
-}
-
-body:not(.no-sidebar) footer a {
-    flex-basis: 50%;
-    flex-grow: 1;
-}
-
-body:not(.no-sidebar) footer a:hover {
-    color: var(--color-text-dull);
-}
-
-.no-sidebar footer {
-    max-width: 800px;
-}
-
-.no-sidebar footer a {
+footer a {
     border-bottom: 1px solid var(--color-text-duller);
     margin-right: 5px;
 }
@@ -404,6 +380,14 @@ nav a i {
     text-transform: uppercase;
 }
 
+.right-column footer {
+    padding: 0 10px 20px 10px;
+    font-size: 90%;
+    text-align: left;
+}
+
+.right-column footer a {}
+
 img.emoji {
     height: 0.8em;
 }
@@ -418,6 +402,10 @@ img.emoji {
     padding: 5px 15px;
 }
 
+.no-sidebar section:last-of-type {
+    margin-bottom: 10px;
+}
+
 .no-sidebar section.shell {
     background: none;
     box-shadow: none;
@@ -596,7 +584,7 @@ fieldset legend {
 form.inline {
     padding: 0;
     margin: 0;
-    display:inline;
+    display: inline;
 }
 
 div.follow-profile {
@@ -696,7 +684,7 @@ div.follow-profile .actions a.active {
 
 form.inline-menu {
     margin: 0px;
-    display:inline;
+    display: inline;
 }
 
 form.follow {
@@ -825,6 +813,10 @@ form .clear input {
     width: 32px;
 }
 
+.right-column form.compose .buttons {
+    margin-bottom: 20px;
+}
+
 .right-column form.compose input,
 .right-column form.compose textarea {
     margin: 0 0 10px 0;
@@ -1600,19 +1592,6 @@ form .post {
         margin: 20px auto 20px auto;
     }
 
-    body:not(.no-sidebar) footer {
-        right: 0;
-    }
-
-    body:not(.no-sidebar) footer a {
-        display: block;
-        border: 0;
-    }
-
-    body:not(.no-sidebar) header .logo {
-        border-radius: 0;
-    }
-
     .post .attachments a.image img {
         max-height: 300px;
     }
@@ -1666,7 +1645,7 @@ form .post {
         display: none;
     }
 
-    body:not(.no-sidebar) footer {
+    .right-column footer {
         display: none;
     }
 
diff --git a/templates/_footer.html b/templates/_footer.html
new file mode 100644
index 0000000..d5526d3
--- /dev/null
+++ b/templates/_footer.html
@@ -0,0 +1,7 @@
+<footer>
+    {% if config.site_about %}<a href="{% url "about" %}">About</a>{% endif %}
+    {% if config.policy_rules %}<a href="{% url "rules" %}">Server&nbsp;Rules</a>{% endif %}
+    {% if config.policy_terms %}<a href="{% url "terms" %}">Terms&nbsp;of&nbsp;Service</a>{% endif %}
+    {% if config.policy_privacy %}<a href="{% url "privacy" %}">Privacy&nbsp;Policy</a>{% endif %}
+    <a href="https://jointakahe.org">Takahē&nbsp;{{ config.version }}</a>
+</footer>
diff --git a/templates/base.html b/templates/base.html
index afec60a..a67c692 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -83,19 +83,15 @@
                     {% block right_content %}
                         {% include "activities/_menu.html" %}
                     {% endblock %}
+                    {% include "_footer.html" %}
                 </div>
             </div>
         {% endblock %}
         {% endblock %}
     </main>
 
-    <footer>
-        {% if config.site_about %}<a href="{% url "about" %}">About</a>{% endif %}
-        {% if config.policy_rules %}<a href="{% url "rules" %}">Server&nbsp;Rules</a>{% endif %}
-        {% if config.policy_terms %}<a href="{% url "terms" %}">Terms&nbsp;of&nbsp;Service</a>{% endif %}
-        {% if config.policy_privacy %}<a href="{% url "privacy" %}">Privacy&nbsp;Policy</a>{% endif %}
-        <a href="https://jointakahe.org">Takahē&nbsp;{{ config.version }}</a>
-    </footer>
+    {% block footer %}
+    {% endblock %}
 
 </body>
 </html>
diff --git a/templates/base_plain.html b/templates/base_plain.html
index e7d80fa..53d77e8 100644
--- a/templates/base_plain.html
+++ b/templates/base_plain.html
@@ -31,3 +31,7 @@
         {% endblock %}
     </div>
 {% endblock %}
+
+{% block footer %}
+    {% include "_footer.html" %}
+{% endblock %}