Templates Edit, Users view enhance