Added Views and Templates