CODE: Minor tidying up of GUI code.