Clean up searching, add new menu items.