Some changes to how EditDialog works