Bugfixes with the menu