Small template view changes