Fixed the spinner and made a few more improvements