Some bug fixes to the GUI