Index.xhtml improvements