rework the avatar chooser