Bug fixes

Minor GUI bugfixes