Added a swanky loading spinner
Remove forced setTimeout