Add more views and templates