Add new spinner and clean up load screen code