GUI Cleanup
GUI Cleanup
Improved error handling