diff --git a/app/views/components/_header.html.erb b/app/views/components/_header.html.erb
index 3e00164..edd53b3 100644
--- a/app/views/components/_header.html.erb
+++ b/app/views/components/_header.html.erb
@@ -1,5 +1,7 @@
 <header class="py-10">
   <div class="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8">
-    <h1 class="text-3xl font-bold text-white"><%= page_title %></h1>
+    <h1 class="text-3xl font-bold text-white">
+      <%= page_title %>
+    </h1>
   </div>
 </header>
diff --git a/app/views/components/_header_compact.html.erb b/app/views/components/_header_compact.html.erb
new file mode 100644
index 0000000..19ab7f1
--- /dev/null
+++ b/app/views/components/_header_compact.html.erb
@@ -0,0 +1,7 @@
+<header class="py-10">
+  <div class="max-w-xl mx-auto px-4 sm:px-6 lg:px-8">
+    <h1 class="text-3xl font-bold text-white text-center">
+      <%= page_title %>
+    </h1>
+  </div>
+</header>
diff --git a/app/views/components/_main_compact.html.erb b/app/views/components/_main_compact.html.erb
new file mode 100644
index 0000000..ee6ee2e
--- /dev/null
+++ b/app/views/components/_main_compact.html.erb
@@ -0,0 +1,5 @@
+<main class="w-full max-w-xl mx-auto pb-12 px-4 sm:px-6 lg:px-8">
+  <div class="bg-white rounded-lg shadow px-6 py-12 sm:px-12">
+    <%= yield %>
+  </div>
+</main>
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 40c840d..bb6b4a0 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,14 +1,21 @@
-<h2>Resend confirmation instructions</h2>
+<%= render partial: "components/header_compact", locals: { page_title: "Log in" } %>
 
-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
-  <p>
-    <%= f.label :email, 'Email address', class: 'block mb-1' %>
-    <%= f.email_field :email, required: true, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
-  </p>
-  <p class="mt-8">
-    <%= f.submit "Resend confirmation instructions", class: 'btn-md btn-blue' %>
-  </p>
+<%= render layout: "components/main_compact" do %>
+  <h2>Resend confirmation instructions</h2>
+
+  <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+    <%= render "devise/shared/error_messages", resource: resource %>
+    <p>
+      <%= f.label :email, 'Email address', class: 'block mb-1' %>
+      <%= f.email_field :email,
+        required: true, autofocus: true, autocomplete: "email",
+        value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email),
+        class: "w-full sm:w-4/5" %>
+    </p>
+    <p class="mt-8">
+      <%= f.submit "Resend confirmation instructions", class: 'btn-md btn-blue' %>
+    </p>
+  <% end %>
+
+  <%= render "devise/shared/links" %>
 <% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index 7419237..33f0f0d 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,27 +1,31 @@
-<h2>Change your password</h2>
+<%= render partial: "components/header_compact", locals: { page_title: "Log in" } %>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
-  <%= f.hidden_field :reset_password_token %>
+<%= render layout: "components/main_compact" do %>
+  <h2>Change your password</h2>
 
-  <p class="mb-1">
-    <%= f.label :password, "New password" %>
-  </p>
-  <p>
-    <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %>
-    <% if @minimum_password_length %>
-      <br><em class="text-sm text-gray-500">(<%= @minimum_password_length %> characters minimum)</em>
-    <% end %>
-  </p>
-  <p class="mb-1">
-    <%= f.label :password_confirmation, "Confirm new password" %>
-  </p>
-  <p>
-    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
-  </p>
-  <p class="mt-8">
-    <%= f.submit "Change my password", class: 'btn-md btn-blue' %>
-  </p>
+  <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+    <%= render "devise/shared/error_messages", resource: resource %>
+    <%= f.hidden_field :reset_password_token %>
+
+    <p class="mb-1">
+      <%= f.label :password, "New password" %>
+    </p>
+    <p>
+      <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %>
+      <% if @minimum_password_length %>
+        <br><em class="text-sm text-gray-500">(<%= @minimum_password_length %> characters minimum)</em>
+      <% end %>
+    </p>
+    <p class="mb-1">
+      <%= f.label :password_confirmation, "Confirm new password" %>
+    </p>
+    <p>
+      <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+    </p>
+    <p class="mt-8">
+      <%= f.submit "Change my password", class: 'btn-md btn-blue' %>
+    </p>
+  <% end %>
+
+  <%= render "devise/shared/links" %>
 <% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 65006f9..7d8e6cc 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,18 +1,22 @@
-<h2>Forgot your password?</h2>
+<%= render partial: "components/header_compact", locals: { page_title: "Log in" } %>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
-  <p>
-    <%= f.label :cn, 'User', class: 'block' %>
-    <%= f.text_field :cn, autofocus: true, autocomplete: "username", required: true %> @ kosmos.org
-  </p>
-  <p>
-    <%= f.label :email, 'Email address', class: 'block' %>
-    <%= f.email_field :email, autocomplete: "email", required: true %>
-  </p>
-  <p class="mt-8">
-    <%= f.submit "Send me reset password instructions", class: 'btn-md btn-blue' %>
-  </p>
+<%= render layout: "components/main_compact" do %>
+  <h2>Forgot your password?</h2>
+
+  <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+    <%= render "devise/shared/error_messages", resource: resource %>
+    <p>
+      <%= f.label :cn, 'User', class: 'block' %>
+      <%= f.text_field :cn, autofocus: true, autocomplete: "username", required: true %> @ kosmos.org
+    </p>
+    <p>
+      <%= f.label :email, 'Email address', class: 'block' %>
+      <%= f.email_field :email, autocomplete: "email", required: true %>
+    </p>
+    <p class="mt-8">
+      <%= f.submit "Send me a reset link", class: 'btn-md btn-blue' %>
+    </p>
+  <% end %>
+
+  <%= render "devise/shared/links" %>
 <% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index da446c8..73ecdac 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,18 +1,20 @@
-<h2>Log in</h2>
+<%= render partial: "components/header_compact", locals: { page_title: "Log in" } %>
 
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
-  <p>
-    <%= f.label :cn, 'User', class: 'block' %>
-    <%= f.text_field :cn, autofocus: true, autocomplete: "username" %> @ kosmos.org
-  </p>
-  <p>
-    <%= f.label :password, class: 'block' %>
-    <%= f.password_field :password, autocomplete: "current-password" %>
-  </p>
-  <p class="mt-8">
-    <%= f.submit "Log in", class: 'btn-md btn-blue' %>
-  </p>
+<%= render layout: "components/main_compact" do %>
+  <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+    <%= render "devise/shared/error_messages", resource: resource %>
+    <p>
+      <%= f.label :cn, 'User', class: 'block' %>
+      <%= f.text_field :cn, autofocus: true, autocomplete: "username" %> @ kosmos.org
+    </p>
+    <p>
+      <%= f.label :password, class: 'block' %>
+      <%= f.password_field :password, autocomplete: "current-password" %>
+    </p>
+    <p class="mt-8">
+      <%= f.submit "Log in", class: 'btn-md btn-blue' %>
+    </p>
+  <% end %>
+
+  <%= render "devise/shared/links" %>
 <% end %>
-
-<%= render "devise/shared/links" %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 047c145..51ad0f5 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -21,13 +21,13 @@
                   <%= render partial: "shared/icons/comet" %>
                   <!-- <img class="h&#45;8 w&#45;8" src="https://tailwindui.com/img/logos/workflow&#45;mark&#45;indigo&#45;500.svg" alt="Workflow"> -->
                 </div>
-                <div class="hidden md:block">
-                  <div class="ml-10 flex items-baseline space-x-4">
-                    <% if user_signed_in? && current_user.is_admin? %>
+                <% if user_signed_in? && current_user.is_admin? %>
+                  <div class="hidden md:block">
+                    <div class="ml-10 flex items-baseline space-x-4">
                       <%= render partial: 'shared/admin_nav' %>
-                    <% end %>
+                    </div>
                   </div>
-                </div>
+                <% end %>
               </div>
               <div class="hidden md:block">
                 <%= render partial: 'shared/header_account' %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 440ccd8..0a6a8a6 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,11 +21,13 @@
                   <%= render partial: "shared/icons/comet" %>
                   <!-- <img class="h&#45;8 w&#45;8" src="https://tailwindui.com/img/logos/workflow&#45;mark&#45;indigo&#45;500.svg" alt="Workflow"> -->
                 </div>
-                <div class="hidden md:block">
-                  <div class="ml-10 flex items-baseline space-x-4">
-                    <%= render partial: 'shared/main_nav' %>
+                <% if user_signed_in? && current_user.confirmed? %>
+                  <div class="hidden md:block">
+                    <div class="ml-10 flex items-baseline space-x-4">
+                      <%= render partial: 'shared/main_nav' %>
+                    </div>
                   </div>
-                </div>
+                <% end %>
               </div>
               <div class="hidden md:block">
                 <%= render partial: 'shared/header_account' %>