Menu updates
Merge branch 'master' of https://github.com/Poke-the-Game/Poke