GUI BugFix