diff --git a/views/options/achievements.html b/views/options/achievements.html
deleted file mode 100644
index c93e2f01e5..0000000000
--- a/views/options/achievements.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<achievements:>
-    <div class='achievements-container'>
-        <!--<div class='achievement achievement-sword'></div>-->
-        <!--<div class='achievement achievement-tree'></div>-->
-        <!--<div class='achievement achievement-comment'></div>-->
-        <!--<div class='achievement achievement-cave'></div>-->
-        <!--<div class='achievement achievement-sun'></div>-->
-        <!--<div class='achievement achievement-boot'></div>-->
-        <!--<div class='achievement achievement-coffin'></div>-->
-        <!--<div class='achievement achievement-alien'></div>-->
-        <!--<div class='achievement achievement-ninja'></div>-->
-        <!--<div class='achievement achievement-cactus'></div>-->
-        <!--<div class='achievement achievement-bow'></div>-->
-        <!--<div class='achievement achievement-shield'></div>-->
-        <!--<div class='achievement achievement-karaoke'></div>-->
-
-        <app:avatar:achievement unlocked={{@profile.backer.npc}} classes='achievement-helm' unlockable=false profile={{@profile}}>
-            <h5><span class='label label-success'>{{@profile.backer.npc}} NPC</span></h5>
-            <small>Backed the Kickstarter project at the maximum level!</small>
-        </app:avatar:achievement>
-
-        <app:avatar:achievement unlocked={{@profile.backer.contributor}} classes='achievement-firefox' unlockable=true profile={{@profile}}>
-            <h5>
-                {{#if @profile.backer.contributor}}
-                <span class='label label-inverse'>{{@profile.backer.contributor}}</span>
-                {{else}}
-                <span class='label'>Contributor</span>
-                {{/}}
-            </h5>
-            <small>Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :)</small>
-        </app:avatar:achievement>
-
-        <app:avatar:achievement unlocked={{@profile.backer.tier}} classes='achievement-heart' unlockable=false profile={{@profile}}>
-            <h5>Kickstarter Backer - ${{@profile.backer.tier}} Tier</h5>
-            <small>Backed the Kickstarter Project</small>
-        </app:avatar:achievement>
-
-        <app:avatar:achievement unlocked={@profile.achievements.streak} classes='achievement-thermometer' unlockable=true profile={@profile}>
-            <h5>{#if @profile.achievements.streak}{@profile.achievements.streak}{else}0{/} Streak Achievement(s)</h5>
-            <small>Has performed {#if @profile.achievements.streak}{@profile.achievements.streak}{else}0{/} 21-day streaks on Dailies</small>
-        </app:avatar:achievement>
-
-        <app:avatar:achievement unlocked={@profile.achievements.originalUser} classes='achievement-cake' unlockable=false profile={@profile}>
-            <h5>Original User</h5>
-            <small>Goes way back to the Habit's days of yore (bless them for soldiering through bugs!)</small>
-        </app:avatar:achievement>
-
-        <app:avatar:achievement unlocked={@profile.achievements.ultimateGear} classes='achievement-armor' unlockable=true profile={@profile}>
-            <h5>Ultimate Gear</h5>
-            <small>Has upgraded to the maximum weapon and armor set</small>
-        </app:avatar:achievement>
-
-        <app:avatar:achievement unlocked={@profile.achievements.beastMaster} classes='achievement-rat' unlockable=true profile={@profile}>
-            <h5>Beast Master</h5>
-            <small>Has found all 90 pets (insanely difficult, give this user props!)</small>
-        </app:avatar:achievement>
-
-        <app:avatar:achievement unlocked={@profile.achievements.helpedHabit} classes='achievement-tree' unlockable=true profile={@profile}>
-            <h5>Helped Habit Grow</h5>
-            <small>Has helped HabitRPG grow by filling out <a href="http://community.habitrpg.com/node/290" target="_blank">this survey.</a></small>
-        </app:avatar:achievement>
-
-    </div>
-
-    <achievement: nonvoid>
-        {#if @unlocked}
-        <div class='achievement {{@classes}}'></div>{@content}
-        <hr/>
-        {else if @unlockable} <!-- only show silhouettes on own tab -->
-        {{#if equal(_user.id,@profile.id)}}
-            <span class='muted'>
-            {@content}
-            </span>
-        <hr/>
-        {{/}}
-        {/}
-
diff --git a/views/options/index.jade b/views/options/index.jade
index fec523470a..f7653558f3 100644
--- a/views/options/index.jade
+++ b/views/options/index.jade
@@ -43,7 +43,8 @@
       tab-heading
         i.icon-certificate
         | Achievements
-      app:avatar:achievements(profile='{{_user}}')
+      div(ng-controller='UserAvatarCtrl')
+        include ../shared/profiles/achievements
 
     // <li><a data-toggle='tab' data-target="#profile-challenges" id='profile-challenges-tab-link' ><i class='icon-bullhorn'></i> Challenges</a></li>
     // app:challenges:main
diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade
new file mode 100644
index 0000000000..1d84bc9c43
--- /dev/null
+++ b/views/shared/profiles/achievements.jade
@@ -0,0 +1,70 @@
+.achievements-container
+  // <div class='achievement achievement-sword'></div>
+  // <div class='achievement achievement-tree'></div>
+  // <div class='achievement achievement-comment'></div>
+  // <div class='achievement achievement-cave'></div>
+  // <div class='achievement achievement-sun'></div>
+  // <div class='achievement achievement-boot'></div>
+  // <div class='achievement achievement-coffin'></div>
+  // <div class='achievement achievement-alien'></div>
+  // <div class='achievement achievement-ninja'></div>
+  // <div class='achievement achievement-cactus'></div>
+  // <div class='achievement achievement-bow'></div>
+  // <div class='achievement achievement-shield'></div>
+  // <div class='achievement achievement-karaoke'></div>
+
+  .achievement.achievement-helm(ng-if='profile.backer.npc')
+  div(ng-if='profile.backer.npc')
+    h5
+      span.label.label-success {{profile.backer.npc}} NPC
+    small Backed the Kickstarter project at the maximum level!
+    hr
+
+  .achievement.achievement-firefox(ng-if='profile.backer.contributor')
+  div(ng-class='{muted: !profile.backer.contributor, hidden: user.id!=profile.id}')
+    h5
+      span.label.label-inverse(ng-if='profile.backer.contributor') {{profile.backer.contributor}}
+      span.label(ng-if='!profile.backer.contributor') Contributor
+    small
+      | Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :)
+    hr
+
+  .achievement.achievement-heart(ng-if='profile.backer.tier')
+  div(ng-if='profile.backer.tier')
+    h5 Kickstarter Backer - ${{profile.backer.tier}} Tier
+    small Backed the Kickstarter Project
+    hr
+
+  .achievement.achievement-thermometer(ng-show='profile.achievements.streak')
+  div(ng-class='{muted: !profile.achievements.streak, hidden: user.id!=profile.id}')
+    h5 {{profile.achievements.streak || 0 }} Streak Achievement(s)
+    small
+      | Has performed {{profile.achievements.streak || 0 }} 21-day streaks on Dailies
+    hr
+
+  .achievement.achievement-cake(ng-if='profile.achievements.originalUser')
+  div(ng-if='profile.achievements.originalUser')
+    h5 Original User
+    small
+      | Goes way back to the Habit's days of yore (bless them for soldiering through bugs!)
+    hr
+
+  .achievement.achievement-armor(ng-show='profile.achievements.ultimateGear')
+  div(ng-class='{muted: !profile.achievements.ultimateGear, hidden: user.id!=profile.id}')
+    h5 Ultimate Gear
+    small Has upgraded to the maximum weapon and armor set
+    hr
+
+  .achievement.achievement-rat(ng-show='profile.achievements.beastMaster')
+  div(ng-class='{muted: !profile.achievements.beastMaster, hidden: user.id!=profile.id}')
+    h5 Beast Master
+    small Has found all 90 pets (insanely difficult, give this user props!)
+    hr
+
+  .achievement.achievement-tree(ng-if='profile.achievements.helpedHabit')
+  div(ng-if='profile.achievements.helpedHabit')
+    h5 Helped Habit Grow
+    small
+      | Has helped HabitRPG grow by filling out
+      a(href='http://community.habitrpg.com/node/290', target='_blank') this survey.
+    hr
\ No newline at end of file