Make loading indicator more user friendly

Supports #281