Refactor FilterTypes and add FilterMenu