diff --git a/static/css/style.css b/static/css/style.css
index 6876156..93672c0 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -225,3 +225,35 @@ form input[type=submit] {
 form input[type=submit]:hover {
     background: var(--color-button-main-hover);
 }
+
+/* Identities */
+
+h1.identity {
+    margin: 0 0 20px 0;
+}
+
+h1.identity .icon {
+    width: 80px;
+    height: 80px;
+    float: left;
+    margin: 0 20px 0 0;
+}
+
+h1.identity small {
+    display: block;
+    font-size: 80%;
+    font-weight: normal;
+    color: var(--color-text-dull);
+    margin: -10px 0 0 0;
+}
+
+.system-note {
+    background: var(--color-bg2);
+    color: var(--color-text-dull);
+    border-radius: 3px;
+    padding: 5px 8px;
+}
+
+.system-note a {
+    color: inherit;
+}
diff --git a/templates/base.html b/templates/base.html
index 79a5e87..4dc62ca 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -17,7 +17,7 @@
         <menu>
             <li>
                 {% if user.is_authenticated %}
-                    {{ user.email }}
+                    Logout
                 {% else %}
                     <a href="/auth/login/">Login</a>
                 {% endif %}
diff --git a/templates/identity/view.html b/templates/identity/view.html
index f0a8a02..68bb7a3 100644
--- a/templates/identity/view.html
+++ b/templates/identity/view.html
@@ -3,7 +3,19 @@
 {% block title %}{{ identity }}{% endblock %}
 
 {% block content %}
-    <h1>{{ identity }} <small>{{ identity.handle }}</small></h1>
+    <h1 class="identity">
+        {% if identity.icon_uri %}
+            <img src="{{identity.icon_uri}}" class="icon">
+        {% endif %}
+        {{ identity }} <small>{{ identity.handle }}</small>
+    </h1>
+
+    {% if not identity.local %}
+        <p class="system-note">
+            This user is a member of another server.
+            <a href="{{ identity.profile_uri }}">See their original profile</a>
+        </p>
+    {% endif %}
 
     {% for status in statuses %}
         {% include "statuses/_status.html" %}