Improve semantics of orphaned form elements such as buttons

Contribute UX
10

Any further comments on this @jxpx777 — are we good now, does it work?