Bugfixes to the menu