Improved navigation between game and menu