I've attached query.patch, which does the cosmetic and layout changes, and adds a couple Mac-specific things. I've added the inline error message widget but don't use it yet (as this will involve changes to the subclasses and the tests, given errors will show up when the dialog is running, not after).

Given I'm a bit rusty at this, would appreciate if someone could check this out and make sure I did things correctly. :-)