added new views
Added templates