To get this merged, this should be rebased against master and then revert these four line changes.  @mfalesni seemed to fix form_buttons.add() in #764 and it appears like util.flash has some issues with waiting long enough for the spinner to clear which should probably go in a separate pr.