clean up
first views and templates