Template and start.xhtml updated