Added FilterView and CategorySelectionView