Prepare for rework EV Pairs UI