GUI Work
bugfixes