added template tags and views and models