Upgrading controller

Add most of the menu control to the controller