Improve face selection UI (cheers Ben)