Basic ui change
Merge branch 'master' into filter
Basic filtering works
Fixed merge conflicts
Merge pull request #20 from datboitom/filter

Filter