The Swarm: Bug fixes for menu navigation

fixed bugs in menus made changes to make navigation feel better