Fixed return to menu after menu selection