diff --git a/.gitignore b/.gitignore
index ebe50d5e0..6aefb3414 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.log
+*.swp
 .DS_Store
 .env
 .sass-cache
diff --git a/package.json b/package.json
index b62a407e2..52eb08857 100644
--- a/package.json
+++ b/package.json
@@ -48,3 +48,4 @@
     "when": "3.7.8"
   }
 }
+
diff --git a/src/client/site/common/inventory/inventory_controller.coffee b/src/client/site/common/inventory/inventory_controller.coffee
index 315e87d43..1110080b1 100644
--- a/src/client/site/common/inventory/inventory_controller.coffee
+++ b/src/client/site/common/inventory/inventory_controller.coffee
@@ -59,9 +59,9 @@ module.exports = class InventoryController extends BaseController
         @trigger c.event.change, this
 
     onFirstButtonClicked: (stackController)->
-        itemId = stackController.model?.item.id
-        tracker.trackEvent @_trackingContext, 'remove-from', itemId
-        @trigger c.event.button.first, this, itemId
+        item = stackController.model?.item
+        tracker.trackEvent @_trackingContext, 'remove-from', item.id
+        @trigger c.event.button.first, this, item
 
     onItemSelectorButtonClicked: ->
         return unless @model?
@@ -158,3 +158,4 @@ module.exports = class InventoryController extends BaseController
 
         while @_stackControllers.length > index
             @_stackControllers.pop().remove()
+
diff --git a/src/client/site/craft_page/craft_page_controller.coffee b/src/client/site/craft_page/craft_page_controller.coffee
index 59b1c4ea5..db4390b67 100644
--- a/src/client/site/craft_page/craft_page_controller.coffee
+++ b/src/client/site/craft_page/craft_page_controller.coffee
@@ -43,16 +43,15 @@ module.exports = class CraftPageController extends PageController
     onHaveInventoryChanged: ->
         @_storage.store 'crafting-plan:have', @model.have.toUrlString()
 
-    onMoveNeedToHave: (itemId)->
-        quantity = @_needInventoryController.model.getQuantity itemId
-        item = @_modPack.findItem itemId
+    onMoveNeedToHave: (item)->
+        quantity = @_needInventoryController.model.getQuantity item
         @model.have.add item, quantity
 
-    onRemoveFromHave: (itemId)->
-        @model.have.remove itemId
+    onRemoveFromHave: (item)->
+        @model.have.remove item
 
-    onRemoveFromWant: (itemId)->
-        @model.want.remove itemId
+    onRemoveFromWant: (item)->
+        @model.want.remove item
         @onWantInventoryChanged()
 
     onSampleClicked: (event)->
@@ -99,7 +98,7 @@ module.exports = class CraftPageController extends PageController
             model:           @model.want
             router:          @_router
             trackingContext: c.tracking.category.craftWant
-        @_wantInventoryController.on c.event.button.first, (controller, itemId)=> @onRemoveFromWant itemId
+        @_wantInventoryController.on c.event.button.first, (controller, item)=> @onRemoveFromWant item
 
         @_haveInventoryController = @addChild InventoryController, '.have .view__inventory',
             firstButtonType: 'down'
@@ -108,7 +107,7 @@ module.exports = class CraftPageController extends PageController
             model:           @model.have
             router:          @_router
             trackingContext: c.tracking.category.craftHave
-        @_haveInventoryController.on c.event.button.first, (controller, itemId)=> @onRemoveFromHave itemId
+        @_haveInventoryController.on c.event.button.first, (controller, item)=> @onRemoveFromHave item
 
         @_needInventoryController = @addChild InventoryController, '.need .view__inventory',
             editable:        false
@@ -118,7 +117,7 @@ module.exports = class CraftPageController extends PageController
             model:           null
             router:          @_router
             trackingContext: c.tracking.category.craftNeed
-        @_needInventoryController.on c.event.button.first, (controller, itemId)=> @onMoveNeedToHave itemId
+        @_needInventoryController.on c.event.button.first, (controller, item)=> @onMoveNeedToHave item
 
         @_workingPanelController = @addChild WorkingPanelController, '.view__working_panel', model:@model