City leaders come up with improvement plan for e-scooters