Removed defunct viewport spawning code

Added waldo generation to actual viewport spawning code.
Removed defunct comments
Added back ViewportX naming scheme

Also added Zed ordering adjustment when adding Content