Daily Build

* Making the filters work
* Adding image of each template for display view
Misc Changes