Spinner added
Fixed merge conflicts