Fixed missing 'empty indicator' + Updated 'load indicator' rendering and removal