BUGFIX: uploaded avatar aren't cropped
Add back the choices, change the separator options