Added avatar selection (incomplete)