created loading_indicator feature and fixed a bug