Minor Bug fixes to the GUI changes.