Update to use new user energy PV and add user energy offest PV and control editor