Brushed up the views and main template