Lots of fixes to CMS

Still left to do is segregate locales to be arbitrary number rather than right now hard coded to 4.