adding filters and sorting to display

also a little bit of cleanup