diff --git a/app/components/main_compact_component.html.erb b/app/components/main_compact_component.html.erb
index 80161b6..67c9770 100644
--- a/app/components/main_compact_component.html.erb
+++ b/app/components/main_compact_component.html.erb
@@ -1,4 +1,4 @@
-<main class="w-full max-w-xl mx-auto pb-12 px-4 sm:px-6 lg:px-8">
+<main class="w-full max-w-xl mx-auto px-4 sm:px-6 lg:px-8">
   <div class="bg-white rounded-lg shadow px-6 sm:px-12 py-8 sm:py-12">
     <%= content %>
   </div>
diff --git a/app/components/main_simple_component.html.erb b/app/components/main_simple_component.html.erb
index beacf7b..3a5651a 100644
--- a/app/components/main_simple_component.html.erb
+++ b/app/components/main_simple_component.html.erb
@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
   <div class="md:min-h-[50vh] bg-white rounded-lg shadow px-6 sm:px-12 py-8 sm:py-12">
     <%= content %>
   </div>
diff --git a/app/components/main_with_sidenav_component.html.erb b/app/components/main_with_sidenav_component.html.erb
index 86225ff..9e5baf2 100644
--- a/app/components/main_with_sidenav_component.html.erb
+++ b/app/components/main_with_sidenav_component.html.erb
@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
   <div class="bg-white rounded-lg shadow">
     <div class="md:min-h-[50vh] divide-y divide-gray-200 lg:grid lg:grid-cols-12 lg:divide-y-0 lg:divide-x">
       <aside class="py-6 sm:py-8 lg:col-span-3">
diff --git a/app/components/main_with_tabnav_component.html.erb b/app/components/main_with_tabnav_component.html.erb
index 60884a5..eb8e46d 100644
--- a/app/components/main_with_tabnav_component.html.erb
+++ b/app/components/main_with_tabnav_component.html.erb
@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
   <div class="md:min-h-[50vh] bg-white rounded-lg shadow">
     <div class="px-6 sm:px-12 pt-2 sm:pt-4">
       <%= render partial: @tabnav_partial %>
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
new file mode 100644
index 0000000..d971bc3
--- /dev/null
+++ b/app/controllers/pages_controller.rb
@@ -0,0 +1,9 @@
+class PagesController < ApplicationController
+  def privacy
+    @current_section = :privacy
+  end
+
+  def tos
+    @current_section = :tos
+  end
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2bd3f23..4d6983f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,7 +10,7 @@
     <%= javascript_importmap_tags %>
   </head>
   <body <%= @context.present? ? "id=#{@context}" : "" %> class="h-full <%= @context == :admin ? "bg-red-500" : "bg-sky-900" %>">
-    <div class="min-h-full">
+    <div class="min-h-full flex flex-col">
       <nav data-controller="topbar">
         <div class="max-w-6xl mx-auto sm:px-6 lg:px-8">
           <div class="border-b border-gray-200/10">
@@ -96,7 +96,18 @@
         </div>
       </div>
 
-      <%= yield %>
+      <div class="flex-grow">
+        <%= yield %>
+      </div>
+
+      <% if user_signed_in? && current_user.confirmed? %>
+      <nav id="footer" class="max-w-6xl mx-auto pt-4 sm:px-6 lg:px-8">
+        <div class="flex justify-end items-center space-x-4 h-16">
+          <%= link_to "Terms", tos_page_path, class: main_nav_class(@current_section, :tos) %>
+          <%= link_to "Privacy", privacy_page_path, class: main_nav_class(@current_section, :privacy) %>
+        </div>
+      </nav>
+      <% end %>
     </div>
   </body>
 </html>
diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb
new file mode 100644
index 0000000..4096345
--- /dev/null
+++ b/app/views/pages/privacy.html.erb
@@ -0,0 +1,17 @@
+<%= render HeaderComponent.new(title: "Privacy Policy") %>
+
+<%= render MainSimpleComponent.new do %>
+  <section>
+    <%= render EditableContentComponent.new(
+      context: "privacy", key: "body", rich_text: true,
+      default: "No content yet. Please add a privacy policy.") %>
+
+    <% if current_user.is_admin? %>
+    <div class="mt-8 pt-6 border-t border-gray-200 text-right">
+      <%= render EditContentButtonComponent.new(
+        context: "privacy", key: "body", rich_text: true,
+        redirect_to: request.path) do %>Edit content<% end %>
+    </div>
+    <% end %>
+  </section>
+<% end %>
diff --git a/app/views/pages/tos.html.erb b/app/views/pages/tos.html.erb
new file mode 100644
index 0000000..cdeb6a5
--- /dev/null
+++ b/app/views/pages/tos.html.erb
@@ -0,0 +1,17 @@
+<%= render HeaderComponent.new(title: "Terms of Service") %>
+
+<%= render MainSimpleComponent.new do %>
+  <section>
+    <%= render EditableContentComponent.new(
+      context: "tos", key: "body", rich_text: true,
+      default: "No content yet. Please add your terms of service.") %>
+
+    <% if current_user.is_admin? %>
+    <div class="mt-8 pt-6 border-t border-gray-200 text-right">
+      <%= render EditContentButtonComponent.new(
+        context: "tos", key: "body", rich_text: true,
+        redirect_to: request.path) do %>Edit content<% end %>
+    </div>
+    <% end %>
+  </section>
+<% end %>
diff --git a/app/views/settings/_profile.html.erb b/app/views/settings/_profile.html.erb
index 379e34a..957daeb 100644
--- a/app/views/settings/_profile.html.erb
+++ b/app/views/settings/_profile.html.erb
@@ -34,7 +34,7 @@
     <label class="block">
       <p class="font-bold mb-1">Avatar</p>
       <p class="text-gray-500">Default profile picture</p>
-      <div class="flex items-center gap-6">
+      <div class="flex flex-col sm:flex-row items-center gap-6">
         <% if @user.avatar.attached? %>
           <p class="flex-none">
             <%= image_tag image_url_for(@user.avatar), class: "h-24 w-24 rounded-lg" %>
diff --git a/config/routes.rb b/config/routes.rb
index f55f778..548d59f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,6 +15,8 @@ Rails.application.routes.draw do
   match 'signup/:step', to: 'signup#steps', as: :signup_steps, via: [:get, :post]
   post 'signup_validate', to: 'signup#validate'
 
+  get 'privacy', to: 'pages#privacy', as: :privacy_page
+  get 'tos',     to: 'pages#tos',     as: :tos_page
 
   get "users/:username/avatars/:hash", to: "avatars#show", as: :user_avatar
 
