diff --git a/public/css/index.styl b/public/css/index.styl
index 7b6aff8235..6dafe909b7 100644
--- a/public/css/index.styl
+++ b/public/css/index.styl
@@ -131,30 +131,21 @@ div.tooltip-inner {
 /* Misc
 -------------------------------------------------- */
 
-.modal
-  whitespace: normal
-
 // notification-character used only by death modal's figure, move
-.notification-character
-  float: left
-  padding: 15px
-
-.notification-message
-  display: inline-block;
-  padding-right: 1em
-  line-height: 3
+.death-modal // a .modal-body
+  margin: 10px
   
+  figure
+    float: left
+    padding: 15px
+
 #reset-modal
   z-index:1500
 #notification-area
-  position: fixed;
-  top: 0;
-  right: 0px;
-  z-index: 1061;
-
-.modal-body
-    margin: 10px
-
+  position: fixed
+  top: 0
+  right: 0px
+  z-index: 1061
 
 // TODO this is supposed to go in avatar.styl, but stylus is breaking if I even touch that file
 .profile-modal-header
diff --git a/public/js/controllers/notificationCtrl.js b/public/js/controllers/notificationCtrl.js
index ea551f8892..f6adac2d55 100644
--- a/public/js/controllers/notificationCtrl.js
+++ b/public/js/controllers/notificationCtrl.js
@@ -69,24 +69,39 @@ habitrpg.controller('NotificationCtrl',
 
     $rootScope.$watch('user.achievements.streak', function(after, before){
       if(before == undefined || after == before || after < before) return;
-      $rootScope.modals.achievements.streak = true;
+      $modal.open({
+        templateUrl: 'modals/achievements/streak.html'
+      });
     });
 
     $rootScope.$watch('user.achievements.ultimateGear', function(after, before){
       if (after === before || after !== true) return;
-      $rootScope.modals.achievements.ultimateGear = true;
+      $modal.open({
+        templateUrl: 'modals/achievements/ultimateGear.html'
+      });
     });
 
     $rootScope.$watch('user.items.pets', function(after, before){
       if(_.size(after) === _.size(before) || 
         Shared.countPets(null, after) < 90) return;
       User.user.achievements.beastMaster = true;
-      $rootScope.modals.achievements.beastMaster = true;
+      $modal.open({
+        templateUrl: 'modals/achievements/beastMaster.html'
+      });
     }, true);
 
     $rootScope.$watch('user.achievements.rebirths', function(after, before){
       if(after === before) return;
-      $rootScope.modals.achievements.rebirth = true;
+      $modal.open({
+        templateUrl: 'modals/achievements/rebirth.html'
+      });
+    });
+
+    $rootScope.$watch('user.flags.contributor', function(after, before){
+      if (after === before || after !== true) return;
+      $modal.open({
+        templateUrl: 'modals/achievements/contributor.html'
+      });
     });
 
     /*_.each(['weapon', 'head', 'chest', 'shield'], function(watched){
diff --git a/public/js/controllers/rootCtrl.js b/public/js/controllers/rootCtrl.js
index e37a4a9662..3b119b561a 100644
--- a/public/js/controllers/rootCtrl.js
+++ b/public/js/controllers/rootCtrl.js
@@ -13,8 +13,6 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
     })
     $rootScope.$on('userUpdated',initSticky);
 
-    $rootScope.modals = {};
-    $rootScope.modals.achievements = {};
     $rootScope.User = User;
     $rootScope.user = user;
     $rootScope.moment = window.moment;
diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade
index 9ea49bd5c9..6d1f1f4855 100644
--- a/views/shared/modals/achievements.jade
+++ b/views/shared/modals/achievements.jade
@@ -6,7 +6,7 @@ script(id='modals/achievements/streak.html', type='text/ng-template')
     .achievement.achievement-thermometer
     =env.t('streakerAchievement')
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false')=env.t('ok')
+    button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
 
 // Max Gear
 script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
@@ -16,10 +16,10 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
     .achievement.achievement-armor
     =env.t('gearAchievement')
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='modals.achievements.ultimateGear = false')=env.t('ok')
+    button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
 
 // Beast Master
-script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
+script(id='modals/achievements/beastMaster.html', type='text/ng-template')
   .modal-header
     h3=env.t('modalAchievement')
   .modal-body
@@ -27,7 +27,7 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
       .achievement.achievement-rat
       =env.t('beastAchievement')
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='modals.achievements.beastMaster = false')=env.t('ok')
+    button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
 
 // Contributor
 // activated by user.flags.contributor
@@ -40,7 +40,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template')
       !=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"})
       a(href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink')
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false})')=env.t('ok')
+    button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false}); $close()')=env.t('ok')
 
 //Rebirth
 script(id='modals/achievements/rebirth.html', type='text/ng-template')
@@ -50,4 +50,4 @@ script(id='modals/achievements/rebirth.html', type='text/ng-template')
     .achievement.achievement-sun
     =env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='modals.achievements.rebirth = false')=env.t('ok')
+    button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
diff --git a/views/shared/modals/death.jade b/views/shared/modals/death.jade
index ab10651370..34f58cd776 100644
--- a/views/shared/modals/death.jade
+++ b/views/shared/modals/death.jade
@@ -1,6 +1,6 @@
 //div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdropClick:false}')
 script(type='text/ng-template', id='modals/death.html')  
-  .modal-body
+  .modal-body.death-modal
     .row
       .col-md-3
         figure.notification-character