Reverting merge of Menu Screen
Revert "Menu changes."

This reverts commit 64695d0f6ce7283929d15406d19995c5c92bf479.