Removing menus plus fix from heroku branch