Enhance waiting indicator