Update UI Controls

Bug fixes to the UI controls