Added views, templates