Updated the avatar display code