More fixes to the GUIs