Added more views and templates