Bugfixes to the menu
fix