Moved spinner in to the root window so it works on modals too
A bit of clean up