diff --git a/src/app/party.coffee b/src/app/party.coffee
index 2c92cf873f..5da19ece64 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -166,6 +166,7 @@ module.exports.app = (appExports, model, app) ->
     return unless /\S/.test text
     chat.unshift
       id: model.id()
+      uuid: user.get('id')
       contributor: user.get('backer.contributor')
       npc: user.get('backer.npc')
       text: text
@@ -174,8 +175,8 @@ module.exports.app = (appExports, model, app) ->
     model.set(input, '')
     chat.remove 200 # keep a max messages cap
 
-  model.on 'unshift', '_party.chat', -> $('.chatroom [rel="tooltip"]').tooltip()
-  model.on 'unshift', '_tavern.chat.messages', -> $('.chatroom [rel="tooltip"]').tooltip()
+  model.on 'unshift', '_party.chat', -> $('.chat-message').tooltip()
+  model.on 'unshift', '_tavern.chat.messages', -> $('.chat-message').tooltip()
 
   appExports.partySendChat = ->
     sendChat('_party.chat', '_chatMessage')
diff --git a/src/server/store.coffee b/src/server/store.coffee
index af7f63d362..24e3b96828 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -94,6 +94,7 @@ partySystem = (store) ->
             'party',
             'profile',
             'achievements',
+            'backer',
             'preferences',
             'auth.local.username',
             'auth.facebook.displayName')
diff --git a/views/app/avatar.html b/views/app/avatar.html
index c4e6e125c9..18fafba710 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -178,16 +178,16 @@
         <!--<div class='achievement achievement-bow'></div>-->
         <!--<div class='achievement achievement-shield'></div>-->
         <!--<div class='achievement achievement-karaoke'></div>-->
-        {{#if equal(@profile.backer.tier,800)}}
-            <div class='achievement achievement-helm'></div><span class='label label-success'>NPC</span>
+        {{#if @profile.backer.npc}}
+            <div class='achievement achievement-helm'></div><span class='label label-success'>{{@profile.backer.npc}} NPC</span>
             <hr/>
         {{/}}
         {{#if @profile.backer.contributor}}
-            <div class='achievement achievement-firefox'></div><span class='label label-inverse'>Contributor</span>
+            <div class='achievement achievement-firefox'></div><span class='label label-inverse'>{{@profile.backer.contributor}}</span>
             <hr/>
         {{/}}
         {{#if @profile.backer.tier}}
-            <div class='achievement achievement-heart'></div>Kickstarter Backer (${{@profile.backer.tier}} Tier)
+            <div class='achievement achievement-heart'></div>Kickstarter Backer - ${{@profile.backer.tier}} Tier
             <hr/>
         {{/}}
         {#if @profile.achievements.streak}
diff --git a/views/app/game-pane.html b/views/app/game-pane.html
index 99a1e085a7..b3ebbb611e 100644
--- a/views/app/game-pane.html
+++ b/views/app/game-pane.html
@@ -89,7 +89,7 @@
                 <textarea x-bind='keyup:tavernMessageKeyup'>{_tavernMessage}</textarea><br/>
                 <input class=btn type=submit value=Submit />
             </form>
-            <ul class='unstyled tavern-chat chatroom'>
+            <ul class='unstyled tavern-chat'>
                 {#each _tavern.chat.messages as :message}
                     <li><app:party:chat-message message={{:message}} /></li>
                 {/}
diff --git a/views/app/party.html b/views/app/party.html
index f56158561a..25126ed950 100644
--- a/views/app/party.html
+++ b/views/app/party.html
@@ -25,7 +25,7 @@
                     <textarea>{_chatMessage}</textarea><br/>
                     <input class=btn type=submit value=Submit />
                 </form>
-               <ul class='unstyled chatroom'>
+               <ul class='unstyled'>
                {#each _party.chat as :message}
                    <li><app:party:chat-message message={{:message}} /></li>
                {/}
@@ -60,7 +60,7 @@
 <chat-message:>
     <hr/>
     <span
-        class="badge {{#if @message.contributor}}badge-inverse{{else if @message.npc}}badge-success{{/}} chat-{{@message.id}}"
+        class="label {{#if @message.npc}}label-success{{else if @message.contributor}}label-inverse{{else if equal(@message.uuid,_user.id)}}label-info{{/}} chat-message"
         rel='tooltip' title="{{@message.contributor}}{{@message.npc}}">
-        {@message.user}</span> {@message.text} - <span class='muted'>{friendlyTimestamp(@message.timestamp)}
+        {{@message.user}}</span> {{@message.text}} - <span class='muted'>{{friendlyTimestamp(@message.timestamp)}}
     </span>
\ No newline at end of file