More cleanup.
Changed the GUI-state logic a bit.