UI Enhancements

UI Enhancements - Error Handling