Remove spinner and message and combine into one element that can be updated
throughout the loading process
A few bug fixes