Dialog functionality addition/changes