Few changed in templates and avatars