3 files changed, 14 insertions, 9 deletions
diff --git a/templates/identity/_identity_menu.html b/templates/identity/_identity_menu.html
new file mode 100644
index 0000000..fff70cb
--- /dev/null
+++ b/templates/identity/_identity_menu.html
@@ -0,0 +1,5 @@
+<nav>
+    <a href="/identity/select/" {% if identities %}class="selected"{% endif %}>Select Identity</a>
+    <a href="/identity/create/" {% if form %}class="selected"{% endif %}>Create Identity</a>
+    <a href="/auth/logout/">Logout</a>
+</nav>
diff --git a/templates/identity/create.html b/templates/identity/create.html
index cbf0fb2..8e78e10 100644
--- a/templates/identity/create.html
+++ b/templates/identity/create.html
@@ -5,6 +5,7 @@
 {% block title %}Create Identity{% endblock %}
 
 {% block content %}
+    {% include "identity/_identity_menu.html" %}
     <section class="modal identities">
         <h1>Create Identity</h1>
         {% crispy form form.helper %}
diff --git a/templates/identity/select.html b/templates/identity/select.html
index ea4065c..d9959ab 100644
--- a/templates/identity/select.html
+++ b/templates/identity/select.html
@@ -4,17 +4,19 @@
 {% block title %}Select Identity{% endblock %}
 
 {% block content %}
-    <section class="modal identities">
-        <h1>Select Identity</h1>
+    {% include "identity/_identity_menu.html" %}
+    <section class="icon-menu">
         {% for identity in identities %}
             <a class="option" href="{{ identity.urls.activate }}">
                 {% if identity.icon_uri %}
-                    <img src="{{ identity.icon_uri }}" width="32">
+                    <img src="{{ identity.icon_uri }}">
                 {% else %}
-                    <img src="{% static "img/unknown-icon-128.png" %}" width="32">
+                    <img src="{% static "img/unknown-icon-128.png" %}">
                 {% endif %}
-                {{ identity }}
-                <small>@{{ identity.handle }}</small>
+                <span class="handle">
+                    {{ identity.name_or_handle }}
+                    <small>@{{ identity.handle }}</small>
+                </span>
             </a>
         {% empty %}
             <p class="option empty">You have no identities.</p>
@@ -22,8 +24,5 @@
         <a href="/identity/create/" class="option new">
             <i class="fa-solid fa-plus"></i> Create a new identity
         </a>
-        <a href="/auth/logout/" class="option new">
-            <i class="fa-solid fa-right-from-bracket"></i> Logout
-        </a>
     </section>
 {% endblock %}