Finish up ContainerFilterMenu and ItemFilterMenu
* Move FilterType to its own class
* FilterType now has 2 public enums (ITEM/CONTAINER)