Some design additions to CMS