UI Changes + Store switch fix