Revert "Lots of fixes to CMS"
Merge pull request #15 from OceanDev/revert-12-master

Revert "Lots of fixes to CMS"