diff --git a/static/main.css b/static/main.css
index 756d391..1f57bbb 100644
--- a/static/main.css
+++ b/static/main.css
@@ -128,7 +128,7 @@ header .aligned {
 }
 
 header .spacer {
-    height: 30px;
+    height: 32px;
     visibility: hidden;
 }
 
@@ -147,10 +147,14 @@ footer ul li:not(:last-child):after {
 }
 
 #corp-masthead {
-    height: 30px;
+    height: 32px;
     margin-right: 0.25em;
 }
 
+#character-portrait {
+    height: 32px;
+}
+
 #flashes {
     margin-top: 0.5em;
 }
@@ -177,6 +181,7 @@ footer ul li:not(:last-child):after {
 
 #login-button {
     height: 30px;
+    padding-bottom: 2px;
 }
 
 #logout-form {
diff --git a/templates/_base.mako b/templates/_base.mako
index fcb00c2..4c1bdfe 100644
--- a/templates/_base.mako
+++ b/templates/_base.mako
@@ -30,7 +30,7 @@
                     </div>
                     <div class="right">
                         <%block name="righthead">
-                            <img class="spacer aligned" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="/>
+                            <img class="spacer aligned" alt="" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="/>
                         </%block>
                     </div>
                 </div>
diff --git a/templates/_default.mako b/templates/_default.mako
index d971cbd..1c4cc75 100644
--- a/templates/_default.mako
+++ b/templates/_default.mako
@@ -6,6 +6,8 @@
     </nav>
 </%block>
 <%block name="righthead">
-    PLAYER_NAME... [logout]  <!-- use GET /logout here and JS switch it to a POST form -->
+    <img id="character-portrait" class="aligned" title="${g.auth.get_character_prop('name')}" alt="" src="${g.eve.image.character(g.auth.get_character_id(), 256)}"/>
+    ${g.auth.get_character_prop("name")}
+    [<a title="Log out" href="${url_for('logout')}">logout</a>]  <!-- JS switch to a POST form -->
 </%block>
 ${next.body()}
diff --git a/templates/home.mako b/templates/home.mako
index ff548be..06bedeb 100644
--- a/templates/home.mako
+++ b/templates/home.mako
@@ -1,7 +1,2 @@
 <%inherit file="_default.mako"/>
-<div id="welcome">
-    <p><em>Hi, ${g.auth.get_character_prop("name")}!</em></p>
-    % for paragraph in g.config.get("welcome").split("\n\n"):
-        <p>${paragraph.replace("\n", " ")}</p>
-    % endfor
-</div>
+<p>Hi, ${g.auth.get_character_prop("name")}!</p>