adding filters and sorting to display

also a little bit of cleanup
Merge branch 'master' into badams
Merge pull request #5 from brianadamsdesigns/badams

Badams
Merge branch 'master' into bbalentine