minore message box rearrangements