Added loading icon and error messages