added more templates, forms and models