cleaned up menus