Updated dialog, added set master, added master dialog