Make the shop menu work better