cleaned up, moved volume into same row as mute button