Bugfixing GUI