Fix bug with avatar not having filename
Use a nicer name for the avatar chooser