Cleanup, added loading spinner