new menu + bugfixes