comit
Merge branch 'styling'
finish search filter
test commit