Cleaned up UI for error handling