Minor changes before moving audio controls to controller