Added a button to store the current item into the shop inventory, some refactoring