better organization of XML_Layout
more phrase tests