[OE-3365] Moved dialog close button into the dialog container