diff --git a/maps/static/maps/css/app.scss b/maps/static/maps/css/app.scss
index 8cae265..d0b7912 100644
--- a/maps/static/maps/css/app.scss
+++ b/maps/static/maps/css/app.scss
@@ -66,6 +66,14 @@ select.multiple {
 }
 
 @media (min-width: 60rem) {
+  .menu li:last-child {
+    &.menu__submenu-wrapper .menu__submenu {
+      min-width: unset;
+      right: 0;
+      width: auto;
+    }
+  }
+
   @supports (display:grid) {
     .my-profiles .cards {
       grid-template-columns: repeat(2, 1fr);
@@ -132,3 +140,47 @@ select.multiple {
 .card__role + .card__role {
   margin-top: rem(9);
 }
+
+.box {
+  border: dashed rem(1) var(--grey-500);
+  padding: var(--gutter);
+}
+
+.account {
+  background: $off-white;
+
+  .page-header {
+    padding-bottom: rem(50);
+    position: relative;
+    z-index: 0;
+
+    @include breakpoint-up(md) {
+      padding-bottom: rem(65);
+    }
+  }
+
+  .stack,
+  .page-header {
+    @include breakpoint-up(md) {
+      margin-left: auto;
+      margin-right: auto;
+      width: 50%;
+    }
+  }
+}
+
+.input-group + .buttons {
+  margin-top: 1.5rem;
+}
+
+.buttons .button + .button {
+  margin-top: 1.5rem;
+}
+
+.radio label.primary {
+  font-weight: $font-weight-bold;
+
+  .badge {
+    font-weight: $font-weight-normal;
+  }
+}
diff --git a/maps/templates/maps/account_settings.html b/maps/templates/maps/account_settings.html
new file mode 100644
index 0000000..c93d71e
--- /dev/null
+++ b/maps/templates/maps/account_settings.html
@@ -0,0 +1,22 @@
+{% extends 'maps/base.html' %}
+{% load static %}
+{% load i18n %}
+{% block bodyclass %}account{% endblock %}
+{% block content %}
+    <div class="page-header">
+        <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
+        <h1>{% trans 'Account settings' %}</h1>
+    </div>
+    <div class="stack">
+        <p><strong>{% trans 'Email' %}</strong></p>
+        <div class="box">
+            {{ user.email }}<br />
+            <a href="{% url 'account_email' %}">{% trans 'Manage email addresses' %}</a>
+        </div>
+        <p><strong>{% trans 'Password' %}</strong></p>
+        <div class="box">
+            *******<br />
+            <a href="{% url 'account_change_password' %}">{% trans 'Change password' %}</a>
+        </div>
+    </div>
+{% endblock %}
diff --git a/maps/templates/maps/base.html b/maps/templates/maps/base.html
index 26ade56..5c1f4ee 100644
--- a/maps/templates/maps/base.html
+++ b/maps/templates/maps/base.html
@@ -20,10 +20,11 @@
   <div class="wrap container" role="document">
     <div class="content">
       <main>
-{% block content %}{% endblock %}
+      {% block content %}{% endblock %}
       </main>
     </div>
   </div>
 {% include 'maps/footer.html' %}
+{% block extra_body %}{% endblock %}
 </body>
 </html>
diff --git a/maps/templates/maps/header.html b/maps/templates/maps/header.html
index 98c69a0..c1ddb89 100644
--- a/maps/templates/maps/header.html
+++ b/maps/templates/maps/header.html
@@ -1,4 +1,5 @@
 {% load static %}
+{% load i18n %}
 {% url 'index' as home_url %}
   <div class="banner-pattern"></div>
   <header role="banner">
@@ -69,16 +70,15 @@
             <li class="menu-item"><a href="{% url 'about' %}" class="menu__item">About</a></li>
             {% if user.is_authenticated %}
             <li class="menu__submenu-wrapper">
-                <a class="menu__item" href="#">Account</a>
+                <a class="menu__item" href="#">{% trans 'Account' %}</a>
                 <ul class="menu__submenu">
-                  <li class="menu-item"><a
-                      href="/accounts/logout/" class="menu__item">Log out</a>
-                  </li>
+                  <li class="menu-item"><a href="{% url 'account-settings' %}" class="menu__item">{% trans 'Account settings' %}</a></li>
+                  <li class="menu-item"><a href="/accounts/logout/" class="menu__item">{% trans 'Log out' %}</a></li>
                 </ul>
             {% else %}
 
             <li class="menu-item"><a
-                href="/accounts/login/" class="menu__item">Login / Sign up</a>
+                href="/accounts/login/" class="menu__item">{% trans 'Log in / Sign up' %}</a>
             </li>
             {% endif %}
 
diff --git a/maps/templates/maps/individual_detail.html b/maps/templates/maps/individual_detail.html
index 6ceb0ba..b7f376d 100644
--- a/maps/templates/maps/individual_detail.html
+++ b/maps/templates/maps/individual_detail.html
@@ -2,18 +2,13 @@
 {% load static %}
 {% load i18n %}
 {% load maps_extras %}
-{% block title %}{{ user.last_name|add:', '|add:user.first_name|titlify }}{% endblock %}
-{% block bodyclass %}page{% endblock %}
+{% block title %}{{ user.first_name|add:' '|add:user.last_name|titlify }}{% endblock %}
+{% block bodyclass %}profile profile--individual{% endblock %}
 {% block content %}
     <div class="page-header">
         <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
-        <h1><span class="pc-ff--sans pc-fw--normal">Platform Co-op</span><br/> Directory</h1>
+        <h1>{{ user.first_name }} {{ user.last_name }}</h1>
     </div>
-    {% if user.url %}
-    <h1><a rel="external" href="{{ user.url }}">{{ user.last_name }}, {{ user.first_name }}</a></h1>
-    {% else %}
-    <h1>{{ user.last_name }}, {{ user.first_name }}</h1>
-    {% endif %}
 
     <div class="spacer"></div>
     <span>
diff --git a/maps/templates/maps/my_profiles.html b/maps/templates/maps/my_profiles.html
index a719e09..ea09da0 100644
--- a/maps/templates/maps/my_profiles.html
+++ b/maps/templates/maps/my_profiles.html
@@ -1,28 +1,29 @@
 {% extends 'maps/base.html' %}
 {% load static %}
+{% load i18n %}
 {% load maps_extras %}
 {% block title %}{{ 'My profiles' |titlify }}{% endblock %}
 {% block bodyclass %}my-profiles{% endblock %}
 {% block content %}
     <div class="page-header">
-        <p><a class="link--breadcrumb" href="/">Home</a></p>
-        <h1>My profiles</h1>
+        <p><a class="link--breadcrumb" href="/">{% trans 'Home' %}</a></p>
+        <h1>{% trans 'My profiles' %}</h1>
     </div>
     {% if messages %}
         {% for message in messages %}
         {% include 'maps/partials/notification.html' %}
         {% endfor %}
     {% endif %}
-    <h2>Personal profile</h2>
+    <h2>{% trans 'Personal profile' %}</h2>
     {% if user.has_profile %}
     <ul class="cards">
         {% include 'maps/partials/card_individual.html' %}
     </ul>
     {% else %}
-    <p>None created.</p>
-    <p><a href="{% url 'individual-profile' %}">Create individual profile</a></p>
+    <p>{% trans 'None created.' %}</p>
+    <p><a href="{% url 'individual-profile' %}">{% trans 'Create individual profile' %}</a></p>
     {% endif %}
-    <h2>Organizational profiles</h2>
+    <h2>{% trans 'Organizational profiles' %}</h2>
     {% if user_orgs %}
     <ul class="cards">
         {% for org in user_orgs %}
@@ -30,9 +31,9 @@ <h2>Organizational profiles</h2>
         {% endfor %}
     </ul>
     <div class="spacer"></div>
-    <p><a href="{% url 'organization-profile' %}">Create another organizational profile</a></p>
+    <p><a href="{% url 'organization-profile' %}">{% trans 'Create another organizational profile' %}</a></p>
     {% else %}
-    <p>None created.</p>
-    <p><a href="{% url 'organization-profile' %}">Create organizational profile</a></p>
+    <p>{% trans 'None created.' %}</p>
+    <p><a href="{% url 'organization-profile' %}">{% trans 'Create organizational profile' %}</a></p>
     {% endif %}
 {% endblock %}
diff --git a/maps/templates/maps/profile.html b/maps/templates/maps/profile.html
deleted file mode 100644
index 4960663..0000000
--- a/maps/templates/maps/profile.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends 'maps/base.html' %}
-{% load static %}
-{% load i18n %}
-{% block bodyclass %}page{% endblock %}
-{% block content %}
-    <div class="page-header">
-        <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
-        <h1><span class="pc-ff--sans pc-fw--normal">Platform Co-op</span><br/> Directory</h1>
-    </div>
-    <div id="foo">Hello {{ user.first_name }}</div>
-    <a href="{% url 'account_change_password' %}">Change password</a>
-{% endblock %}
diff --git a/maps/urls.py b/maps/urls.py
index 1a34ee4..36d5bf2 100644
--- a/maps/urls.py
+++ b/maps/urls.py
@@ -14,6 +14,7 @@
     path('organizations/<int:pk>/delete', OrganizationDelete.as_view(), name='organization-delete'),
     path('individuals/<int:user_id>', views.individual_detail, name='individual-detail'),
     path('my-profiles/', views.my_profiles, name='my-profiles'),
+    path('accounts/', views.account_settings, name='account-settings'),
     path('about/', AboutPageView.as_view(), {'title': 'About'}, name='about'),
     path('privacy-policy/', PrivacyPolicyView.as_view(), {'title': 'Privacy Policy'}, name='privacy_policy'),
     path('terms-of-service/', TermsOfServiceView.as_view(), {'title': 'Terms of Service'}, name='terms_of_service'),
diff --git a/maps/views.py b/maps/views.py
index df73538..7abf6d6 100644
--- a/maps/views.py
+++ b/maps/views.py
@@ -174,6 +174,10 @@ def my_profiles(request):
 
     return render(request, 'maps/my_profiles.html', context)
 
+# Account Seetings
+@login_required
+def account_settings(request):
+    return render(request, 'maps/account_settings.html')
 
 # Static pages
 class PrivacyPolicyView(TemplateView):
diff --git a/templates/account/account_inactive.html b/templates/account/account_inactive.html
index 3347f4f..8047267 100644
--- a/templates/account/account_inactive.html
+++ b/templates/account/account_inactive.html
@@ -1,11 +1,13 @@
 {% extends "account/base.html" %}
-
 {% load i18n %}
-
-{% block head_title %}{% trans "Account Inactive" %}{% endblock %}
+{% block title %}{% trans "Account inactive"|titlify %}{% endblock %}
 
 {% block content %}
-<h1>{% trans "Account Inactive" %}</h1>
-
-<p>{% trans "This account is inactive." %}</p>
+<div class="page-header"></div>
+    <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
+    <h1>{% trans "Account inactive" %}</h1>
+</div>
+<div class="stack">
+    <p>{% trans "This account is inactive." %}</p>
+</div>
 {% endblock %}
diff --git a/templates/account/base.html b/templates/account/base.html
index fc9aeaa..0cf9300 100644
--- a/templates/account/base.html
+++ b/templates/account/base.html
@@ -1,2 +1,3 @@
 {% extends 'maps/base.html' %}
 {% load maps_extras %}
+{% block bodyclass %}account{% endblock %}
diff --git a/templates/account/email.html b/templates/account/email.html
index 019e3e8..13e6fda 100644
--- a/templates/account/email.html
+++ b/templates/account/email.html
@@ -1,70 +1,67 @@
 {% extends "account/base.html" %}
-
 {% load i18n %}
-
-{% block head_title %}{% trans "Account" %}{% endblock %}
-
+{% block title %}{% trans "Account" %}{% endblock %}
 {% block content %}
-    <h1>{% trans "E-mail Addresses" %}</h1>
-{% if user.emailaddress_set.all %}
-<p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
-
-<form action="{% url 'account_email' %}" class="email_list" method="post">
-{% csrf_token %}
-<fieldset class="blockLabels">
-
-  {% for emailaddress in user.emailaddress_set.all %}
-<div class="ctrlHolder">
-      <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
-
-      <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
-
-{{ emailaddress.email }}
-    {% if emailaddress.verified %}
-    <span class="verified">{% trans "Verified" %}</span>
-    {% else %}
-    <span class="unverified">{% trans "Unverified" %}</span>
-    {% endif %}
-      {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
-</label>
-</div>
-  {% endfor %}
-
-<div class="buttonHolder">
-      <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
-      <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
-      <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
-</div>
-
-</fieldset>
-</form>
-
-{% else %}
-<p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p>
-
-{% endif %}
-
-
-    <h2>{% trans "Add E-mail Address" %}</h2>
-
-    <form method="post" action="{% url 'account_email' %}" class="add_email">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
-    </form>
-
+    <div class="page-header">
+      <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
+      <h1>{% trans "Email addresses" %}</h1>
+    </div>
+    <div class="stack">
+      {% if messages %}
+          {% for message in messages %}
+          {% include 'maps/partials/notification.html' %}
+          {% endfor %}
+      {% endif %}
+      {% if user.emailaddress_set.all %}
+      <p>{% trans 'The following email addresses are associated with your account:' %}</p>
+    <form action="{% url 'account_email' %}" class="email_list form" method="post">
+      {% csrf_token %}
+      <ul class="input-group radio">
+      {% for emailaddress in user.emailaddress_set.all %}
+      <li>
+        <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{%endif %} value="{{emailaddress.email}}" />
+        <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary{%endif%}">
+        {{ emailaddress.email }}
+        {% if emailaddress.verified %}
+        <span class="badge verified">{% trans "Verified" %}</span>
+        {% else %}
+        <span class="badge unverified">{% trans "Unverified" %}</span>
+        {% endif %}
+        {% if emailaddress.primary %}<span class="badge primary">{% trans "Primary" %}</span>{% endif %}
+        </label>
+      </li>
+      {% endfor %}
+      </ul>
+      <div class="buttons">
+        <button class="button" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
+        <button class="button" type="submit" name="action_send" >{% trans 'Resend Verification' %}</button>
+        <button class="button" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
+      </div>
+  </form>
+  {% else %}
+  <p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %}</p>
+  {% endif %}
+    <h2>{% trans "Add email address" %}</h2>
+  <form method="post" action="{% url 'account_email' %}" class="form add_email">
+      {% csrf_token %}
+      {{ form }}
+      <div class="spacer"></div>
+      <button class="button" name="action_add" type="submit">{% trans "Add email" %}</button>
+  </form>
 {% endblock %}
 
 
 {% block extra_body %}
 <script type="text/javascript">
 (function() {
-  var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+  var message = "{% trans 'Do you really want to remove the selected email address?' %}";
   var actions = document.getElementsByName('action_remove');
+  console.log(actions);
   if (actions.length) {
     actions[0].addEventListener("click", function(e) {
-      if (! confirm(message)) {
-        e.preventDefault();
+      e.preventDefault();
+      if (confirm(message)) {
+        e.click();
       }
     });
   }
diff --git a/templates/account/email_confirm.html b/templates/account/email_confirm.html
index 6549644..9dddb5b 100644
--- a/templates/account/email_confirm.html
+++ b/templates/account/email_confirm.html
@@ -1,36 +1,26 @@
 {% extends "account/base.html" %}
 {% load i18n %}
 {% load account %}
-
-{% block title %}{% trans "Confirm E-mail Address" %}{% endblock %}
-
+{% block title %}{% trans "Confirm email address" %}{% endblock %}
 {% block content %}
 <div class="page-header">
     <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
-    <h1>{% trans "Confirm E-mail Address" %}</h1>
+    <h1>{% trans "Confirm email address" %}</h1>
+</div>
+<div class="stack">
+    {% if confirmation %}
+    {% user_display confirmation.email_address.user as user_display %}
+        <p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that you'd like to create a Platform Co-op Directory account using the email address <strong>{{ email }}</strong>.{% endblocktrans %}</p>
+    <form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
+    {% csrf_token %}
+        <div class="spacer"></div>
+        <button id="button" type="submit" class="button">
+            <span class="button__label">{% trans "Confirm" %}</span>
+        </button>
+    </form>
+    {% else %}
+    {% url 'account_email' as email_url %}
+    <p>{% blocktrans %}This email confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new email confirmation request</a>.{% endblocktrans %}</p>
+    {% endif %}
 </div>
-
-{% if confirmation %}
-
-{% user_display confirmation.email_address.user as user_display %}
-
-    <p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that you'd like to create a Platform Co-op Directory account using the email address <strong>{{ email }}</strong>.{% endblocktrans %}</p>
-
-<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
-{% csrf_token %}
-    <div class="spacer"></div>
-    <button id="button" type="submit" class="button">
-        <span class="button__label">{% trans "Confirm" %}</span>
-    </button>
-
-</form>
-
-{% else %}
-
-{% url 'account_email' as email_url %}
-
-<p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
-
-{% endif %}
-
 {% endblock %}
diff --git a/templates/account/login.html b/templates/account/login.html
index 2931e1e..8eaf066 100644
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -1,52 +1,27 @@
 {% extends "account/base.html" %}
 {% load i18n %}
 {% load account socialaccount %}
-
-{% block title %}{% trans "Sign In" %}{% endblock %}
+{% block title %}{% trans "Log in" %}{% endblock %}
 
 {% block content %}
 <div class="page-header">
-    <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
-    <h1>{% trans "Sign In" %}</h1>
-</div>
-
-<div class="spacer"></div>
-{% get_providers as socialaccount_providers %}
-{% if socialaccount_providers %}
-<div class="blocks">
-<div class="blocks__block">
-{% endif %}
-<p>Please sign in with your email address and password</p>
-<form class="login" method="POST" action="{% url 'account_login' %}">
-    {% csrf_token %}
-    {{ form.as_p }}
-    {% if redirect_field_value %}
-        <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
-    {% endif %}
-
-    <div class="spacer"></div>
-    <button id="button" type="submit" class="button">
-        <span class="button__label">{% trans "Sign In" %}</span>
-    </button>
-</form>
-
-{% if socialaccount_providers %}
+    <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
+    <h1>{% trans "Log in" %}</h1>
 </div>
-<div class="blocks__block--divider">
-  <span>{% trans 'OR' %}
+<div class="stack">
+  <p>{% trans 'Please sign in with your email address and password.' %}</p>
+  <form class="login form" method="POST" action="{% url 'account_login' %}">
+      {% csrf_token %}
+      {{ form.as_p }}
+      {% if redirect_field_value %}
+          <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
+      {% endif %}
+      <div class="spacer"></div>
+      <button id="button" type="submit" class="button">
+          <span class="button__label">{% trans "Log in" %}</span>
+      </button>
+  </form>
+  <p><a href="{% url 'account_reset_password' %}">Lost password?</a></p>
+  <p><a href="{{ signup_url }}">Create an account</a></p>
 </div>
-<div class="blocks__block socialaccount_ballot">
-  <ul class="socialaccount_providers">
-    {% include "socialaccount/snippets/provider_list.html" with process="login" %}
-  </ul>
-</div>
-
-{% include "socialaccount/snippets/login_extra.html" %}
-</div>
-{% endif %}
-<div class="spacer"></div>
-
-    <p><a href="{% url 'account_reset_password' %}">Lost password?</a></p>
-    <p><a href="{{ signup_url }}">Create an account</a></p>
-
 {% endblock %}
diff --git a/templates/account/logout.html b/templates/account/logout.html
index bd61492..1111994 100644
--- a/templates/account/logout.html
+++ b/templates/account/logout.html
@@ -1,27 +1,24 @@
 {% extends "account/base.html" %}
 {% load i18n %}
-
+{% block bodyclass %}account{% endblock %}
 {% block title %}{% trans "Sign Out" %}{% endblock %}
 
 {% block content %}
 <div class="page-header">
-    <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
-    <h1>{% trans "Sign Out" %}</h1>
+    <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
+    <h1>{% trans "Log out" %}</h1>
 </div>
 
-<p>{% trans 'Are you sure you want to sign out?' %}</p>
-
-<form method="post" action="{% url 'account_logout' %}">
+<div class="stack">
+    <p>{% trans 'Are you sure you want to log out?' %}</p>
+    <form method="post" action="{% url 'account_logout' %}">
     {% csrf_token %}
     {% if redirect_field_value %}
         <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
     {% endif %}
-
-    <div class="spacer"></div>
     <button id="button" type="submit" class="button">
-        <span class="button__label">{% trans "Sign Out" %}</span>
+        <span class="button__label">{% trans "Log out" %}</span>
     </button>
-
-</form>
-
+    </form>
+</div>
 {% endblock %}
diff --git a/templates/account/password_change.html b/templates/account/password_change.html
index 68547d7..88ca1fe 100644
--- a/templates/account/password_change.html
+++ b/templates/account/password_change.html
@@ -1,20 +1,19 @@
 {% extends "account/base.html" %}
 {% load i18n %}
-
-{% block title %}{% trans "Change Password" %}{% endblock %}
-
+{% block title %}{% trans "Change password" %}{% endblock %}
 {% block content %}
 <div class="page-header">
-    <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
-    <h1>{% trans "Change Password" %}</h1>
+    <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
+    <h1>{% trans "Change password" %}</h1>
 </div>
-
-    <form method="POST" action="{% url 'account_change_password' %}" class="password_change">
+<div class="stack">
+    <form method="POST" action="{% url 'account_change_password' %}" class="form password_change">
         {% csrf_token %}
         {{ form.as_p }}
         <div class="spacer"></div>
         <button id="button" type="submit" class="button">
-            <span class="button__label">{% trans "Change Password" %}</span>
+            <span class="button__label">{% trans "Change password" %}</span>
         </button>
     </form>
+</div>
 {% endblock %}
diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html
index d2cfba3..7e14897 100644
--- a/templates/account/password_reset.html
+++ b/templates/account/password_reset.html
@@ -1,29 +1,26 @@
 {% extends "account/base.html" %}
 {% load i18n %}
 {% load account %}
-
-{% block title %}{% trans "Password Reset" %}{% endblock %}
+{% block title %}{% trans "Password reset" %}{% endblock %}
 
 {% block content %}
 <div class="page-header">
-    <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
-    <h1>{% trans "Password Reset" %}</h1>
+    <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
+    <h1>{% trans "Password reset" %}</h1>
 </div>
-
+<div class="stack">
     {% if user.is_authenticated %}
     {% include "account/snippets/already_logged_in.html" %}
     {% endif %}
-
     <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
-
-    <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
+    <form method="POST" action="{% url 'account_reset_password' %}" class="form password_reset">
         {% csrf_token %}
         {{ form.as_p }}
         <div class="spacer"></div>
         <button id="button" type="submit" class="button">
-            <span class="button__label">{% trans "Reset My Password" %}</span>
+            <span class="button__label">{% trans "Reset my password" %}</span>
         </button>
     </form>
-
     <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
+</div>
 {% endblock %}
diff --git a/templates/account/password_reset_done.html b/templates/account/password_reset_done.html
index c2af82f..0bdd472 100644
--- a/templates/account/password_reset_done.html
+++ b/templates/account/password_reset_done.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 <div class="page-header">
-    <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
+      <p><a class="link--breadcrumb" href="{% url 'account-settings' %}">{% trans "Account Settings" %}</a></p>
     <h1>{% trans "Password Reset" %}</h1>
 </div>
     
diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html
index b05333b..96b705e 100644
--- a/templates/account/password_reset_from_key.html
+++ b/templates/account/password_reset_from_key.html
@@ -5,7 +5,7 @@
 
 {% block content %}
 <div class="page-header">
-    <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
+      <p><a class="link--breadcrumb" href="{% url 'account-settings' %}">{% trans "Account Settings" %}</a></p>
     <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
 </div>
 
diff --git a/templates/account/password_reset_from_key_done.html b/templates/account/password_reset_from_key_done.html
index 3161e5a..4b2df4e 100644
--- a/templates/account/password_reset_from_key_done.html
+++ b/templates/account/password_reset_from_key_done.html
@@ -5,7 +5,7 @@
 
 {% block content %}
 <div class="page-header">
-    <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
+      <p><a class="link--breadcrumb" href="{% url 'account-settings' %}">{% trans "Account Settings" %}</a></p>
     <h1>{% trans "Change Password" %}</h1>
 </div>
 
diff --git a/templates/account/password_set.html b/templates/account/password_set.html
index f561572..80c4df3 100644
--- a/templates/account/password_set.html
+++ b/templates/account/password_set.html
@@ -1,15 +1,16 @@
 {% extends "account/base.html" %}
-
 {% load i18n %}
-
-{% block head_title %}{% trans "Set Password" %}{% endblock %}
-
+{% block head_title %}{% trans "Set password" %}{% endblock %}
 {% block content %}
-    <h1>{% trans "Set Password" %}</h1>
-
-    <form method="POST" action="{% url 'account_set_password' %}" class="password_set">
+<div class="page-header">
+    <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
+    <h1>{% trans "Set password" %}</h1>
+</div>
+<div class="stack">
+    <form method="POST" action="{% url 'account_set_password' %}" class="password_set form">
         {% csrf_token %}
         {{ form.as_p }}
-        <input type="submit" name="action" value="{% trans 'Set Password' %}"/>
+        <input type="submit" name="action" value="{% trans 'Set password' %}"/>
     </form>
+</div>
 {% endblock %}
diff --git a/templates/account/signup.html b/templates/account/signup.html
index 8c4d0a6..72a4f47 100644
--- a/templates/account/signup.html
+++ b/templates/account/signup.html
@@ -1,23 +1,22 @@
 {% extends "account/base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Signup" %}{% endblock %}
+{% block title %}{% trans "Sign up" %}{% endblock %}
 
 {% block content %}
 <div class="page-header">
-    <p><a class="link--inverse" href="{% url 'index' %}">Home</a></p>
-    <h1>{% trans "Sign Up" %}</h1>
+    <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans 'Home' %}</a></p>
+    <h1>{% trans "Sign up" %}</h1>
 </div>
-
+<div class="stack">
     <p>
-        Accounts on the Directory are intended for parties working in the Platform Co-operative ecosystem: actively
+        Accounts on the Directory are intended for parties working in the Platform Cooperative ecosystem: actively
         managing organization profiles, doing academic or grantmaking research, or providing services such as
         accounting, design, legal, or software development. Accounts are not required to browse the directory.
     </p>
+    <p>{% blocktrans %}Already have an account? <a href="{{ login_url }}">Sign in</a>.{% endblocktrans %}</p>
 
-<p>{% blocktrans %}Already have an account? Then just <a href="{{ login_url }}">sign in</a>{% endblocktrans %}</p>
-
-<form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
+<form class="signup form" id="signup_form" method="post" action="{% url 'account_signup' %}">
     {% csrf_token %}
     {{ form.as_p }}
     {% if redirect_field_value %}
@@ -25,8 +24,8 @@ <h1>{% trans "Sign Up" %}</h1>
     {% endif %}
     <div class="spacer"></div>
     <button id="button" type="submit" class="button">
-        <span class="button__label">{% trans "Sign Up" %}</span>
+        <span class="button__label">{% trans "Sign up" %}</span>
     </button>
 </form>
-
+</div>
 {% endblock %}
diff --git a/templates/account/signup_closed.html b/templates/account/signup_closed.html
index bc83950..d39a30c 100644
--- a/templates/account/signup_closed.html
+++ b/templates/account/signup_closed.html
@@ -2,10 +2,14 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %}
+{% block head_title %}{% trans "Sign up closed" %}{% endblock %}
 
 {% block content %}
-<h1>{% trans "Sign Up Closed" %}</h1>
-
-<p>{% trans "We are sorry, but the sign up is currently closed." %}</p>
+<div class="page-header">
+    <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans 'Home' %}</a></p>
+    <h1>{% trans "Sign up closed" %}</h1>
+</div>
+<div class="stack">
+<p>{% trans "We are sorry, but sign up is currently closed." %}</p>
+</div>
 {% endblock %}