Tidy up dialog boxes with new UI