Menu changes and store switch fix