Menu + bugfixing