Minor bugfixes of GUI