Finished plumbing in navigation order

added a cross model class for content and nav order
fixed an issue that could cause a navigation move to fail