Split up seeking and waiting styles. Updated loading spinner to use them

Made a few updates and finished off #1225 by updating the loading spinner. Can you check if these changes still meet your needs? If they do, accept this pull request and it will be added to your pull request.