Control bar updates

Fixed a number of issues around the control bar