diff --git a/infrastructure/web/public/stylesheets/custom.css b/infrastructure/web/public/stylesheets/custom.css
index 2d8a82e..bb7344e 100644
--- a/infrastructure/web/public/stylesheets/custom.css
+++ b/infrastructure/web/public/stylesheets/custom.css
@@ -69,6 +69,15 @@ text-muted {
     margin-top: -2rem
 }
 
+.action-links {
+    float: right;
+    text-align: end;
+}
+
+.action-links a {
+    display: block;
+}
+
 
 /* Reset apple form styles */
 
@@ -98,6 +107,10 @@ select:hover {
     text-align: center;
 }
 
+#login h4 {
+    margin-bottom: 6rem;
+}
+
 #login fieldset {
     display: flex;
     flex-direction: column;
diff --git a/infrastructure/web/views/error.twig b/infrastructure/web/views/error.twig
index 79bd16e..f7115a5 100644
--- a/infrastructure/web/views/error.twig
+++ b/infrastructure/web/views/error.twig
@@ -1,12 +1,9 @@
 {% extends 'layout.twig' %}
 
 {% block body %}
-    <div style="float: right; text-align: end;">
-	    <a href="/inbox/{{ address }}">
-	        ← Return to inbox</a>
-	    <br>
-        <a href="/logout">
-            Logout</a>
+    <div class="action-links">
+        <a href="/inbox/{{ address }}">← Return to inbox</a>
+        <a href="/logout">Logout</a>
     </div>
   <h1>{{message}}</h1>
   <h2>{{error.status}}</h2>
diff --git a/infrastructure/web/views/inbox.twig b/infrastructure/web/views/inbox.twig
index d0a7efb..c6beec9 100644
--- a/infrastructure/web/views/inbox.twig
+++ b/infrastructure/web/views/inbox.twig
@@ -7,11 +7,9 @@
         });
     </script>
 
-    <div style="float: right; text-align: end;">
-        <a href="/inbox/{{ address }}/delete-all">
-            Wipe Inbox</a><br>
-        <a href="/logout">
-            Logout</a>
+    <div class="action-links">
+        <a href="/inbox/{{ address }}/delete-all">Wipe Inbox</a>
+        <a href="/logout">Logout</a>
     </div>
     <h1>{{ address }}</h1>
     {% for mail in mailSummaries %}
diff --git a/infrastructure/web/views/login.twig b/infrastructure/web/views/login.twig
index ec3554b..ca8ea3d 100644
--- a/infrastructure/web/views/login.twig
+++ b/infrastructure/web/views/login.twig
@@ -2,14 +2,12 @@
 
 {% block body %}
 
-<div style="float: right; text-align: end;">
+<div class="action-links">
     <a href="/inbox/{{ example }}">Example Inbox</a>
 </div>
 <div id="login">
     <h1>Welcome!</h1>
     <h4>Here you can either create a new Inbox, or access your old one</h4>
-    <br>
-    <br>
 
     {% if userInputError %}
         <blockquote class="warning">
diff --git a/infrastructure/web/views/mail.twig b/infrastructure/web/views/mail.twig
index a7932a6..ba64f2a 100644
--- a/infrastructure/web/views/mail.twig
+++ b/infrastructure/web/views/mail.twig
@@ -2,18 +2,11 @@
 
 {% block body %}
 
-    <div style="float: right; text-align: end;">
-	    <a href="/inbox/{{ address }}">
-	        ← Return to inbox</a>
-	    <br>
-        <a href="/inbox/{{ address }}/{{ uid }}/delete">
-            Delete Email</a>
-	    <br>
-        <a href="/inbox/{{ address }}/{{ uid }}/raw" target="_blank">
-            View Raw</a>
-	    <br>
-        <a href="/logout">
-            Logout</a>
+    <div class="action-links">
+        <a href="/inbox/{{ address }}">← Return to inbox</a>
+        <a href="/inbox/{{ address }}/{{ uid }}/delete">Delete Email</a>
+        <a href="/inbox/{{ address }}/{{ uid }}/raw" target="_blank">View Raw</a>
+        <a href="/logout">Logout</a>
     </div>
     <hr>
 	<div class="mail_body" style="padding-left:10%;">