reordered dialog buttons, fixed expand arrow ui state for the preview
panel.  Also colspan for the preview control row.