MenuState and ShopState refactored