Rearange to new class for driver
After layout change
Update with new UI