Put OK and Cancel buttons in a RowLyout.

Fixes Ok button being hidden unless you resize the settings dialog.
Also added some margins around text so it's not right against the edge
of the dialog.

(cherry picked from commit 56240925)