Refactoring to tidy a little, and incidentally fixed an issue with the alternative action not correctly being updated when swapping between forms.
Putting back loading throbber that I accidentally removed..