-added filter UI
-some refactoring