diff --git a/public/js/app.js b/public/js/app.js
index f51f5a646f..fb2bfca9a9 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -39,8 +39,7 @@ window.habitrpg = angular.module('habitrpg',
         .when('/options/profile', '/options/profile/avatar')
         .when('/options/groups', '/options/groups/tavern')
         .when('/options/groups/guilds', '/options/groups/guilds/public')
-        .when('/options/inventory', '/options/inventory/inventory')
-        .when('/options/inventory/stable', '/options/inventory/stable/pets')
+        .when('/options/inventory', '/options/inventory/drops')
         .when('/options/settings', '/options/settings/settings')
 
         // redirect states that don't match
@@ -149,21 +148,21 @@ window.habitrpg = angular.module('habitrpg',
           templateUrl: "partials/options.inventory.html",
           controller: 'InventoryCtrl'
         })
-        .state('options.inventory.inventory', {
-          url: '/inventory',
-          templateUrl: "partials/options.inventory.inventory.html"
+        .state('options.inventory.drops', {
+          url: '/drops',
+          templateUrl: "partials/options.inventory.drops.html"
         })
-        .state('options.inventory.stable', {
-          url: '/stable',
-          templateUrl: "partials/options.inventory.stable.html"
-        })
-        .state('options.inventory.stable.pets', {
+        .state('options.inventory.pets', {
           url: '/pets',
-          templateUrl: "partials/options.inventory.stable.pets.html"
+          templateUrl: "partials/options.inventory.pets.html"
         })
-        .state('options.inventory.stable.mounts', {
+        .state('options.inventory.mounts', {
           url: '/mounts',
-          templateUrl: "partials/options.inventory.stable.mounts.html"
+          templateUrl: "partials/options.inventory.mounts.html"
+        })
+        .state('options.inventory.equipment', {
+          url: '/equipment',
+          templateUrl: "partials/options.inventory.equipment.html"
         })
 
         // Options > Settings
diff --git a/views/options/inventory/index.jade b/views/options/inventory/index.jade
index ff6a64a84d..26787c48b4 100644
--- a/views/options/inventory/index.jade
+++ b/views/options/inventory/index.jade
@@ -3,12 +3,18 @@ include ./stable
 
 script(type='text/ng-template', id='partials/options.inventory.html')
   ul.nav.nav-tabs
-    li(ng-class="{ active: $state.includes('options.inventory.inventory') }")
-      a(ui-sref='options.inventory.inventory')
-        | Inventory
-    li(ng-class="{ active: $state.includes('options.inventory.stable') }")
-      a(ui-sref='options.inventory.stable')
-        | Stable
+    li(ng-class="{ active: $state.includes('options.inventory.drops') }")
+      a(ui-sref='options.inventory.drops')
+        | Drops
+    li(ng-class="{ active: $state.includes('options.inventory.pets') }")
+      a(ui-sref='options.inventory.pets')
+        | Pets
+    li(ng-class="{ active: $state.includes('options.inventory.mounts') }")
+      a(ui-sref='options.inventory.mounts')
+        | Mounts
+    li(ng-class="{ active: $state.includes('options.inventory.equipment') }")
+      a(ui-sref='options.inventory.equipment')
+        | Equipment
 
   .tab-content
     .tab-pane.active
diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade
index 4461e21a25..e8b59e9d55 100644
--- a/views/options/inventory/inventory.jade
+++ b/views/options/inventory/inventory.jade
@@ -1,4 +1,21 @@
-script(type='text/ng-template', id='partials/options.inventory.inventory.html')
+script(type='text/ng-template', id='partials/options.inventory.equipment.html')
+  .row-fluid
+  .span6.border-right
+    li.customize-menu.inventory-gear
+      menu.pets-menu(label='{{label}}', ng-repeat='(klass,label) in {base:"Base", warrior:"Warrior", wizard:"Wizard", rogue:"Rogue", healer:"Healer", special:"Special"}', ng-show='gear[klass]')
+        div(ng-repeat='item in gear[klass]')
+          button.customize-option(popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='user.ops.equip({params:{key:item.key}})', class='shop_{{item.key}}', ng-class='{selectableInventory: user.items.gear.equipped[item.type] == item.key}')
+  .span6
+    label.checkbox.inline
+      input(type="checkbox", ng-model="user.preferences.costume", ng-click='set({"preferences.costume":!user.preferences.costume})')
+      | Use Costume 
+      i.icon-question-sign(popover="Show something different on your avatar than the gear you have equipped for battle", popover-trigger='mouseenter', popover-placement='right')
+    li.customize-menu(ng-if='user.preferences.costume')
+      menu.pets-menu(label='{{label}}', ng-repeat='(klass,label) in {base:"Base", warrior:"Warrior", wizard:"Wizard", rogue:"Rogue", healer:"Healer", special:"Special"}', ng-show='gear[klass]')
+        div(ng-repeat='item in gear[klass]')
+          button.customize-option(popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='user.ops.equip({params:{type:"costume", key:item.key}})', class='shop_{{item.key}}', ng-class='{selectableInventory: user.items.gear.costume[item.type] == item.key}')
+
+script(type='text/ng-template', id='partials/options.inventory.drops.html')
   .row-fluid
     .span6.border-right
       h2 Inventory
@@ -30,22 +47,6 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html')
                 .badge.badge-info.stack-count {{points}}
               //-p {{food}}
 
-        hr
-
-        h4 Gear
-        li.customize-menu.inventory-gear
-          menu.pets-menu(label='{{label}}', ng-repeat='(klass,label) in {base:"Base", warrior:"Warrior", wizard:"Wizard", rogue:"Rogue", healer:"Healer", special:"Special"}', ng-show='gear[klass]')
-            div(ng-repeat='item in gear[klass]')
-              button.customize-option(popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='user.ops.equip({params:{key:item.key}})', class='shop_{{item.key}}', ng-class='{selectableInventory: user.items.gear.equipped[item.type] == item.key}')
-        label.checkbox.inline
-          input(type="checkbox", ng-model="user.preferences.costume", ng-click='set({"preferences.costume":!user.preferences.costume})')
-          | Use Costume 
-          i.icon-question-sign(popover="Show something different on your avatar than the gear you have equipped for battle", popover-trigger='mouseenter', popover-placement='right')
-        li.customize-menu(ng-if='user.preferences.costume')
-          menu.pets-menu(label='{{label}}', ng-repeat='(klass,label) in {base:"Base", warrior:"Warrior", wizard:"Wizard", rogue:"Rogue", healer:"Healer", special:"Special"}', ng-show='gear[klass]')
-            div(ng-repeat='item in gear[klass]')
-              button.customize-option(popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='user.ops.equip({params:{type:"costume", key:item.key}})', class='shop_{{item.key}}', ng-class='{selectableInventory: user.items.gear.costume[item.type] == item.key}')
-
     .span6
       h2 Market
       .row-fluid
diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade
index e706713c63..e068bdd0ea 100644
--- a/views/options/inventory/stable.jade
+++ b/views/options/inventory/stable.jade
@@ -1,16 +1,4 @@
-script(type='text/ng-template', id='partials/options.inventory.stable.html')
-  ul.nav.nav-tabs
-    li(ng-class="{ active: $state.includes('options.inventory.stable.pets') }")
-      a(ui-sref='options.inventory.stable.pets')
-        | Pets
-    li(ng-class="{ active: $state.includes('options.inventory.stable.mounts') }")
-      a(ui-sref='options.inventory.stable.mounts')
-        | Mounts
-  .tab-content
-    .tab-pane.active
-      div(ui-view)
-
-script(type='text/ng-template', id='partials/options.inventory.stable.mounts.html')
+script(type='text/ng-template', id='partials/options.inventory.mounts.html')
   .stable
     table(style='width:100%')
       tr
@@ -42,7 +30,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.mounts.htm
         button(ng-if='user.items.mounts["LionCub-Ethereal"]', class="pet-button Mount_Head_LionCub-Ethereal", ng-class='{active: user.items.currentMount == "LionCub-Ethereal"}', ng-click='chooseMount("LionCub", "Ethereal")', popover='Ethereal Lion', popover-trigger='mouseenter', popover-placement='bottom')
           //.Mount_Head_LionCub-Ethereal
 
-script(type='text/ng-template', id='partials/options.inventory.stable.pets.html')
+script(type='text/ng-template', id='partials/options.inventory.pets.html')
   .stable
     table(style='width:100%')
       tr