Got rid of child element templates. Fixed so final markup is valid HTML (no orc-layouts- elements). General cleanup.