Changed menu options, beginning work on shop controller and models