Modified views to include template