Few more changes on loading indicator