Make the loading indicator show correctly and data reload more quickly