Add spinner, cleanup

Get the spinner working.