Refactored ShopState and worked a bit on upgrades