Improve macro overrides dialog.

Dialog now uses a table for layout. This also bypasses the dialog call in the event no overrides are needed.