Revert "Revisions to layouts (buttons, in particular)"

This reverts commit f01e4e3b4979b74cc07a60b04a15f31d1a45bc1f.
Revert "Revert "Revisions to layouts (buttons, in particular)""

This reverts commit 184d9b70c843650a9b774964d4e9bcbe046a0227.