Fixing GUI and Related