Better handling of loading indicator