moving cm-layout to be just layout