Better filtering
Restructuring views
Clear search button added to input fields
Merge branch 'filter'