Updated avatar select dialog (part 2)