Removed menu controller and put logic into main controller