added some views, worked on templates