some cleanup
playing with views
templates
a bit of details