Add a spinner instead of flashing Loading all the time