An initial round of fixes to the GUI...