Minor work on dialog boxes