Refactoring
Fixing bug
Fixing showing/hiding the spinner