diff --git a/views/index.jade b/views/index.jade
index 5318422..39a5dd7 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -6,25 +6,25 @@ block content
         h1 Crafatar
         p A blazing fast API for Minecraft faces!
         .avatar-wrapper
-          .avatar.jomo
-          .avatar.jake0oo0
-          .avatar.sk89q
-          .avatar.md_5
-          .avatar.notch
-          .avatar.jeb
-          .avatar.dinnerbone.flipped
-          .avatar.ez
-          .avatar.grumm.flipped
-          .avatar.themogmimer
-          .avatar.searge
-          .avatar.xlson
-          .avatar.krisjelbring
-          .avatar.minecraftchick
-          .avatar.kappe
-          .avatar.marc
-          .avatar.mollstam
-          .avatar.evilseph
-          .avatar.thinkofdeath
+          .avatar.jomo(title="jomo's avatar")
+          .avatar.jake0oo0(title="jake0oo0's avatar")
+          .avatar.sk89q(title="sk89q's avatar")
+          .avatar.md_5(title="md_5's avatar")
+          .avatar.notch(title="notch's avatar")
+          .avatar.jeb(title="jeb's avatar")
+          .avatar.dinnerbone.flipped(title="dinnerbone's avatar")
+          .avatar.ez(title="ez's avatar")
+          .avatar.grumm.flipped(title="grumm's avatar")
+          .avatar.themogmimer(title="themogmimer's avatar")
+          .avatar.searge(title="searge's avatar")
+          .avatar.xlson(title="xlson's avatar")
+          .avatar.krisjelbring(title="krisjelbring's avatar")
+          .avatar.minecraftchick(title="minecraftchick's avatar")
+          .avatar.kappe(title="kappe's avatar")
+          .avatar.marc(title="marc's avatar")
+          .avatar.mollstam(title="mollstam's avatar")
+          .avatar.evilseph(title="evilseph's avatar")
+          .avatar.thinkofdeath(title="thinkofdeath's avatar")
 
   .container
     section(id="documentation")
@@ -35,11 +35,11 @@ block content
           a(href="#avatars")
             h3 Avatars
           | Replace
-          mark.green  id
+          mark.green  userid
           |  with a Mojang <b>UUID</b> or <b>username</b> to get the related head. All images are PNGs.
           .code
             | #{domain}/avatars/
-            mark.green id
+            mark.green userid
 
           section
             a(id="avatar-parameters" class="anchor")
@@ -65,7 +65,7 @@ block content
                     | The standard value is calculated based on the UUID (even = alex, odd = steve).<br>
                     | Usernames always default to steve.
                   td
-                    | The image to be served when the id has no skin (404).<br>
+                    | The image to be served when the userid has no skin (404).<br>
                     | Valid options are
                     a(href="/avatars/0?default=steve")  steve
                     | ,
@@ -114,16 +114,16 @@ block content
             | Crafatar also provides support for 3D renders of Minecraft skins.<br>
             | Please note that <b>this feature is currently beta</b>!<br>
             | Replace
-            mark.green  id
+            mark.green  userid
             |  with a Mojang <b>UUID</b> or <b>username</b> to get a render of the skin.
             | The <b>head</b> render type returns a render of the skin's head.
             span.code
               | #{domain}/renders/head/
-              mark.green id
+              mark.green userid
             | The <b>body</b> render returns a render of the entire skin.
             span.code
               | #{domain}/renders/body/
-              mark.green id
+              mark.green userid
 
           section
             a(id="render-parameters" class="anchor")
@@ -171,13 +171,13 @@ block content
           p
             | You can also get the full skin file of a player.<br>
             | Replace
-            mark.green  id
+            mark.green  userid
             |  with a Mojang <b>UUID</b> or <b>username</b> to get the related skin.<br>
             | The user's skin is returned, or the default image is served.<br>
             | You can use the default parameter here as well.
             span.code
               | #{domain}/skins/
-              mark.green id
+              mark.green userid
 
           section
             a(id="skin-parameters" class="anchor")
@@ -198,7 +198,7 @@ block content
                     | The standard value is calculated based on the UUID (even = alex, odd = steve).<br>
                     | Usernames always default to steve.
                   td
-                    | The image to be served when the id has no skin (404).<br>
+                    | The image to be served when the userid has no skin (404).<br>
                     | Valid options are
                     a(href="/skins/0?default=steve")  steve
                     | ,
@@ -227,12 +227,12 @@ block content
           p
             | A cape endpoint is also available to get the active cape of a user.<br>
             | Replace
-            mark.green  id
+            mark.green  userid
             |  with a Mojang <b>UUID</b> or <b>username</b> to get the related cape.<br>
             | The user's cape is returned, otherwise a 404 is thrown.<br>
             .code
               | #{domain}/skins/
-              mark.green id
+              mark.green userid
 
           section
             a(id="cape-examples", class="anchor")
@@ -322,8 +322,9 @@ block content
           a(href="#contact")
             h2 Contact
           ul
-            li You can follow us on twitter <a href="https://twitter.com/crafatar">@crafatar</a>
-            li You can <a href="https://webchat.esper.net/?channels=crafatar">join us</a> in #crafatar on irc.esper.net
+            li Follow us on twitter <a href="https://twitter.com/crafatar" target="_blank">@crafatar</a>
+            li Open an issue <a href="https://github.com/crafatar/crafatar/issues" target="_blank">on GitHub</a>
+            li <a href="https://webchat.esper.net/?channels=crafatar" target="_blank">Join us</a> in #crafatar on irc.esper.net
 
     footer
       hr
diff --git a/views/layout.jade b/views/layout.jade
index a11e745..62ef797 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -17,5 +17,5 @@ html
           .navbar-header
             a.navbar-brand(href="/") Crafatar
           .navbar-header
-            a.navbar-brand.twitter(href="https://twitter.com/Crafatar", target="_blank") crafatar
+            a.navbar-brand.twitter(href="https://twitter.com/Crafatar", target="_blank") @crafatar
     block content
\ No newline at end of file