Fixes and global spinner added