Bugfixes for menu selection