Complete the login feature

src/jade/includes/_header.jade

@@ -12,7 +12,9 @@
 
     .addthis_sharing_toolbox
     .divider.bottom
-        .login: a(href="/login") Login
+        .login
+            span.name
+            a(href="/login") Login
 
     .navBar
         a(data-page="home", href="/")

src/jade/templates/login_page.jade

@@ -6,7 +6,7 @@
 //-
 
 .view__login_page
-    .two-thirds-content.hideable.service-up
+    .two-thirds-content.hideable.ready-to-login
         img.float-right(src="/images/github-login-large.png")
         h1 Login with GitHub
         p.
@@ -29,10 +29,35 @@
 
         .clear
 
-    .two-thirds-content.hideable.hidden.service-down
+    .two-thirds-content.hideable.hidden.server-down
         h1 Sorry!
         p.
             Our interactive editing service is down right now, but you can always submit a pull request over at
             the <a href="https://github.com/andrewminer/crafting-guide">Crafting Guide GitHub Repository</a>. We'll have
             the editing service back up soon!
 
+    .two-thirds-content.hideable.hidden.invalid-callback
+        img.float-right(src="/images/github-login-large.png")
+        h1 Oops!
+        p.
+            Sorry about that, but it looks like something went wrong with your GitHub login. Click the button below to
+            try again, or use the Feedback button on the left to let us know, and we'll try to help.
+
+        .actions
+            button.huge Login with GitHub
+
+        .clear
+
+    .two-thirds-content.hideable.hidden.fetching-token
+        img.float-right(src="/images/github-login-large.png")
+        h1 Completing log in...
+        p.
+            Hang on just a second while we finish logging you in...
+
+        .clear
+
+    .two-thirds-content.hideable.hidden.logged-in
+        img.float-right(src="/images/github-login-large.png")
+        h1 All set!
+
+        .clear