diff --git a/views/options/pets.html b/views/options/pets.html
index 494518f545..bf3b51ac21 100644
--- a/views/options/pets.html
+++ b/views/options/pets.html
@@ -1,29 +1,3 @@
-<modals:>
-
-  <app:modals:modal modalId='drops-enabled-modal' header="Drops Enabled!">
-    <p><span class="Pet_Egg_{_user.items.eggs.0.name} item-drop-icon"></span> You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item. And guess what, you just found a <strong>{_user.items.eggs.0.text} egg</strong>! {_user.items.eggs.0.notes}</p>
-    <@footer>
-      <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-    </@footer>
-  </app:modals:modal>
-
-  <app:modals:modal modalId='item-dropped-modal' header="An item has dropped!">
-    <p><span class="Pet_{_drop.type}_{_drop.name} item-drop-icon"></span>{_drop.dialog}</p>
-
-
-    <@footer>
-      <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-    </@footer>
-  </app:modals:modal>
-
-    <app:modals:modal modalId='beastmaster-achievement-modal' header="Achievement Unlocked!">
-        <p>
-            <div class='achievement achievement-rat'></div>You have earned the "Beast Master" Achievement for collecting all the pets!
-        </p>
-        <@footer>
-            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-        </@footer>
-    </app:modals:modal>
 
 <pet:>
     <td class="{#if _user.items.pets[.name]}active-pet{/}">
diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade
index 53a62d9ef4..a913128af7 100644
--- a/views/shared/modals/achievements.jade
+++ b/views/shared/modals/achievements.jade
@@ -19,5 +19,15 @@ div(modal='modals.achievements.maxGear')
   .modal-footer
     button.btn.btn-default.cancel(ng-click='modals.modals.streakAchievement = false') Cancel
 
+// Beast Master
+div(modal='modals.achievements.beastmaster')
+  .modal-header
+    h3 Achievement!
+  .modal-body
+    p
+      .achievement.achievement-rat
+      | You have earned the "Beast Master" Achievement for collecting all the pets!
+  .modal-footer
+    button.btn.btn-default.cancel(ng-click='modals.modals.beastMaster = false') Cancel
 
 
diff --git a/views/shared/modals/pets.jade b/views/shared/modals/pets.jade
new file mode 100644
index 0000000000..366ba58e50
--- /dev/null
+++ b/views/shared/modals/pets.jade
@@ -0,0 +1,21 @@
+div(modal='modals.pets.dropsEnabled')
+  .modal-header
+    h3 Drops Enabled!
+  .modal-body
+    p
+      span.item-drop-icon(ng-class='Pet_Egg_{{user.items.eggs.0.name}}')
+      | You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item. And guess what, you just found a
+      strong {{user.items.eggs.0.text}} egg
+      | ! {{user.items.eggs.0.notes}}
+  .modal-footer
+    button.btn.btn-default.cancel(ng-click='modals.pets.dropsEnabled=false') Close
+
+div(modal='modals.pets.itemDropped')
+  .modal-header
+    h3 An item has dropped!
+  .modal-body
+    p
+      span.item-drop-icon(ng-class='Pet_{{_drop.type}}_{{_drop.name}}')
+      | {{_drop.dialog}}
+  .modal-footer
+    button.btn.btn-default.cancel(ng-click='modals.pets.itemDropped=false') Close
\ No newline at end of file