GUI Changes, bug fixes
Merging