Improvements regarding the CMS

This release brings improvements on the way we handling previewing data in the CMS