refactor loading indicators in index (ref. commit 47ba4d4)