Remove heading from dialog and ensure controls are initiated when dialog is set to modal