Less specific button selectors

Leave presentation details out of "button in a flyout" and edit submit
actions.  Also move all the buttons in flyouts in one place.

All tests with this still pass on ee-flow!

Change-Id: Idf3ecb5e5e2f2dcd89c6cee04599195cffd0ec84