added CMS url logic
Merge branch 'origin/jon'
updated views not yet done