NEW: intex.xhtml refactored