Still things to fix wrt menus