UI Changes

Switch volume control and search so all buttons are more like a group