Fixup: fix the main GUI