add isLoading and isEnd indicator