Added a few views and use templates