Updates to spaces to remove reference to LeafView (in progress)