Added loading and error indicators