Improve navigation on main menu