Refactoring
Working test JSF pages