Merge "Change filter options from being menu items to tabbed views. Remove unused strings."