Bugfix GUI