Fixing menus more