Changed views to templates