Facelet templates updated