buttons: workding fixup

moved the buttons to the individual forms so the base is freed up to use elsewhere

refs #13899