Cleaned up the menus.