Layout and menu item fix.