changed imageLoading, updated indicator logic