Moved HV Controls to HV control widget