Removed menu and used buttons instead