Change layout for EV
Implementation interaction with new UI
Fixed #13