GUI Work, bug fixes