diff --git a/src/app/pets.coffee b/src/app/pets.coffee
index a7860ea057..be28677275 100644
--- a/src/app/pets.coffee
+++ b/src/app/pets.coffee
@@ -13,7 +13,6 @@ module.exports.app = (appExports, model) ->
     egg = randomProp pets
 
     user.push 'items.eggs', egg.name
-    user.set 'items.egg', egg
 
     # do drops enabled stuff
     $('#dropsEnabled-modal').show()
diff --git a/views/app/avatar.html b/views/app/avatar.html
index 87c08073ff..46b381f7d1 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -5,7 +5,9 @@
                 <ul class="nav nav-tabs">
                     <li class="active"><a data-toggle='tab' href="#profileCustomize">Avatar</a></li>
                     <li><a data-toggle='tab' href="#profileEdit">Profile</a></li>
-                    <li><a data-toggle='tab' href="#profileInventory">Inventory</a></li>
+                    {#if _user.flags.dropsEnabled}
+                        <li><a data-toggle='tab' href="#profileInventory">Inventory</a></li>
+                    {/if}
                 </ul>
 
                 <div class="tab-content">
@@ -181,11 +183,19 @@
 <inventory:>
     <div class='row-fluid'>
         <div class='span6 well'>
-            {#if not(_user.items.meats)}
-                <p>You don't have any meat yet.</p>
+            <h3>Food</h3>
+            {#if not(_user.items.food)}
+                <p>You don't have any food yet.</p>
             {/if}
-            {#each _user.items.meats as :meat}
-                {:meat}
+            {#each _user.items.food as :food}
+                {:food}
+            {/each}
+            <h3>Eggs</h3>
+            {#if not(_user.items.eggs)}
+                <p>You don't have any eggs yet.</p>
+            {/if}
+            {#each _user.items.eggs as :egg}
+                {:egg}
             {/each}
         </div>
     </div>
diff --git a/views/app/pets.html b/views/app/pets.html
index 8a1451160a..15b4d63814 100644
--- a/views/app/pets.html
+++ b/views/app/pets.html
@@ -2,7 +2,7 @@
   <app:modals:modal modalId='dropsEnabled-modal' header="Drops Enabled!">
     <app:userTokens/>
     <p>You've unlocked the drop system.</p>
-    <p>Here's your first egg! {_user.items.egg.name}</p>
+    <p>Here's your first egg! {_user.items.eggs.0}</p>
     <p>Feed it some meat to get it to hatch.</p>
     <@footer>
       <button data-dismiss="modal" class="btn btn-success">Ok</button>