GUI Bugfixing