Bill targets E-bikes, scooters