MOPM-7 Decompose cross.xhtml into multiple parts