The baby gate is an excellent idea and something we used when we had kittens here and also our Lab Casey. We bought a $10 baby gate and cut a cat sized hole in it.

Also, I put cat doors on some of my doors when Casey was still with us so the cats could go in but the dog could not. Don't know if this is an option since this isn't your home but you could try it.

It is pretty fun to watch dogs and cats learn to live together. And, it is definitely a learning process.

We still need some photos of Ed.
Pretty, pretty, pleaaaaassssssssseeeeeee.