Load indicator and error handling added