Refactored VolumeControl