Fixes to store menu/small bugs thanks to help from friend :)