Some Fixes / Loading spinner