Core changes for template and avatar & update on profile