Enhanced GUI/Bug Fixes