Refactored code
Added load spinner