Submenu-bugfixing