diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index 2ac4817c66..596304e553 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -516,6 +516,7 @@
               <classifier>mysql.classifier</classifier>
               <port>${mysql.port}</port>
               <socket>${mysql.socket}</socket>
+              <clearexistingdata>false</clearexistingdata>
             </configuration>
             <executions>
               <execution>
diff --git a/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java b/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
index 466d25e105..e23ebe6150 100644
--- a/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
+++ b/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
@@ -43,12 +43,13 @@ public HomePage clickResendActivationEmail() {
     }
 
     public InactiveAccountPage enterNewEmail(String email) {
-        enterText(readyElement(By.id("inactiveAccountForm:emailField:email")), email);
+        enterText(readyElement(By.id("inactiveAccountForm:email:input:email"))
+                , email);
         return new InactiveAccountPage(getDriver());
     }
 
     public HomePage clickUpdateEmail() {
-        clickElement(By.id("inactiveAccountForm:emailField:updateEmail"));
+        clickElement(By.id("inactiveAccountForm:email:input:updateEmail"));
         return new HomePage(getDriver());
     }
 }
diff --git a/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java b/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
index 9e5c81b7b9..b48dbb6cf5 100644
--- a/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
+++ b/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
@@ -49,10 +49,10 @@ public class RegisterPage extends CorePage {
     public static final String USERNAME_LENGTH_ERROR =
             "size must be between 3 and 20";
 
-    private By nameField = By.id("loginForm:name");
-    private By emailField = By.id("loginForm:emailField:email");
-    public By usernameField = By.id("loginForm:usernameField:username");
-    private By passwordField = By.id("loginForm:passwordField:password");
+    private By nameField = By.id("loginForm:nameField:input:name");
+    private By emailField = By.id("loginForm:email:input:email");
+    public By usernameField = By.id("loginForm:username:input:username");
+    private By passwordField = By.id("loginForm:passwordField:input:password");
     private By signUpButton = By.xpath("//input[@value='Sign Up']");
     private By showHideToggleButton = By.className("js-form-password-toggle");
     private By loginLink = By.linkText("Log In");
diff --git a/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java b/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
index 8f861dd874..5bd6984814 100644
--- a/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
+++ b/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
@@ -33,7 +33,7 @@
 @Slf4j
 public class ResetPasswordPage extends BasePage {
 
-    private By usernameEmailField = By.id("passwordResetRequestForm:usernameEmailField:usernameEmail");
+    private By usernameEmailField = By.id("passwordResetRequestForm:usernameEmail:input:usernameEmail");
     private By submitButton = By.id("passwordResetRequestForm:submitRequest");
 
     public ResetPasswordPage(WebDriver driver) {
diff --git a/functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java b/functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
index d2c6f9ce3b..f3f59caa3e 100644
--- a/functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
+++ b/functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
@@ -32,9 +32,9 @@
 @Slf4j
 public class EditRoleAssignmentPage extends BasePage {
 
-    private By policySelect = By.id("role-rule-form:policyNameField:policyName");
-    private By patternField = By.id("role-rule-form:identityPatternField:identityPattern");
-    private By roleSelect = By.id("role-rule-form:roleField:roles");
+    private By policySelect = By.id("role-rule-form:policyName:input:policyName");
+    private By patternField = By.id("role-rule-form:identityPattern:input:identityPattern");
+    private By roleSelect = By.id("role-rule-form:role:input:roles");
     private By saveButton = By.id("role-rule-form:save");
     private By cancelButton = By.id("role-rule-form:cancel");
 
diff --git a/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java b/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
index c70630cb6e..50f7ce1187 100644
--- a/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
+++ b/functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
@@ -38,8 +38,8 @@ public class ManageUserAccountPage extends BasePage {
 
     public static String PASSWORD_ERROR = "Passwords do not match";
 
-    private By passwordField = By.id("userdetailForm:passwordField:password");
-    private By passwordConfirmField = By.id("userdetailForm:passwordConfirmField:confirm");
+    private By passwordField = By.id("userdetailForm:password:input:password");
+    private By passwordConfirmField = By.id("userdetailForm:passwordConfirm:input:confirm");
     private By enabledField = By.id("userdetailForm:enabled");
     private By saveButton = By.id("userdetailForm:userdetailSave");
     private By cancelButton = By.id("userdetailForm:userdetailCancel");
@@ -76,7 +76,7 @@ public ManageUserAccountPage clickEnabled() {
 
     public ManageUserAccountPage clickRole(String role) {
         log.info("Click role {}", role);
-        clickElement(readyElement(By.id("userdetailForm:rolesField:roles:"
+        clickElement(readyElement(By.id("userdetailForm:roles:input:roles:"
                 .concat(roleMap.get(role)))));
         return new ManageUserAccountPage(getDriver());
     }
diff --git a/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java b/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
index 56803e0dbc..8cb026e5fc 100644
--- a/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
+++ b/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
@@ -34,20 +34,20 @@
 @Slf4j
 public class ServerConfigurationPage extends BasePage {
 
-    private By urlField = By.id("serverConfigForm:urlField:url");
-    public static By registerUrlField = By.id("serverConfigForm:registerField:registerUrl");
+    private By urlField = By.id("serverConfigForm:url:input:url");
+    public static By registerUrlField = By.id("serverConfigForm:register:input:registerUrl");
     private By emailDomainField = By.id("serverConfigForm:emailDomainField:emailDomain");
-    private By adminEmailField = By.id("serverConfigForm:adminEmailField:adminEml");
-    public static By fromEmailField = By.id("serverConfigForm:fromEmailField:fromEml");
+    private By adminEmailField = By.id("serverConfigForm:adminEmail:input:adminEml");
+    public static By fromEmailField = By.id("serverConfigForm:fromEmail:input:fromEml");
     private By enableLogCheck = By.id("serverConfigForm:enableLogCheck");
     private By logLevelSelect = By.id("serverConfigForm:logEmailLvl");
-    private By emailDestinationField = By.id("serverConfigForm:logDestEmailField:logDestEml");
-    private By helpUrlField = By.id("serverConfigForm:helpUrlField:helpInput");
-    private By termsUrlField = By.id("serverConfigForm:termsOfUseUrlField:termsOfUseUrlEml");
-    private By piwikUrl = By.id("serverConfigForm:piwikUrlField:piwikUrlEml");
+    private By emailDestinationField = By.id("serverConfigForm:logDestEmail:input:logDestEml");
+    private By helpUrlField = By.id("serverConfigForm:helpUrl:input:helpInput");
+    private By termsUrlField = By.id("serverConfigForm:termsOfUseUrl:input:termsOfUseUrlEml");
+    private By piwikUrl = By.id("serverConfigForm:piwikUrl:input:piwikUrlEml");
     private By piwikId = By.id("serverConfigForm:piwikIdSiteEml");
-    private By maxConcurrentField = By.id("serverConfigForm:maxConcurrentPerApiKeyField:maxConcurrentPerApiKeyEml");
-    private By maxActiveField = By.id("serverConfigForm:maxActiveRequestsPerApiKeyField:maxActiveRequestsPerApiKeyEml");
+    private By maxConcurrentField = By.id("serverConfigForm:maxConcurrentPerApiKey:input:maxConcurrentPerApiKeyEml");
+    private By maxActiveField = By.id("serverConfigForm:maxActiveRequestsPerApiKey:input:maxActiveRequestsPerApiKeyEml");
     private By saveButton = By.id("serverConfigForm:save");
 
     public ServerConfigurationPage(WebDriver driver) {
@@ -72,7 +72,7 @@ public ServerConfigurationPage inputRegisterURL(String url) {
     }
 
     public boolean expectFieldValue(final By by, final String expectedValue) {
-        log.info("Wait for field {} value", by.toString(), expectedValue);
+        log.info("Wait for field {} value {}", by.toString(), expectedValue);
         return waitForAMoment().withMessage("text present: " + by.toString()).until(
                 ExpectedConditions.textToBePresentInElementValue(existingElement(by), expectedValue));
     }
diff --git a/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java b/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
index 87d9609820..49ecde3217 100644
--- a/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
+++ b/functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
@@ -32,8 +32,8 @@
 @Slf4j
 public class TranslationMemoryEditPage extends BasePage {
 
-    private By idField = By.id("tmForm:slugField:slug");
-    private By descriptionField = By.id("tmForm:descriptionField:description");
+    private By idField = By.id("tmForm:slug:input:slug");
+    private By descriptionField = By.id("tmForm:description:input:description");
     private By saveButton = By.id("tmForm:save");
     private By cancelButton = By.id("tmForm:cancel");
 
diff --git a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
index 719d328d37..63f0fc313e 100644
--- a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
+++ b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
@@ -42,10 +42,10 @@ public class DashboardAccountTab extends DashboardBasePage {
     public static final String EMAIL_TAKEN_ERROR =
             "This email address is already taken";
 
-    private By emailField = By.id("email-update-form:emailField:email");
+    private By emailField = By.id("email-update-form:emailField:input:email");
     private By updateEmailButton = By.id("email-update-form:updateEmailButton");
-    private By oldPasswordField = By.id("passwordChangeForm:oldPasswordField:oldPassword");
-    private By newPasswordField = By.id("passwordChangeForm:newPasswordField:newPassword");
+    private By oldPasswordField = By.id("passwordChangeForm:oldPasswordField:input:oldPassword");
+    private By newPasswordField = By.id("passwordChangeForm:newPasswordField:input:newPassword");
     private By changePasswordButton = By.id("passwordChangeForm:changePasswordButton");
 
     public DashboardAccountTab(WebDriver driver) {
diff --git a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
index 0f26c84361..8db908a478 100644
--- a/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
+++ b/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
@@ -32,7 +32,7 @@
 @Slf4j
 public class DashboardProfileTab extends DashboardBasePage {
 
-    private By accountNameField = By.id("profileForm:nameField:accountName");
+    private By accountNameField = By.id("profileForm:nameField:input:accountName");
     private By updateProfileButton = By.id("updateProfileButton");
 
     public DashboardProfileTab(WebDriver driver) {
diff --git a/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java b/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
index d55ea3d673..30dc79bc1e 100644
--- a/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
+++ b/functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
@@ -41,9 +41,9 @@ public class CreateVersionGroupPage extends BasePage {
             "must start and end with letter or number, and contain only " +
             "letters, numbers, periods, underscores and hyphens.";
 
-    private By groupIdField = By.id("group-form:slugField:slug");
-    public By groupNameField = By.id("group-form:nameField:name");
-    private By groupDescriptionField = By.id("group-form:descriptionField:description");
+    private By groupIdField = By.id("group-form:slug:input:slug");
+    public By groupNameField = By.id("group-form:name:input:name");
+    private By groupDescriptionField = By.id("group-form:description:input:description");
     private By saveButton = By.id("group-form:group-create-new");
     private By createNewButton = By.id("group-form:group-create-new");
 
diff --git a/functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java b/functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
index d405b5cb29..f9c5459b70 100644
--- a/functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
+++ b/functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
@@ -31,7 +31,7 @@
 @Slf4j
 public class ContactTeamPage extends BasePage {
 
-    private By messageField = By.id("contactCoordinatorForm:messageField:contact-coordinator-message");
+    private By messageField = By.id("contactCoordinatorForm:messageField:input:contact-coordinator-message");
     private By sendButton = By.id("contact-coordinator-send-button");
 
     public ContactTeamPage(WebDriver driver) {
diff --git a/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java b/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
index af2c150e9d..75483b5485 100644
--- a/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
+++ b/functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
@@ -31,9 +31,9 @@
 @Slf4j
 public class CreateProjectPage extends BasePage {
 
-    private By idField = By.id("project-form:slugField:slug");
-    private By nameField = By.id("project-form:nameField:name");
-    private By descriptionField = By.id("project-form:descriptionField:description");
+    private By idField = By.id("project-form:slug:input:slug");
+    private By nameField = By.id("project-form:name:input:name");
+    private By descriptionField = By.id("project-form:description:input:description");
     private By projectTypeList = By.id("project-types");
     private By createButton = By.id("project-form:create-new");
 
diff --git a/functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java b/functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
index 576f67bc04..7792994435 100644
--- a/functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
+++ b/functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
@@ -41,7 +41,7 @@ public class ProjectsPage extends BasePage {
 
     private By createProjectButton = By.id("createProjectLink");
     private By mainContentDiv = By.id("main_body_content");
-    private By projectTable = By.id("main_content:form:projectList");
+    private By projectTable = By.id("form:projectList");
     private By activeCheckBox = By.xpath("//*[@data-original-title='Filter active projects']");
     private By readOnlyCheckBox = By.xpath("//*[@data-original-title='Filter read-only projects']");
 
diff --git a/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java b/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
index 53ed50ed36..0298636e1e 100644
--- a/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
+++ b/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
@@ -38,12 +38,12 @@
 @Slf4j
 public class ProjectGeneralTab extends ProjectBasePage {
 
-    private By projectIdField = By.id("settings-general-form:slugField:slug");
-    private By projectNameField = By.id("settings-general-form:nameField:name");
-    private By descriptionField = By.id("settings-general-form:descriptionField:description");
+    private By projectIdField = By.id("settings-general-form:slug:input:slug");
+    private By projectNameField = By.id("settings-general-form:name:input:name");
+    private By descriptionField = By.id("settings-general-form:description:input:description");
     private By projectTypeList = By.id("project-types");
-    private By homepageField = By.id("settings-general-form:homePageField:homePage");
-    private By repoField = By.id("settings-general-form:repoField:repo");
+    private By homepageField = By.id("settings-general-form:homePage:input:homePage");
+    private By repoField = By.id("settings-general-form:repo:input:repo");
     private By deleteButton = By.id("button-archive-project");
     private By confirmDeleteButton = By.id("deleteButton");
     private By confirmDeleteInput = By.id("confirmDeleteInput");
diff --git a/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java b/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
index 992638ef47..f873f35a59 100644
--- a/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
+++ b/functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
@@ -37,7 +37,7 @@ public class CreateVersionPage extends BasePage {
             "must start and end with letter or number, and contain only " +
                     "letters, numbers, periods, underscores and hyphens.";
 
-    public By projectVersionID = By.id("create-version-form:slugField:slug");
+    public By projectVersionID = By.id("create-version-form:slug:input:slug");
     private By projectTypeSelection = By.id("create-version-form:project-type");
     private By saveButton = By.id("create-version-form:button-create");
     private By copyFromPreviousVersionChk = By.id("create-version-form:copy-from-version");
diff --git a/functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java b/functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
index 72fc963246..a8a80f9a6c 100644
--- a/functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
+++ b/functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
@@ -34,7 +34,7 @@
 public class ContactAdminFormPage extends BasePage {
 
     private By subjectField = By.id("contactAdminForm:subjectField:subject");
-    private By messageField = By.id("contactAdminForm:messageField:contact-admin-message");
+    private By messageField = By.id("contactAdminForm:messageField:input:contact-admin-message");
     private By sendButton = By.id("contact-admin-send-button");
 
     public ContactAdminFormPage(WebDriver driver) {
diff --git a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
index b7e7569084..6d2ac4ceda 100644
--- a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
+++ b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
@@ -46,9 +46,6 @@
 @Category(DetailedTest.class)
 public class VersionGroupTest extends ZanataTestCase {
 
-//    @ClassRule
-//    public static AddUsersRule addUsersRule = new AddUsersRule();
-
     @ClassRule
     public static SampleProjectRule sampleProjectRule = new SampleProjectRule();
 
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 0ccc9a9a95..aa38fc896a 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -159,7 +159,6 @@
             <usedDependency>com.google.guava:guava-gwt</usedDependency>
             <!-- Used for StringUtils lib -->
             <!-- Needed by ui rendering at runtime -->
-            <usedDependency>org.jboss.spec.javax.el:jboss-el-api_2.2_spec</usedDependency>
             <usedDependency>javax.servlet.jsp:jsp-api</usedDependency>
             <!-- Used for different content analyzers based on langugage for search. -->
             <usedDependency>org.apache.solr:solr-core</usedDependency>
diff --git a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
index 151e75048a..c8ec7a8730 100644
--- a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
@@ -1,5 +1,6 @@
 package org.zanata.action;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.util.Collections;
@@ -15,6 +16,8 @@
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
+import org.richfaces.event.FileUploadEvent;
+import org.richfaces.model.UploadedFile;
 import org.zanata.common.LocaleId;
 import org.zanata.dao.GlossaryDAO;
 import org.zanata.dao.LocaleDAO;
@@ -157,6 +160,12 @@ private List<GlossaryEntry> getEntries(GlossaryDAO glossaryDAO) {
         return getEntries();
     }
 
+    public void glossaryFileUploaded(FileUploadEvent event) throws IOException {
+        UploadedFile uploadedFile = event.getUploadedFile();
+        glossaryFileUpload.setFileContents(uploadedFile.getInputStream());
+        glossaryFileUpload.setFileName(uploadedFile.getName());
+    }
+
     /**
      * Helper class to upload glossary files.
      */
diff --git a/zanata-war/src/main/java/org/zanata/action/RoleAction.java b/zanata-war/src/main/java/org/zanata/action/RoleAction.java
index 48e907fa46..e8a2536905 100644
--- a/zanata-war/src/main/java/org/zanata/action/RoleAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/RoleAction.java
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.End;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Install;
 import org.jboss.seam.annotations.Name;
@@ -95,10 +96,16 @@ private String saveExistingRole() {
             }
         }
 
+        // TODO [CDI] need to end conversation or equivalent scope in CDI
         Conversation.instance().end();
         return "success";
     }
 
+    @End
+    public String cancel() {
+        return "/admin/rolemanager";
+    }
+
     public String getRole() {
         return role;
     }
diff --git a/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java b/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
index fcb9d8f033..c2b06f52f6 100644
--- a/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
+++ b/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
@@ -267,10 +267,6 @@ private void persistPropertyToDatabase(PropertyWithKey<String> property) {
         }
     }
 
-    public String cancel() {
-        return "cancel";
-    }
-
     /**
      * Associates a field of type T with a HApplicationConfiguration key,
      * allowing abstraction around setting fields only if keys are bound.
diff --git a/zanata-war/src/main/java/org/zanata/action/UserAction.java b/zanata-war/src/main/java/org/zanata/action/UserAction.java
index d6e19de50e..cefecd934d 100644
--- a/zanata-war/src/main/java/org/zanata/action/UserAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/UserAction.java
@@ -30,6 +30,7 @@
 import org.hibernate.exception.ConstraintViolationException;
 import org.jboss.seam.Component;
 import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.End;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Install;
 import org.jboss.seam.annotations.Name;
@@ -187,7 +188,7 @@ public String save() {
 
     private String saveNewUser() {
         if (password == null || !password.equals(confirm)) {
-            StatusMessages.instance().addToControl("password", "Passwords do not match");
+            facesMessages.addToControl("password", "Passwords do not match");
             return "failure";
         }
 
@@ -210,7 +211,7 @@ private String saveExistingUser() {
         // Check if a new password has been entered
         if (password != null && !"".equals(password)) {
             if (!password.equals(confirm)) {
-                StatusMessages.instance().addToControl("password", "Passwords do not match");
+                facesMessages.addToControl("password", "Passwords do not match");
                 return "failure";
             } else {
                 identityManager.changePassword(username, password);
@@ -257,6 +258,11 @@ private boolean isNewUsernameValid(String username) {
         }
     }
 
+    @End
+    public String cancel() {
+        return "/admin/usermanager";
+    }
+
     public String getUsername() {
         return username;
     }
diff --git a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
index f18461f839..ddf5f8ffc7 100644
--- a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
@@ -22,6 +22,7 @@
 package org.zanata.action;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.security.DigestInputStream;
@@ -43,6 +44,8 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.faces.FacesMessages;
+import org.richfaces.event.FileUploadEvent;
+import org.richfaces.model.UploadedFile;
 import org.zanata.exception.AuthorizationException;
 import org.jboss.seam.util.Hex;
 import org.zanata.async.handle.CopyVersionTaskHandle;
@@ -710,18 +713,21 @@ public boolean isFileUploadAllowed(HLocale hLocale) {
                         .getProject(), hLocale);
     }
 
-    private DocumentType getDocumentType(Optional<String> docType) {
+    private Optional<DocumentType> getDocumentType(Optional<String> docType) {
         DocumentType type;
         if (!docType.isPresent()) {
             // if docType null, only 1 document type available for selected file extensions
-            type = translationFileServiceImpl
-                            .getDocumentTypes(sourceFileUpload.getFileName())
-                            .iterator().next();
+            Set<DocumentType> documentTypes = translationFileServiceImpl
+                    .getDocumentTypes(sourceFileUpload.getFileName());
+            if (documentTypes.isEmpty()) {
+                return Optional.absent();
+            }
+            type = documentTypes.iterator().next();
         } else {
             // if docType not null, adapter is selected by user from drop down
             type = DocumentType.getByName(docType.get());
         }
-        return type;
+        return Optional.of(type);
     }
 
     public void uploadSourceFile() {
@@ -734,18 +740,22 @@ public void uploadSourceFile() {
             Optional<String> docType =
                 Optional.fromNullable(sourceFileUpload.documentType);
 
-            DocumentType documentType = getDocumentType(docType);
-
-            if (translationFileServiceImpl.hasAdapterFor(documentType)) {
-                uploadAdapterFile(documentType);
+            Optional<DocumentType> documentTypeOpt = getDocumentType(docType);
+            if (documentTypeOpt.isPresent()
+                    && translationFileServiceImpl.hasAdapterFor(documentTypeOpt
+                            .get())) {
+                uploadAdapterFile(documentTypeOpt.get());
+                resetPageData();
             } else {
+                String summary = "Unrecognized file extension for "
+                        +
+                        sourceFileUpload.getFileName();
+                // TODO this message is not displayed
                 conversationScopeMessages.setMessage(
-                        FacesMessage.SEVERITY_INFO,
-                        "Unrecognized file extension for "
-                                + sourceFileUpload.getFileName());
+                        FacesMessage.SEVERITY_INFO, summary);
+                throw new IllegalArgumentException(summary);
             }
         }
-        resetPageData();
     }
 
     public boolean isPoDocument(String docId) {
@@ -1049,6 +1059,20 @@ public void uploadTranslationFile(HLocale hLocale) {
         resetPageData();
     }
 
+    public void sourceFileUploaded(FileUploadEvent event) throws IOException {
+        UploadedFile uploadedFile = event.getUploadedFile();
+        sourceFileUpload.setFileName(uploadedFile.getName());
+        sourceFileUpload.setFileContents(uploadedFile.getInputStream());
+//        return "/iteration/view.xhtml?projectSlug=" + projectSlug +"&iterationSlug=" + versionSlug;
+
+    }
+
+    public void transFileUploaded(FileUploadEvent event) throws IOException {
+        UploadedFile uploadedFile = event.getUploadedFile();
+        translationFileUpload.setFileName(uploadedFile.getName());
+        translationFileUpload.setFileContents(uploadedFile.getInputStream());
+    }
+
     private class DocumentFilter extends InMemoryListFilter<HDocument> {
         private DocumentDAO documentDAO =
                 ServiceLocator.instance().getInstance(DocumentDAO.class);
diff --git a/zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java b/zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
new file mode 100644
index 0000000000..a009f3ce28
--- /dev/null
+++ b/zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
@@ -0,0 +1,505 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.zanata.ui;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.FacesException;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.FacesComponent;
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
+import javax.faces.component.UIMessage;
+import javax.faces.component.UINamingContainer;
+import javax.faces.component.UIViewRoot;
+import javax.faces.component.html.HtmlOutputLabel;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.BeanValidator;
+import javax.validation.Validation;
+import javax.validation.ValidationException;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+/**
+ * N.B. Copy from seam's migration demo project at https://github.com/seam/migration.
+ *
+ * <strong>UIInputContainer</strong> is a supplemental component for a JSF 2.0
+ * composite component encapsulating one or more input components
+ * (<strong>EditableValueHolder</strong>), their corresponding message
+ * components (<strong>UIMessage</strong>) and a label
+ * (<strong>HtmlOutputLabel</strong>). This component takes care of wiring the
+ * label to the first input and the messages to each input in sequence. It also
+ * assigns two implicit attribute values, "required" and "invalid" to indicate
+ * that a required input field is present and whether there are any validation
+ * errors, respectively. To determine if a input field is required, both the
+ * required attribute is consulted. Finally, if the "label" attribute is not
+ * provided on the composite component, the label value will be derived from the
+ * id of the composite component, for convenience.
+ * <p/>
+ * <p>
+ * Composite component definition example (minus layout):
+ * </p>
+ * <p/>
+ * <p/>
+ *
+ * <pre>
+ * &lt;cc:interface componentType="org.jboss.seam.faces.InputContainer"/>
+ * &lt;cc:implementation>
+ *   &lt;h:outputLabel id="label" value="#{cc.attrs.label}:" styleClass="#{cc.attrs.invalid ? 'invalid' : ''}">
+ *     &lt;h:ouputText styleClass="required" rendered="#{cc.attrs.required}" value="*"/>
+ *   &lt;/h:outputLabel>
+ *   &lt;cc:insertChildren/>
+ *   &lt;h:message id="message" errorClass="invalid message" rendered="#{cc.attrs.invalid}"/>
+ * &lt;/cc:implementation>
+ * </pre>
+ * <p/>
+ * <p>
+ * Composite component usage example:
+ * </p>
+ * <p/>
+ * <p/>
+ *
+ * <pre>
+ * &lt;example:inputContainer id="name">
+ *   &lt;h:inputText id="input" value="#{person.name}"/>
+ * &lt;/example:inputContainer>
+ * </pre>
+ * <p/>
+ * <p>
+ * Possible enhancements:
+ * </p>
+ * <ul>
+ * <li>append styleClass "invalid" to label, inputs and messages when invalid</li>
+ * </ul>
+ * <p/>
+ * <p>
+ * NOTE: Firefox does not properly associate a label with the target input if
+ * the input id contains a colon (:), the default separator character in JSF.
+ * JSF 2 allows developers to set the value via an initialization parameter
+ * (context-param in web.xml) keyed to javax.faces.SEPARATOR_CHAR. We recommend
+ * that you override this setting to make the separator an underscore (_).
+ * </p>
+ *
+ * @author Dan Allen
+ * @author <a href="http://community.jboss.org/people/spinner)">Jose Rodolfo
+ *         freitas</a>
+ */
+@FacesComponent(UIInputContainer.COMPONENT_TYPE)
+public class UIInputContainer extends UIComponentBase implements
+        NamingContainer {
+    /**
+     * The standard component type for this component.
+     */
+    public static final String COMPONENT_TYPE =
+            "org.jboss.seam.faces.InputContainer";
+
+    protected static final String HTML_ID_ATTR_NAME = "id";
+    protected static final String HTML_CLASS_ATTR_NAME = "class";
+    protected static final String HTML_STYLE_ATTR_NAME = "style";
+
+    private boolean beanValidationPresent = false;
+
+    public UIInputContainer() {
+        beanValidationPresent = isClassPresent("javax.validation.Validator");
+    }
+
+    @Override
+    public String getFamily() {
+        return UINamingContainer.COMPONENT_FAMILY;
+    }
+
+    /**
+     * The name of the auto-generated composite component attribute that holds a
+     * boolean indicating whether the the template contains an invalid input.
+     */
+    public String getInvalidAttributeName() {
+        return "invalid";
+    }
+
+    /**
+     * The name of the auto-generated composite component attribute that holds a
+     * boolean indicating whether the template contains a required input.
+     */
+    public String getRequiredAttributeName() {
+        return "required";
+    }
+
+    /**
+     * The name of the composite component attribute that holds the string label
+     * for this set of inputs. If the label attribute is not provided, one will
+     * be generated from the id of the composite component or, if the id is
+     * defaulted, the name of the property bound to the first input.
+     */
+    public String getLabelAttributeName() {
+        return "label";
+    }
+
+    /**
+     * The name of the auto-generated composite component attribute that holds
+     * the elements in this input container. The elements include the label, a
+     * list of inputs and a cooresponding list of messages.
+     */
+    public String getElementsAttributeName() {
+        return "elements";
+    }
+
+    /**
+     * The name of the composite component attribute that holds a boolean
+     * indicating whether the component template should be enclosed in an HTML
+     * element, so that it be referenced from JavaScript.
+     */
+    public String getEncloseAttributeName() {
+        return "enclose";
+    }
+
+    public String getContainerElementName() {
+        return "div";
+    }
+
+    public String getDefaultLabelId() {
+        return "label";
+    }
+
+    public String getDefaultInputId() {
+        return "input";
+    }
+
+    public String getDefaultMessageId() {
+        return "message";
+    }
+
+    @Override
+    public void encodeBegin(final FacesContext context) throws IOException {
+        if (!isRendered()) {
+            return;
+        }
+
+        super.encodeBegin(context);
+
+        InputContainerElements elements =
+                scan(getFacet(UIComponent.COMPOSITE_FACET_NAME), null, context);
+        // assignIds(elements, context);
+        wire(elements, context);
+
+        getAttributes().put(getElementsAttributeName(), elements);
+
+        if (elements.hasValidationError()) {
+            getAttributes().put(getInvalidAttributeName(), true);
+        }
+
+        getAttributes().put(getRequiredAttributeName(),
+                elements.hasRequiredInput());
+
+        /*
+         * for some reason, Mojarra is not filling Attribute Map with "label"
+         * key if label attr has an EL value, so I added a labelHasEmptyValue to
+         * guarantee that there was no label setted.
+         */
+        if (getValueExpression(getLabelAttributeName()) == null
+                && (!getAttributes().containsKey(getLabelAttributeName()) || labelHasEmptyValue(elements))) {
+            getAttributes().put(getLabelAttributeName(),
+                    generateLabel(elements, context));
+        }
+
+        if (Boolean.TRUE.equals(getAttributes().get(getEncloseAttributeName()))) {
+            startContainerElement(context);
+        }
+    }
+
+    @Override
+    public void encodeEnd(final FacesContext context) throws IOException {
+        if (!isRendered()) {
+            return;
+        }
+
+        super.encodeEnd(context);
+
+        if (Boolean.TRUE.equals(getAttributes().get(getEncloseAttributeName()))) {
+            endContainerElement(context);
+        }
+    }
+
+    protected void startContainerElement(final FacesContext context)
+            throws IOException {
+        context.getResponseWriter().startElement(getContainerElementName(),
+                this);
+        String style =
+                (getAttributes().get("style") != null ? getAttributes()
+                        .get("style").toString().trim() : null);
+        if (style.length() > 0) {
+            context.getResponseWriter().writeAttribute(HTML_STYLE_ATTR_NAME,
+                    style, HTML_STYLE_ATTR_NAME);
+        }
+        String styleClass =
+                (getAttributes().get("styleClass") != null ? getAttributes()
+                        .get("styleClass").toString().trim()
+                        : null);
+        if (styleClass.length() > 0) {
+            context.getResponseWriter().writeAttribute(HTML_CLASS_ATTR_NAME,
+                    styleClass, HTML_CLASS_ATTR_NAME);
+        }
+        context.getResponseWriter().writeAttribute(HTML_ID_ATTR_NAME,
+                getClientId(context), HTML_ID_ATTR_NAME);
+    }
+
+    protected void endContainerElement(final FacesContext context)
+            throws IOException {
+        context.getResponseWriter().endElement(getContainerElementName());
+    }
+
+    protected String generateLabel(final InputContainerElements elements,
+            final FacesContext context) {
+        String name =
+                getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX) ? elements
+                        .getPropertyName(context) : getId();
+        return name.substring(0, 1).toUpperCase() + name.substring(1);
+    }
+
+    /**
+     * Walk the component tree branch built by the composite component and
+     * locate the input container elements.
+     *
+     * @return a composite object of the input container elements
+     */
+    protected InputContainerElements scan(final UIComponent component,
+            InputContainerElements elements,
+            final FacesContext context) {
+        if (elements == null) {
+            elements = new InputContainerElements();
+        }
+
+        // NOTE we need to walk the tree ignoring rendered attribute because
+        // it's condition
+        // could be based on what we discover
+        if ((elements.getLabel() == null)
+                && (component instanceof HtmlOutputLabel)) {
+            elements.setLabel((HtmlOutputLabel) component);
+        } else if (component instanceof EditableValueHolder) {
+            elements.registerInput((EditableValueHolder) component,
+                    getDefaultValidator(context), context);
+        } else if (component instanceof UIMessage) {
+            elements.registerMessage((UIMessage) component);
+        }
+        // may need to walk smarter to ensure "element of least suprise"
+        for (UIComponent child : component.getChildren()) {
+            scan(child, elements, context);
+        }
+
+        return elements;
+    }
+
+    // assigning ids seems to break form submissions, but I don't know why
+    public void assignIds(final InputContainerElements elements,
+            final FacesContext context) {
+        boolean refreshIds = false;
+        if (getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) {
+            setId(elements.getPropertyName(context));
+            refreshIds = true;
+        }
+        UIComponent label = elements.getLabel();
+        if (label != null) {
+            if (label.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) {
+                label.setId(getDefaultLabelId());
+            } else if (refreshIds) {
+                label.setId(label.getId());
+            }
+        }
+        for (int i = 0, len = elements.getInputs().size(); i < len; i++) {
+            UIComponent input = (UIComponent) elements.getInputs().get(i);
+            if (input.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) {
+                input.setId(getDefaultInputId() + (i == 0 ? "" : (i + 1)));
+            } else if (refreshIds) {
+                input.setId(input.getId());
+            }
+        }
+        for (int i = 0, len = elements.getMessages().size(); i < len; i++) {
+            UIComponent msg = elements.getMessages().get(i);
+            if (msg.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) {
+                msg.setId(getDefaultMessageId() + (i == 0 ? "" : (i + 1)));
+            } else if (refreshIds) {
+                msg.setId(msg.getId());
+            }
+        }
+    }
+
+    /**
+     * Wire the label and messages to the input(s)
+     */
+    protected void wire(final InputContainerElements elements,
+            final FacesContext context) {
+        elements.wire(context);
+    }
+
+    /**
+     * Get the default Bean Validation Validator to read the contraints for a
+     * property.
+     */
+    private Validator getDefaultValidator(final FacesContext context)
+            throws FacesException {
+        if (!beanValidationPresent) {
+            return null;
+        }
+
+        ValidatorFactory validatorFactory;
+        Object cachedObject =
+                context.getExternalContext().getApplicationMap()
+                        .get(BeanValidator.VALIDATOR_FACTORY_KEY);
+        if (cachedObject instanceof ValidatorFactory) {
+            validatorFactory = (ValidatorFactory) cachedObject;
+        } else {
+            try {
+                validatorFactory = Validation.buildDefaultValidatorFactory();
+            } catch (ValidationException e) {
+                throw new FacesException(
+                        "Could not build a default Bean Validator factory", e);
+            }
+            context.getExternalContext().getApplicationMap()
+                    .put(BeanValidator.VALIDATOR_FACTORY_KEY, validatorFactory);
+        }
+        return validatorFactory.getValidator();
+    }
+
+    private boolean isClassPresent(final String fqcn) {
+        try {
+            if (Thread.currentThread().getContextClassLoader() != null) {
+                return Thread.currentThread().getContextClassLoader()
+                        .loadClass(fqcn) != null;
+            } else {
+                return Class.forName(fqcn) != null;
+            }
+        } catch (ClassNotFoundException e) {
+            return false;
+        } catch (NoClassDefFoundError e) {
+            return false;
+        }
+    }
+
+    private boolean labelHasEmptyValue(InputContainerElements elements) {
+        if (elements.getLabel() == null
+                || elements.getLabel().getValue() == null) {
+            return false;
+        }
+        return (elements.getLabel().getValue().toString().trim().equals(":") || elements
+                .getLabel().getValue().toString()
+                .trim().equals(""));
+    }
+
+    public static class InputContainerElements {
+        private String propertyName;
+        private HtmlOutputLabel label;
+        private final List<EditableValueHolder> inputs =
+                new ArrayList<EditableValueHolder>();
+        private final List<UIMessage> messages = new ArrayList<UIMessage>();
+        private boolean validationError = false;
+
+        public HtmlOutputLabel getLabel() {
+            return label;
+        }
+
+        public void setLabel(final HtmlOutputLabel label) {
+            this.label = label;
+        }
+
+        public List<EditableValueHolder> getInputs() {
+            return inputs;
+        }
+
+        public void registerInput(final EditableValueHolder input,
+                final Validator validator, final FacesContext context) {
+            inputs.add(input);
+
+            if (!input.isValid()) {
+                validationError = true;
+            } else if (!validationError) {
+                // optimization to avoid loop if already flagged
+                Iterator<FacesMessage> it =
+                        context.getMessages(((UIComponent) input)
+                                .getClientId(context));
+                while (it.hasNext()) {
+                    if (it.next().getSeverity()
+                            .compareTo(FacesMessage.SEVERITY_WARN) >= 0) {
+                        validationError = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        public List<UIMessage> getMessages() {
+            return messages;
+        }
+
+        public void registerMessage(final UIMessage message) {
+            messages.add(message);
+        }
+
+        public boolean hasValidationError() {
+            return validationError;
+        }
+
+        public boolean hasRequiredInput() {
+            // We have to scan these each time as the value could change in an
+            // AJAX request
+            for (EditableValueHolder holder : inputs) {
+                if (holder.isRequired()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public String getPropertyName(final FacesContext context) {
+            if (propertyName != null) {
+                return propertyName;
+            }
+
+            if (inputs.size() == 0) {
+                return null;
+            }
+
+            propertyName =
+                    (String) new ValueExpressionAnalyzer(
+                            ((UIComponent) inputs.get(0))
+                                    .getValueExpression("value"))
+                            .getValueReference(context.getELContext())
+                            .getProperty();
+            return propertyName;
+        }
+
+        public void wire(final FacesContext context) {
+            int numInputs = inputs.size();
+            if (numInputs > 0) {
+                if (label != null) {
+                    label.setFor(((UIComponent) inputs.get(0))
+                            .getClientId(context));
+                }
+                for (int i = 0, len = messages.size(); i < len; i++) {
+                    if (i < numInputs) {
+                        messages.get(i).setFor(
+                                ((UIComponent) inputs.get(i))
+                                        .getClientId(context));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/zanata-war/src/main/java/org/zanata/ui/ValueExpressionAnalyzer.java b/zanata-war/src/main/java/org/zanata/ui/ValueExpressionAnalyzer.java
new file mode 100644
index 0000000000..cc7c96012e
--- /dev/null
+++ b/zanata-war/src/main/java/org/zanata/ui/ValueExpressionAnalyzer.java
@@ -0,0 +1,177 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.zanata.ui;
+
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
+import java.util.Locale;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.ELResolver;
+import javax.el.FunctionMapper;
+import javax.el.ValueExpression;
+import javax.el.ValueReference;
+import javax.el.VariableMapper;
+import javax.faces.el.CompositeComponentExpressionHolder;
+
+/**
+ * N.B. This class is copied from seam's migration demo project at https://github.com/seam/migration.
+ * <p>
+ * Analyzes a {@link ValueExpression} and provides access to the base object and property name referenced by the expression.
+ * </p>
+ * <p/>
+ * <p>
+ * The getValueReference(ELContext) method returns a {@link ValueReference} object, which encapsulates the base object and
+ * property name to which the expression maps. This process works by resolving the expression up until the last segment.
+ * </p>
+ * <p/>
+ * <p>
+ * Although access to the ValueReference was added in EL 2.2, the feature does not work correctly, which is why this custom
+ * class is required.
+ * </p>
+ *
+ * @author Dan Allen
+ */
+class ValueExpressionAnalyzer {
+    private ValueExpression expression;
+
+    public ValueExpressionAnalyzer(ValueExpression expression) {
+        this.expression = expression;
+    }
+
+    public ValueReference getValueReference(ELContext elContext) {
+        InterceptingResolver resolver = new InterceptingResolver(elContext.getELResolver());
+        try {
+            expression.setValue(decorateELContext(elContext, resolver), null);
+        } catch (ELException ele) {
+            return null;
+        }
+        ValueReference reference = resolver.getValueReference();
+        if (reference != null) {
+            Object base = reference.getBase();
+            if (base instanceof CompositeComponentExpressionHolder) {
+                ValueExpression ve = ((CompositeComponentExpressionHolder) base)
+                        .getExpression((String) reference.getProperty());
+                if (ve != null) {
+                    this.expression = ve;
+                    reference = getValueReference(elContext);
+                }
+            }
+        }
+        return reference;
+    }
+
+    private ELContext decorateELContext(final ELContext context, final ELResolver resolver) {
+        return new ELContext() {
+            // punch in our new ELResolver
+            @Override
+            public ELResolver getELResolver() {
+                return resolver;
+            }
+
+            // The rest of the methods simply delegate to the existing context
+            @Override
+            public Object getContext(Class key) {
+                return context.getContext(key);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return context.getLocale();
+            }
+
+            @Override
+            public boolean isPropertyResolved() {
+                return context.isPropertyResolved();
+            }
+
+            @Override
+            public void putContext(Class key, Object contextObject) {
+                context.putContext(key, contextObject);
+            }
+
+            @Override
+            public void setLocale(Locale locale) {
+                context.setLocale(locale);
+            }
+
+            @Override
+            public void setPropertyResolved(boolean resolved) {
+                context.setPropertyResolved(resolved);
+            }
+
+            @Override
+            public FunctionMapper getFunctionMapper() {
+                return context.getFunctionMapper();
+            }
+
+            @Override
+            public VariableMapper getVariableMapper() {
+                return context.getVariableMapper();
+            }
+        };
+    }
+
+    private static class InterceptingResolver extends ELResolver {
+        private ELResolver delegate;
+        private ValueReference valueReference;
+
+        public InterceptingResolver(ELResolver delegate) {
+            this.delegate = delegate;
+        }
+
+        public ValueReference getValueReference() {
+            return valueReference;
+        }
+
+        // Capture the base and property rather than write the value
+        @Override
+        public void setValue(ELContext context, Object base, Object property, Object value) {
+            if (base != null && property != null) {
+                context.setPropertyResolved(true);
+                valueReference = new ValueReference(base, property.toString());
+            }
+        }
+
+        // The rest of the methods simply delegate to the existing context
+        @Override
+        public Object getValue(ELContext context, Object base, Object property) {
+            return delegate.getValue(context, base, property);
+        }
+
+        @Override
+        public Class<?> getType(ELContext context, Object base, Object property) {
+            return delegate.getType(context, base, property);
+        }
+
+        @Override
+        public boolean isReadOnly(ELContext context, Object base, Object property) {
+            return delegate.isReadOnly(context, base, property);
+        }
+
+        @Override
+        public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
+            return delegate.getFeatureDescriptors(context, base);
+        }
+
+        @Override
+        public Class<?> getCommonPropertyType(ELContext context, Object base) {
+            return delegate.getCommonPropertyType(context, base);
+        }
+    }
+}
diff --git a/zanata-war/src/main/java/org/zanata/ui/ZanataUIInputContainer.java b/zanata-war/src/main/java/org/zanata/ui/ZanataUIInputContainer.java
new file mode 100644
index 0000000000..7af48eda59
--- /dev/null
+++ b/zanata-war/src/main/java/org/zanata/ui/ZanataUIInputContainer.java
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.zanata.ui;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.FacesComponent;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+/**
+ *
+ * @see UIInputContainer
+ */
+@FacesComponent(ZanataUIInputContainer.COMPONENT_TYPE)
+public class ZanataUIInputContainer extends UIInputContainer {
+    /**
+     * The standard component type for this component.
+     */
+    public static final String COMPONENT_TYPE = "org.zanata.faces.InputContainer";
+
+    @Override
+    public void encodeBegin(final FacesContext context) throws IOException {
+        getAttributes().put(getInvalidAttributeName(), false);
+        super.encodeBegin(context);
+
+        InputContainerElements elements = super.scan(getFacet(UIComponent.COMPOSITE_FACET_NAME), null, context);
+
+        for (EditableValueHolder input : elements.getInputs()) {
+            // if we use FacesMessages.addToControl(id, message) directly in
+            // code, e.g. testing whether some value is unique in database, we
+            // need to set invalid to true in order to display the message. We
+            // also need to add the message to input client id because that's
+            // what's being set as for for h:message (see
+            // org.zanata.ui.UIInputContainer.InputContainerElements.wire).
+            Iterator<FacesMessage> messagesForInput = context.getMessages(
+                    ((UIComponent) input).getClientId(context));
+            if (messagesForInput.hasNext()) {
+                getAttributes().put(getInvalidAttributeName(), true);
+            }
+        }
+    }
+}
diff --git a/zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java b/zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
index faae0c26c7..3a6c8e1283 100644
--- a/zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
+++ b/zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
@@ -27,11 +27,15 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
+import java.util.Stack;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
 import org.jboss.seam.ScopeType;
@@ -43,6 +47,7 @@
 import org.jboss.seam.core.Interpolator;
 import org.zanata.i18n.Messages;
 import org.zanata.util.ServiceLocator;
+import com.google.common.collect.Lists;
 
 /**
  * Utility to allow for easy handling of JSF messages. Serves as a replacement
@@ -87,26 +92,39 @@ public void beforeRenderResponse() {
      */
     private String getClientId(String id) {
         FacesContext facesContext = FacesContext.getCurrentInstance();
-        return getClientId(facesContext.getViewRoot(), id, facesContext);
-    }
 
-    private static String getClientId(UIComponent component, String id,
-            FacesContext facesContext) {
-        String componentId = component.getId();
-        if (componentId != null && componentId.equals(id)) {
-            return component.getClientId(facesContext);
-        } else {
-            Iterator iter = component.getFacetsAndChildren();
-            while (iter.hasNext()) {
-                UIComponent child = (UIComponent) iter.next();
-                String clientId = getClientId(child, id, facesContext);
-                if (clientId != null)
-                    return clientId;
+        // we search from backwards, so for a component tree A->B->C, we search
+        // id from C then B then A for a match of id. If we found
+        // C.getId().equals(id), we will use C.getClientId()
+        Stack<UIComponent> uiComponentStack = new Stack<>();
+        addComponentToStack(uiComponentStack, facesContext.getViewRoot());
+
+        while (!uiComponentStack.empty()) {
+            UIComponent pop = uiComponentStack.pop();
+            if (pop.getId() != null && id.equals(pop.getId())) {
+                return pop.getClientId();
             }
-            return null;
         }
+        return null;
     }
 
+    private void addComponentToStack(Stack<UIComponent> uiComponentStack,
+            UIComponent component) {
+        uiComponentStack.push(component);
+        Iterator<UIComponent> iter = component.getFacetsAndChildren();
+
+        Queue<UIComponent> children = new LinkedList<>();
+        while (iter.hasNext()) {
+            UIComponent next = iter.next();
+            uiComponentStack.push(next);
+            children.add(next);
+        }
+        for (UIComponent child : children) {
+            addComponentToStack(uiComponentStack, child);
+        }
+    }
+
+
     /**
      * Add a status message, looking up the message in the resource bundle using
      * the provided key. If the message is found, it is used, otherwise, the
diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
index 2ad4a85873..1aea6df534 100644
--- a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
+++ b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
@@ -123,8 +123,7 @@
       If you are using MySQL, don't forget their magic stuff:
       http://dev.mysql.com/doc/refman/5.0/en/packet-too-large.html
   -->
-  <web:multipart-filter create-temp-files="true"
-    max-request-size="10000000" url-pattern="*.seam" />
+  <web:multipart-filter disabled="true" />
 
   <component name="essentialDataCreator"
     class="org.zanata.util.EssentialDataCreator" installed="true">
diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
index 04e5f1a23f..ff4778f0ba 100644
--- a/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
+++ b/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
@@ -242,6 +242,12 @@
     <param-value>*.xhtml</param-value>
   </context-param>
 
+  <context-param>
+    <param-name>org.richfaces.fileUpload.maxRequestSize</param-name>
+    <!-- bytes -->
+    <param-value>10000000</param-value>
+  </context-param>
+
   <!-- This would eliminate ViewExpiredException when sessions expire, but may hurt performance:
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
index 063e1aea28..713c55e8bc 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
@@ -3,6 +3,7 @@
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   class="modal" id="contactAdminDialog" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true">
 
@@ -57,12 +58,12 @@
         oncomplete="getContactAdminForm().find('#contact-admin-cancel-button').click()"/>
 
       <div class="modal__content l--pad-all-1">
-        <s:decorate id="messageField" template="/WEB-INF/layout/field.xhtml">
+        <zanata:decorate id="messageField" componentId="message">
           <h:inputTextarea id="contact-admin-message" value="#{contactAdminAction.message}"
             required="true">
-            <a4j:ajax event="blur" render="messageField" execute="@this"/>
+            <a4j:ajax event="blur" render="message" execute="@this"/>
           </h:inputTextarea>
-        </s:decorate>
+        </zanata:decorate>
       </div>
 
       <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
index 0c574094e9..90e9212005 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
@@ -3,6 +3,7 @@
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   class="modal" id="contactAdminDialogAnonymous" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true">
 
@@ -58,10 +59,10 @@
       <div class="modal__content l--pad-all-1">
         <span>#{msgs['jsf.AdditionalInfo']}</span>
         <span class="txt--meta bx--block">#{msgs['jsf.passwordReset.google.AdditionalInfoMessage']}</span>
-        <s:decorate id="messageField" template="/WEB-INF/layout/field.xhtml">
+        <zanata:decorate id="messageField">
           <h:inputTextarea id="contact-admin-anonymous-message" value="#{contactAdminAction.message}"
             required="true"/>
-        </s:decorate>
+        </zanata:decorate>
       </div>
 
       <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
index c0b14324d2..22e8257273 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
@@ -45,20 +45,20 @@
           <div class="button--group">
             <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
               var="ruleAction" varStatus="status">
-              <s:fragment
+              <ui:fragment
                 rendered="#{copyTransOptionsModel.contextMismatchAction ne ruleAction.action}">
                 <input id="#{status.index}:contextMismatch"
                   name="contextMismatch"
                   value="#{ruleAction.action}" type="radio"
                   class="form__item__input js-radio"/>
-              </s:fragment>
-              <s:fragment
+              </ui:fragment>
+              <ui:fragment
                 rendered="#{copyTransOptionsModel.contextMismatchAction eq ruleAction.action}">
                 <input id="#{status.index}:contextMismatch"
                   name="contextMismatch"
                   value="#{ruleAction.action}" type="radio"
                   class="form__item__input js-radio" checked="true"/>
-              </s:fragment>
+              </ui:fragment>
               <label for="#{status.index}:contextMismatch"
                 class="button button--small #{ruleAction.cssClass}">
                 #{ruleAction.displayText}
@@ -83,20 +83,20 @@
           <div class="button--group">
             <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
               var="ruleAction" varStatus="status">
-              <s:fragment
+              <ui:fragment
                 rendered="#{copyTransOptionsModel.projectMismatchAction ne ruleAction.action}">
                 <input id="#{status.index}:projectMismatch"
                   name="projectMismatch"
                   value="#{ruleAction.action}" type="radio"
                   class="form__item__input js-radio"/>
-              </s:fragment>
-              <s:fragment
+              </ui:fragment>
+              <ui:fragment
                 rendered="#{copyTransOptionsModel.projectMismatchAction eq ruleAction.action}">
                 <input id="#{status.index}:projectMismatch"
                   name="projectMismatch"
                   value="#{ruleAction.action}" type="radio"
                   class="form__item__input js-radio" checked="true"/>
-              </s:fragment>
+              </ui:fragment>
               <label for="#{status.index}:projectMismatch"
                 class="button button--small #{ruleAction.cssClass}">
                 #{ruleAction.displayText}
@@ -123,20 +123,20 @@
           <div class="button--group">
             <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
               var="ruleAction" varStatus="status">
-              <s:fragment
+              <ui:fragment
                 rendered="#{copyTransOptionsModel.docIdMismatchAction ne ruleAction.action}">
                 <input id="#{status.index}:docIdMismatch"
                   name="docIdMismatch"
                   value="#{ruleAction.action}" type="radio"
                   class="form__item__input js-radio"/>
-              </s:fragment>
-              <s:fragment
+              </ui:fragment>
+              <ui:fragment
                 rendered="#{copyTransOptionsModel.docIdMismatchAction eq ruleAction.action}">
                 <input id="#{status.index}:docIdMismatch"
                   name="docIdMismatch"
                   value="#{ruleAction.action}" type="radio"
                   class="form__item__input js-radio" checked="true"/>
-              </s:fragment>
+              </ui:fragment>
               <label for="#{status.index}:docIdMismatch"
                 class="button button--small #{ruleAction.cssClass}">
                 #{ruleAction.displayText}
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
index 0cbc39489b..e49e23abe0 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
@@ -25,7 +25,7 @@
 
       <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
         <div class="g--tight">
-          <s:div styleClass="g__item txt--align-right"
+          <h:panelGroup layout="block"  styleClass="g__item txt--align-right"
             id="copy-trans-buttons">
             <button styleClass="button--primary" jsfc="a4j:commandButton"
               rendered="#{!copyTransAction.inProgress}"
@@ -34,7 +34,7 @@
             <button styleClass="button--danger" jsfc="a4j:commandButton"
               rendered="#{copyTransAction.inProgress}"
               onclick="cancelCopyTrans()" value="#{msgs['jsf.Cancel']}"></button>
-          </s:div>
+          </h:panelGroup>
         </div>
       </footer>
     </div>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
index 467930c087..7feb7f9633 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
@@ -15,28 +15,28 @@
     </div>
     <ui:param name="activities" value="#{activityAction.getActivities()}"/>
     <h:form id="activity-list-form" styleClass="l--push-bottom-0">
-      <s:fragment rendered="#{activities.isEmpty()}">
+      <ui:fragment rendered="#{activities.isEmpty()}">
         <div class="l--pad-all-half bg--high">
           <p><em>#{msgs['jsf.YouHaveNoActivity']}</em></p>
 
           <p class="txt--meta">#{msgs['jsf.NoActivityMessage']}</p>
         </div>
-      </s:fragment>
-      <s:fragment rendered="#{not activities.isEmpty()}">
+      </ui:fragment>
+      <ui:fragment rendered="#{not activities.isEmpty()}">
         <ul id="activity-list" class="list--panel loader__container">
           <ui:repeat value="#{activities}" var="activity">
             <li class="l--pad-all-half bg--higher--hover bg--faint reveal">
               <zanata:activity-entry value="#{activity}" hideInfo="true"/>
             </li>
           </ui:repeat>
-          <s:fragment rendered="#{activityAction.hasMoreActivities()}">
+          <ui:fragment rendered="#{activityAction.hasMoreActivities()}">
             <a id="moreActivity" href="javascript:void(0)"
               class="d--top loader" onclick="loadNextActivity()">
               <span class="loader__label">#{msgs['jsf.moreActivity']}</span>
             </a>
-          </s:fragment>
+          </ui:fragment>
         </ul>
-      </s:fragment>
+      </ui:fragment>
     </h:form>
   </div>
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
index d22c63fe05..261a4095bc 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
@@ -26,7 +26,7 @@
               <span class="is-invisible">#{msgs['jsf.dashboard.projects.maintainedProjects.label']}</span>
             </a>
           </li>
-          <s:fragment rendered="#{identity.hasPermission(projectHome.instance, 'insert')}">
+          <ui:fragment rendered="#{identity.hasPermission(projectHome.instance, 'insert')}">
             <li class="tab__end">
               <a href="#" jsfc="s:link"
                 id="create-project-link"
@@ -36,7 +36,7 @@
                 <span class="is-invisible">#{msgs['jsf.dashboard.projects.newProject.label']}</span>
               </a>
             </li>
-          </s:fragment>
+          </ui:fragment>
         </ul>
       </nav>
       <div class="tabs__content">
@@ -75,23 +75,23 @@
                       </li>
                       <ui:repeat value="#{project.projectIterations}" var="version">
                         <li class="txt--nowrap">
-                          <s:link view="/iteration/view.xhtml" propagation="none">
+                          <h:link outcome="/iteration/view.xhtml">
                             <f:param name="projectSlug" value="#{project.slug}"/>
                             <f:param name="iterationSlug" value="#{version.slug}"/>
                             <zanata:version-label version="#{version}"/>
-                          </s:link>
+                          </h:link>
                         </li>
                       </ui:repeat>
                       <li>
-                        <s:link view="/project/project.xhtml" propagation="none">
+                        <h:link outcome="/project/project.xhtml">
                           <f:param name="slug" value="#{project.slug}"/>
                           <h:outputText value="#{msgs['jsf.dashboard.projects.allVersions.label']}"/>
-                        </s:link>
+                        </h:link>
                       </li>
                     </ul>
                   </div>
                 </div>
-                <s:link view="/project/project.xhtml" propagation="none">
+                <h:link outcome="/project/project.xhtml">
                   <f:param name="slug" value="#{project.slug}"/>
                   <div class="list__item__content">
                     <div class="list__item__info">
@@ -105,7 +105,7 @@
                       </span>
                     </div>
                   </div>
-                </s:link>
+                </h:link>
               </li>
             </ui:repeat>
           </ul>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
index 08d030036c..679c46cd7d 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
@@ -58,11 +58,11 @@
         <h:form id="email-update-form" styleClass="l--constrain-large l--push-top-1">
           <div class="form__item l--push-bottom-1">
               <h:outputLabel for="email">#{msgs['jsf.Email']}</h:outputLabel>
-              <s:decorate id="emailField" template=" ../field.xhtml" enclose="true">
+              <zanata:decorate id="emailField" componentId="email">
                 <h:inputText id="email" value="#{userSettingsAction.emailAddress}"
                   maxlength="255">
                 </h:inputText>
-              </s:decorate>
+              </zanata:decorate>
           </div>
           <input id="updateEmailButton" type="submit"
             value="Update email"
@@ -75,7 +75,7 @@
           </a4j:status>
         </h:form>
         <hr/>
-        <s:fragment rendered="#{applicationConfiguration.internalAuth}">
+        <ui:fragment rendered="#{applicationConfiguration.internalAuth}">
           <h3 class="heading--secondary">
             <h:outputText rendered="#{not userSettingsAction.passwordSet}"
               value="#{msgs['jsf.dashboard.settings.setPassword.label']}"/>
@@ -83,19 +83,18 @@
               value="#{msgs['jsf.dashboard.settings.changePassword.label']}"/>
           </h3>
           <h:form id="passwordChangeForm" styleClass="l--constrain-large js-form-password-parent">
-            <s:fragment rendered="#{userSettingsAction.passwordSet}">
+            <ui:fragment rendered="#{userSettingsAction.passwordSet}">
               <div class="form__item">
                 <h:outputLabel for="oldPassword">#{msgs['jsf.OldPassword']}</h:outputLabel>
-                <s:decorate id="oldPasswordField" template=" ../field.xhtml" enclose="false">
+                <zanata:decorate id="oldPasswordField" componentId="oldPassword">
                   <h:inputSecret id="oldPassword" value="#{userSettingsAction.oldPassword}"
                     maxlength="255"/>
-                </s:decorate>
+                </zanata:decorate>
               </div>
-            </s:fragment>
+            </ui:fragment>
             <div class="form__item l--push-bottom-1">
               <h:outputLabel for="newPassword">#{msgs['jsf.NewPassword']}</h:outputLabel>
-              <s:decorate id="newPasswordField" template=" ../field.xhtml"
-                enclose="false">
+              <zanata:decorate id="newPasswordField" componentId="newPassword">
                 <div class="form__password js-form-password">
                   <h:inputSecret id="newPassword"
                     value="#{userSettingsAction.newPassword}"
@@ -104,7 +103,7 @@
                   <a href="#"
                     class="form__toggle js-form-password-toggle">Show</a>
                 </div>
-              </s:decorate>
+              </zanata:decorate>
             </div>
             <input id="changePasswordButton" type="submit"
               value="Update password" styleClass="button"
@@ -116,9 +115,9 @@
               <f:facet name="start"><zanata:loader layout="inline" type="loader--small"/></f:facet>
             </a4j:status>
           </h:form>
-        </s:fragment>
+        </ui:fragment>
         <hr/>
-        <s:fragment rendered="#{applicationConfiguration.multiAuth}">
+        <ui:fragment rendered="#{applicationConfiguration.multiAuth}">
           <h3 class="heading--secondary">
             #{msgs['jsf.dashboard.settings.connectedAccounts.label']}
           </h3>
@@ -182,9 +181,9 @@
           <hr/>
           <h:form>
             <p>
-              <s:link styleClass="button button--warning" view="/profile/merge_account.xhtml">
+              <h:link styleClass="button button--warning" outcome="/profile/merge_account.xhtml">
                 #{msgs['jsf.dashboard.settings.mergeAccounts.label']}
-              </s:link>
+              </h:link>
             </p>
             <small class="txt--meta">
               #{msgs['jsf.dashboard.settings.mergeAccount.info.label'] }
@@ -193,7 +192,7 @@
               </span>
             </small>
           </h:form>
-        </s:fragment>
+        </ui:fragment>
       </li>
       <li id="profile-content">
         <h2 class="l--push-top-0 gamma d--bottom">
@@ -211,11 +210,11 @@
           </div>
           <div class="form__item">
             <h:outputLabel for="nameField">#{msgs['jsf.Name']}</h:outputLabel>
-            <s:decorate id="nameField" template=" ../field.xhtml" enclose="true">
+            <zanata:decorate id="nameField" componentId="name">
               <h:inputText id="accountName" value="#{userSettingsAction.accountName}"
                 maxlength="80">
               </h:inputText>
-            </s:decorate>
+            </zanata:decorate>
           </div>
           <a4j:jsFunction name="updateProfile"
             action="#{userSettingsAction.updateProfile}"
@@ -254,9 +253,9 @@
               </li>
             </ui:repeat>
           </ul>
-          <s:link styleClass="button"
+          <h:link styleClass="button"
             value="#{msgs['jsf.dashboard.settings.joinLangTeam.message']}"
-            view="/language/home.xhtml"/>
+            outcome="/language/home.xhtml"/>
         </h:form>
       </li>
       <li id="client">
@@ -284,18 +283,18 @@
             <label for="apiKey">
               #{msgs['jsf.dashboard.settings.apiKey.label']}
             </label>
-            <s:fragment id="no_api_key"
+            <ui:fragment id="no_api_key"
               rendered="#{not userSettingsAction.apiKeyGenerated}">
                 <p>#{msgs['jsf.NotGenerated']}</p>
-            </s:fragment>
-            <s:fragment id="api_key"
+            </ui:fragment>
+            <ui:fragment id="api_key"
               rendered="#{userSettingsAction.apiKeyGenerated}">
               <p>#{msgs['jsf.YourCurrentApiKeyIs']}
                 <input id="apiKey" type="text" class="js-form__input--copyable"
                   value="#{userSettingsAction.accountApiKey}" readonly=""
                   size="30"/>
               </p>
-            </s:fragment>
+            </ui:fragment>
           </div>
           <script>
             function confirmGenerateApiKey() {
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
index f03d52493e..b9a4602d9e 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
@@ -1,9 +1,10 @@
-<s:fragment
+<ui:fragment
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:rich="http://richfaces.org/rich">
   <ul class="g">
     <li class="g__item w--1-2 w--1-2-s l--push-bottom-half">
@@ -14,7 +15,7 @@
           class="stats__unit">#{msgs['jsf.activity.wordsTranslated']}</span>
       </span>
     </li>
-    <s:fragment rendered="#{dashboardAction.isUserReviewer()}">
+    <ui:fragment rendered="#{dashboardAction.isUserReviewer()}">
       <li class="g__item w--1-2 w--1-2-s l--push-bottom-half">
       <span class="stats">
         <span
@@ -23,7 +24,7 @@
           class="stats__unit">#{msgs['jsf.activity.wordsReviewed']}</span>
       </span>
       </li>
-    </s:fragment>
+    </ui:fragment>
     <li class="g__item w--1-2 w--1-2-s l--push-bottom-half">
       <span class="stats">
         <span
@@ -32,7 +33,7 @@
           class="stats__unit">#{msgs['jsf.activity.messagesTranslated']}</span>
       </span>
     </li>
-    <s:fragment rendered="#{dashboardAction.isUserReviewer()}">
+    <ui:fragment rendered="#{dashboardAction.isUserReviewer()}">
       <li class="g__item w--1-2 w--1-2-s l--push-bottom-half">
       <span class="stats">
         <span
@@ -41,7 +42,7 @@
           class="stats__unit">#{msgs['jsf.activity.messagesReviewed']}</span>
       </span>
       </li>
-    </s:fragment>
+    </ui:fragment>
     <li class="g__item w--1-2 w--1-2-s l--push-bottom-half">
       <span class="stats">
         <span
@@ -50,7 +51,7 @@
           class="stats__unit">#{msgs['jsf.activity.documentsTranslated']}</span>
       </span>
     </li>
-    <s:fragment rendered="#{dashboardAction.isUserReviewer()}">
+    <ui:fragment rendered="#{dashboardAction.isUserReviewer()}">
       <li class="g__item w--1-2 w--1-2-s l--push-bottom-half">
       <span class="stats">
         <span
@@ -59,6 +60,6 @@
           class="stats__unit">#{msgs['jsf.activity.documentsReviewed']}</span>
       </span>
       </li>
-    </s:fragment>
+    </ui:fragment>
   </ul>
-</s:fragment>
+</ui:fragment>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
index 2095c6ca1e..6780b666b5 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
@@ -48,7 +48,7 @@
 
       <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
         <div class="g--tight">
-          <s:div styleClass="g__item txt--align-right"
+          <h:panelGroup layout="block"  styleClass="g__item txt--align-right"
             id="delete-confirmation-buttons">
             <button id="cancelDelete" onclick="zanata.modal.hide('#delete-confirmation-modal');return false;"
               class="cancel button--link l--push-right-half" data-dismiss="modal">
@@ -57,7 +57,7 @@
 
             <button id="deleteButton" styleClass="button--danger" jsfc="a4j:commandButton" binding="#{deleteButton}" disabled="true"
               value="#{msgs['jsf.Delete']}"></button>
-          </s:div>
+          </h:panelGroup>
         </div>
       </footer>
     </div>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
deleted file mode 100644
index f80951c7b4..0000000000
--- a/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:ui="http://java.sun.com/jsf/facelets"
-  xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:f="http://java.sun.com/jsf/core"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
-
-  <div class="prop">
-
-    <s:label styleClass="name #{invalid?'errors':''}">
-      <ui:insert name="label"/>
-      <s:span styleClass="required" rendered="#{required}">*</s:span>
-    </s:label>
-
-        <span class="value #{invalid?'errors':''}">
-            <s:validateAll>
-              <ui:insert/>
-            </s:validateAll>
-        </span>
-
-        <span class="value #{invalid?'errors':''} errorsMessage">
-        <s:span styleClass="icon-cancel-circle-2 errors" rendered="#{invalid}"/>
-          <s:message styleClass="errors"/>
-        </span>
-  </div>
-
-</ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
deleted file mode 100644
index d7717e024e..0000000000
--- a/zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:ui="http://java.sun.com/jsf/facelets"
-  xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:f="http://java.sun.com/jsf/core"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
-
-  <s:validateAll>
-    <div class="#{invalid ? 'form__item--error' : ''}">
-      <ui:insert/>
-      <s:div styleClass="message--danger app-error" rendered="#{invalid}">
-        <s:message/>
-      </s:div>
-    </div>
-  </s:validateAll>
-
-</ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
index 582e3109d7..cb95fc2ac6 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
@@ -1,6 +1,6 @@
 <div xmlns="http://www.w3.org/1999/xhtml"
   xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:c="http://java.sun.com/jsf/core"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   class="modal" id="glossaryUploadDialog" tabindex="-1" role="dialog"
@@ -11,14 +11,14 @@
       zanata.loader.deactivate('#upload-glossary-loader');
       enableUploadGlossaryButton(false);
       enableWarningMessage(false);
-
-      getUploadGlossaryFileComponent().change(function() {
-        if (getUploadGlossaryFileName() != '') {
-          processDetailsSection(getUploadGlossaryFileName().toUpperCase());
-        }
-      });
     });
 
+    function onGlossaryFileSubmitted() {
+      if (getUploadGlossaryFileName() != '') {
+        processDetailsSection(getUploadGlossaryFileName().toUpperCase());
+      }
+    }
+
     function processDetailsSection(fileName) {
       var fileExtension = getFileExtension(fileName);
       enableWarningMessage(false);
@@ -52,18 +52,13 @@
       }
     }
 
-    function getUploadGlossaryFileComponent() {
-      return jQuery('#' + jqSelector('#{rich:clientId('glossary-file-upload')}'));
-    }
-
     function getUploadGlossaryFileName() {
-      return getUploadGlossaryFileComponent().val();
+      return jQuery('.rf-fu-itm-lbl').text();
     }
 
     function cancelUploadGlossary() {
       enableUploadGlossaryButton(false);
       zanata.loader.deactivate('#upload-glossary-loader');
-      getUploadGlossaryFileComponent().val('');
       jQuery('#lang-selection').addClass('is-hidden');
     }
 
@@ -106,16 +101,19 @@
       </button>
     </header>
 
-    <h:form id="upload-glossary-form" styleClass="l--push-bottom-0" enctype="multipart/form-data">
+    <h:form id="upload-glossary-form" styleClass="l--push-bottom-0" >
       <div class="modal__content l--pad-all-1">
         <div class="form__item txt--understated" id="message">
           <span>#{msgs['jsf.Glossary.supportedFileFormat']}</span>
         </div>
         <div class="form__item">
-          <s:fileUpload id="glossary-file-upload" accept="*"
-            data="#{glossaryAction.glossaryFileUpload.fileContents}"
-            fileName="#{glossaryAction.glossaryFileUpload.fileName}">
-          </s:fileUpload>
+          <rich:fileUpload id="upload-file"
+            fileUploadListener="#{glossaryAction.glossaryFileUploaded}"
+            onfilesubmit="onGlossaryFileSubmitted()"
+            addControlLabel="Select file..." clearAllLabel="Clear all" clearLabel="Clear"
+            uploadLabel="upload" immediateUpload="true" maxFilesQuantity="1"
+            listHeight="100"
+            />
         </div>
 
         <div class="form__item is-hidden" id="lang-selection">
@@ -128,10 +126,10 @@
             </label>
             <h:selectOneMenu
               value="#{glossaryAction.glossaryFileUpload.sourceLang}">
-              <s:selectItems value="#{glossaryAction.availableLocales}"
+              <c:selectItems value="#{glossaryAction.availableLocales}"
                 var="locale"
-                label="#{locale.localeId.id}  -  #{locale.retrieveNativeName()}"
-                itemValue="#{locale.localeId.id}" escape="true"/>
+                itemLabel="#{locale.localeId.id}  -  #{locale.retrieveNativeName()}"
+                itemValue="#{locale.localeId.id}" itemLabelEscaped="true"/>
             </h:selectOneMenu>
           </div>
           <div>
@@ -143,10 +141,10 @@
             </label>
             <h:selectOneMenu
               value="#{glossaryAction.glossaryFileUpload.transLang}">
-              <s:selectItems value="#{glossaryAction.availableLocales}"
+              <c:selectItems value="#{glossaryAction.availableLocales}"
                 var="locale"
-                label="#{locale.localeId.id}  -  #{locale.retrieveNativeName()}"
-                itemValue="#{locale.localeId.id}" escape="true"/>
+                itemLabel="#{locale.localeId.id}  -  #{locale.retrieveNativeName()}"
+                itemValue="#{locale.localeId.id}" itemLabelEscaped="true"/>
             </h:selectOneMenu>
           </div>
         </div>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
index c56e8706ac..493ca55dd5 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
@@ -1,6 +1,6 @@
 <div xmlns="http://www.w3.org/1999/xhtml"
   xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
   class="modal" id="contactCoordinatorDialog" tabindex="-1" role="dialog"
@@ -50,12 +50,12 @@
     <h:form id="contactCoordinatorForm" styleClass="l--push-bottom-0">
 
       <div class="modal__content l--pad-all-1">
-        <s:decorate id="messageField" template="/WEB-INF/layout/field.xhtml">
+        <zanata:decorate id="messageField" componentId="message">
           <h:inputTextarea id="contact-coordinator-message" value="#{languageContactCoordinatorAction.message}"
             styleClass="l--push-bottom-0">
-            <a4j:ajax event="blur" execute="@this"/>
+            <a4j:ajax event="blur" render="message" execute="@this"/>
           </h:inputTextarea>
-        </s:decorate>
+        </zanata:decorate>
       </div>
 
       <a4j:jsFunction name="sendContactCoordinatorEmail" execute="@form"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
index 06476e27bb..d96ac6eb2a 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
@@ -9,7 +9,7 @@
   <div class="panel">
     <div class="panel__header">
       <div class="panel__header__actions">
-        <s:fragment
+        <ui:fragment
           rendered="#{identity.loggedIn and identity.hasPermission(languageAction.locale, 'manage-language-team')}">
           <a href="#" class="button button--snug l--push-all-half"
             id="add-team-member-button"
@@ -18,7 +18,7 @@
             title="#{msgs['jsf.AddTeamMember']}">
             <i class="i i--plus"></i>
           </a>
-        </s:fragment>
+        </ui:fragment>
       </div>
       <h2 class="panel__heading">#{msgs['jsf.Members']}</h2>
     </div>
@@ -39,10 +39,10 @@
     </a4j:status>
 
     <h:form id="members-form" styleClass="l--push-bottom-1">
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{empty languageAction.localeMembers}">
         <p class="txt--meta">#{msgs['jsf.language.members.empty']}</p>
-        <s:fragment
+        <ui:fragment
           rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}">
           <p>
             <a id="addTeamMemberLink" href="#" class="button--primary"
@@ -52,21 +52,21 @@
               <i class="i i--plus i__item__icon"></i>
             </a>
           </p>
-        </s:fragment>
-      </s:div>
+        </ui:fragment>
+      </h:panelGroup>
 
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{not empty languageAction.localeMembers and empty languageAction.membersFilter.currentPage}">
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-      </s:div>
+      </h:panelGroup>
 
 
-      <s:fragment rendered="#{not empty languageAction.membersFilter.currentPage}">
+      <ui:fragment rendered="#{not empty languageAction.membersFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat value="#{languageAction.membersFilter.currentPage}" var="member">
             <li
               class="#{identity.hasPermission(languageAction.locale, 'manage-language-team') ? 'list__item--actionable' : 'l--pad-all-quarter'}">
-              <s:div styleClass="list__item__action"
+              <h:panelGroup layout="block"  styleClass="list__item__action"
                 rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}">
                 <div
                   class="dropdown dropdown--small dropdown--inline dropdown--single list__item__dropdown js-dropdown">
@@ -85,7 +85,7 @@
                     </li>
                   </ul>
                 </div>
-              </s:div>
+              </h:panelGroup>
 
               <div class="list__item__content">
                 <div class="list__item__info">
@@ -93,7 +93,7 @@
                     #{member.person.name}
                   </h3>
               <span class="list__item__meta">
-                #{member.person.account.username}<s:span rendered="#{identity.hasRole('admin')}"> [#{member.person.email}] </s:span>
+                #{member.person.account.username}<h:panelGroup layout="span" rendered="#{identity.hasRole('admin')}"> [#{member.person.email}] </h:panelGroup>
               </span>
                 </div>
                 <div class="list__item__actions">
@@ -105,15 +105,15 @@
                         <a4j:ajax event="change" execute="@this"
                           listener="#{languageAction.saveTeamTranslator(member)}"/>
                       </h:selectBooleanCheckbox>
-                      <s:fragment
+                      <ui:fragment
                         rendered="#{not identity.hasPermission(languageAction.locale, 'manage-language-team')}">
-                        <s:fragment rendered="#{member.translator}">
+                        <ui:fragment rendered="#{member.translator}">
                           <i class="i i--checkmark"></i>
-                        </s:fragment>
-                        <s:fragment rendered="#{not member.translator}">
+                        </ui:fragment>
+                        <ui:fragment rendered="#{not member.translator}">
                           <i class="i i--cancel"></i>
-                        </s:fragment>
-                      </s:fragment>
+                        </ui:fragment>
+                      </ui:fragment>
                     </li>
                     <li>
                       #{msgs['jsf.Reviewer']}
@@ -122,15 +122,15 @@
                         <a4j:ajax event="change" execute="@this"
                           listener="#{languageAction.saveTeamReviewer(member)}"/>
                       </h:selectBooleanCheckbox>
-                      <s:fragment
+                      <ui:fragment
                         rendered="#{not identity.hasPermission(languageAction.locale, 'manage-language-team')}">
-                        <s:fragment rendered="#{member.reviewer}">
+                        <ui:fragment rendered="#{member.reviewer}">
                           <i class="i i--checkmark"></i>
-                        </s:fragment>
-                        <s:fragment rendered="#{not member.reviewer}">
+                        </ui:fragment>
+                        <ui:fragment rendered="#{not member.reviewer}">
                           <i class="i i--cancel"></i>
-                        </s:fragment>
-                      </s:fragment>
+                        </ui:fragment>
+                      </ui:fragment>
                     </li>
 
                     <li>
@@ -140,15 +140,15 @@
                         <a4j:ajax event="change" execute="@this"
                           listener="#{languageAction.saveTeamCoordinator(member)}"/>
                       </h:selectBooleanCheckbox>
-                      <s:fragment
+                      <ui:fragment
                         rendered="#{not identity.hasPermission(languageAction.locale, 'manage-language-team')}">
-                        <s:fragment rendered="#{member.coordinator}">
+                        <ui:fragment rendered="#{member.coordinator}">
                           <i class="i i--checkmark"></i>
-                        </s:fragment>
-                        <s:fragment rendered="#{not member.coordinator}">
+                        </ui:fragment>
+                        <ui:fragment rendered="#{not member.coordinator}">
                           <i class="i i--cancel"></i>
-                        </s:fragment>
-                      </s:fragment>
+                        </ui:fragment>
+                      </ui:fragment>
                     </li>
                   </ul>
                 </div>
@@ -157,7 +157,7 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
+      </ui:fragment>
     </h:form>
 
     <zanata:list-filter listId="members-form"
@@ -167,9 +167,9 @@
       actionBean="#{languageAction.membersFilter}"/>
 
   </div>
-  <s:fragment
+  <ui:fragment
     rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}">
     <ui:include src="search_user_modal.xhtml"/>
-  </s:fragment>
+  </ui:fragment>
 
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
index 7f4bbb23b7..9bd2d80180 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
@@ -82,7 +82,7 @@
 
         </zanata:autocomplete>
 
-        <s:div id="localeNameMsgs" styleClass="txt--warning">
+        <h:panelGroup layout="block"  id="localeNameMsgs" styleClass="txt--warning">
           <h:outputText
             value="#{languageManagerAction.languageNameValidationMessage}"
             rendered="#{not languageManagerAction.getQuery().contains('_')}"
@@ -97,7 +97,7 @@
             value="#{languageManagerAction.languageNameWarningMessage}"
             rendered="#{languageManagerAction.languageNameWarningMessage != null}"
             styleClass="txt--warning"/>
-        </s:div>
+        </h:panelGroup>
 
         <div class="form__item l--push-top-half checkbox">
           <h:outputLabel
@@ -106,7 +106,7 @@
             value="#{languageManagerAction.enabledByDefault}"/>
         </div>
 
-        <s:div id="output" styleClass="txt--mini l--push-v-half">
+        <h:panelGroup layout="block"  id="output" styleClass="txt--mini l--push-v-half">
           <div class="l--push-top-half">
             #{msgs['jsf.CountryCode']}<span
             class="txt--meta l--push-h-half">#{languageManagerAction.ULocale.country}</span>
@@ -127,7 +127,7 @@
             #{msgs['jsf.NativeName']}<span
             class="txt--meta l--push-h-half">#{languageManagerAction.ULocale.getDisplayName(languageManagerAction.ULocale)}</span>
           </div>
-        </s:div>
+        </h:panelGroup>
       </div>
 
       <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
index 1317e57977..86b40248f9 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
@@ -2,6 +2,7 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   class="modal" id="joinLanguageDialog" tabindex="-1" role="dialog"
@@ -47,35 +48,35 @@
       <div class="modal__content l--pad-all-1">
         <div class="form__item" id="roles">
           <span class="l--push-bottom-quarter">#{msgs['jsf.RequestRoleAs']}</span>
-          <s:fragment rendered="#{!languageJoinAction.isTranslator()}">
+          <ui:fragment rendered="#{!languageJoinAction.isTranslator()}">
             <zanata:checkbox id="translatorChk" value="translator"
               checked="#{languageJoinAction.requestAsTranslator}"
               onValueChanged="bindRole" label="#{msgs['jsf.Translator']}"/>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment rendered="#{!languageJoinAction.isReviewer()}">
+          <ui:fragment rendered="#{!languageJoinAction.isReviewer()}">
             <zanata:checkbox value="reviewer" checked="#{languageJoinAction.requestAsReviewer}"
               onValueChanged="bindRole" label="#{msgs['jsf.Reviewer']}"/>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment rendered="#{!languageJoinAction.isCoordinator()}">
+          <ui:fragment rendered="#{!languageJoinAction.isCoordinator()}">
             <zanata:checkbox value="coordinator" checked="#{languageJoinAction.requestAsCoordinator}"
               onValueChanged="bindRole" label="#{msgs['jsf.Coordinator']}"/>
-          </s:fragment>
+          </ui:fragment>
         </div>
 
-        <s:decorate id="messageField" template="/WEB-INF/layout/field.xhtml">
+        <zanata:decorate id="message" componentId="messageField">
           <span>#{msgs['jsf.AdditionalInfo']}</span>
           <span class="txt--meta bx--block">#{msgs['jsf.language.email.AdditionalInfoMessage']}</span>
           <h:inputTextarea id="request-join-message" value="#{languageJoinAction.message}"
             styleClass="l--push-bottom-0">
             <a4j:ajax event="blur" render="messageField" execute="@this"/>
           </h:inputTextarea>
-        </s:decorate>
+        </zanata:decorate>
       </div>
 
       <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
-        <s:div id="request-join-buttons" styleClass="txt--align-right">
+        <h:panelGroup layout="block"  id="request-join-buttons" styleClass="txt--align-right">
           <h:outputScript rendered="#{not languageJoinAction.hasSelectedRole()}">
             $(document).ready(function() {
               jQuery(getJoinLanguageForm()).find('#request-join-language-send-button').attr('disabled', true);
@@ -92,7 +93,7 @@
             onclick="sendJoinLanguageEmail();return false;">
             <span class="loader__label">#{msgs['jsf.email.Send']}</span>
           </button>
-        </s:div>
+        </h:panelGroup>
       </footer>
     </h:form>
   </div>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
index 07fdf4fe70..06534c12db 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
@@ -64,7 +64,7 @@
             rendered="#{empty languageAction.searchResults}"
             value="#{msgs['jsf.search.NoResult']}"/>
 
-          <s:fragment rendered="#{not empty languageAction.searchResults}">
+          <ui:fragment rendered="#{not empty languageAction.searchResults}">
             <ul class="list--slat">
               <ui:repeat value="#{languageAction.searchResults}"
                 var="selectablePerson">
@@ -97,7 +97,7 @@
                 </li>
               </ui:repeat>
             </ul>
-          </s:fragment>
+          </ui:fragment>
         </a4j:outputPanel>
       </h:form>
     </div>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
index 210b16f821..50eac089a2 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
@@ -1,7 +1,6 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
@@ -30,13 +29,13 @@
             <i class="i i--info"
               title="#{msgs.format('jsf.language.displayName.placeholder',languageAction.locale.retrieveDefaultDisplayName())}"></i>
           </span>
-          <s:decorate id="nameField" template="../field.xhtml" enclose="true">
+          <zanata:decorate id="name" componentId="nameField">
             <h:inputText id="name" placeholder="#{msgs.format('jsf.language.displayName.placeholder',languageAction.locale.retrieveDefaultDisplayName())}"
               maxlength="100" value="#{languageAction.locale.displayName}">
               <rich:placeholder value="#{msgs.format('jsf.language.displayName.placeholder',languageAction.locale.retrieveDefaultDisplayName())}" styleClass="txt--neutral"/>
               <a4j:ajax event="blur" render="nameField" execute="@this" limitRender="true"/>
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="quarter form__item">
@@ -45,13 +44,13 @@
             <i class="i i--info"
               title="#{msgs.format('jsf.language.nativeName.placeholder',languageAction.locale.retrieveDefaultNativeName())}"></i>
           </span>
-          <s:decorate id="nativeNameField" template="../field.xhtml" enclose="true">
+          <zanata:decorate id="nativeName" componentId="nativeNameField">
             <h:inputText id="nativeName" placeholder="#{msgs.format('jsf.language.nativeName.placeholder',languageAction.locale.retrieveDefaultNativeName())}"
               maxlength="100" value="#{languageAction.locale.nativeName}">
               <rich:placeholder value="#{msgs.format('jsf.language.nativeName.placeholder',languageAction.locale.retrieveDefaultNativeName())}" styleClass="txt--neutral"/>
               <a4j:ajax event="blur" render="nativeNameField" execute="@this" limitRender="true"/>
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="l--push-top-quarter form__item">
@@ -82,14 +81,14 @@
             title="#{msgs['jsf.language.plurals.help']}" target="_blank">
             <i class="i i--help"></i>
           </a>
-          <s:decorate id="pluralFormsField" template="../field.xhtml" enclose="true">
+          <zanata:decorate id="pluralForms" componentId="pluralFormsField">
             <h:inputText id="pluralForms" placeholder="#{languageAction.pluralsPlaceholder}"
               maxlength="100" value="#{languageAction.locale.pluralForms}"
               valueChangeListener="#{languageAction.validatePluralForms}">
               <rich:placeholder value="#{languageAction.pluralsPlaceholder}" styleClass="txt--neutral"/>
               <a4j:ajax event="blur" render="pluralFormsField" execute="@this" limitRender="true"/>
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="l--push-top-quarter form__item">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
index 8eb777d904..d51e311aab 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
@@ -1,6 +1,6 @@
-<s:fragment
+<ui:fragment
   xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
@@ -24,11 +24,11 @@
     <div class="g__item w--1-2">
       <div class="form__item">
         <h:outputLabel for="name">#{msgs['jsf.ProjectName']}</h:outputLabel>
-        <s:decorate id="nameField" template="../field.xhtml" enclose="true">
+        <zanata:decorate id="name" componentId="nameField">
           <h:inputText id="name" required="true" maxlength="80"
             value="#{projectHome.instance.name}">
           </h:inputText>
-        </s:decorate>
+        </zanata:decorate>
       </div>
     </div>
     <div class="g__item w--1-2">
@@ -38,7 +38,7 @@
           <span class="txt--meta"><i class="i i--info"
             title="#{msgs['jsf.SlugExample']}"></i></span>
         </h:outputLabel>
-        <s:decorate id="slugField" template="../field.xhtml" enclose="true">
+        <zanata:decorate id="slug" componentId="slugField">
           <h:inputText maxlength="40"
             id="slug" required="true"
             value="#{projectHome.inputSlugValue}"
@@ -46,7 +46,7 @@
             <f:validateLength minimum="1"/>
             <a4j:ajax event="blur" render="slugField" execute="@this"/>
           </h:inputText>
-        </s:decorate>
+        </zanata:decorate>
         <h:inputHidden id="projectId" value="#{projectHome.projectId}"/>
       </div>
     </div>
@@ -56,12 +56,12 @@
     <h:outputLabel for="descriptionField">#{msgs['jsf.ProjectDescription']}
       <span class="txt--meta">#{msgs['jsf.field.optional']}</span>
     </h:outputLabel>
-    <s:decorate id="descriptionField" template="../field.xhtml">
+    <zanata:decorate id="description" componentId="descriptionField">
       <h:inputTextarea id="description" required="false"
         value="#{projectHome.instance.description}">
         <f:validateLength maximum="100"/>
       </h:inputTextarea>
-    </s:decorate>
+    </zanata:decorate>
   </div>
 
   <h3
@@ -83,18 +83,18 @@
       <li>
         <div class="form__radio js-form__radio"
           onclick="onProjectTypeChanged(this)">
-          <s:fragment
+          <ui:fragment
             rendered="#{projectHome.instance.defaultProjectType.name() eq projectType.name()}">
             <input type="radio" name="project-type"
               class="form__radio__input js-form__radio__input"
               id="project-type-#{projectType.name()}" checked="true"/>
-          </s:fragment>
-          <s:fragment
+          </ui:fragment>
+          <ui:fragment
             rendered="#{projectHome.instance.defaultProjectType.name() ne projectType.name()}">
             <input type="radio" name="project-type"
               class="form__radio__input js-form__radio__input"
               id="project-type-#{projectType.name()}"/>
-          </s:fragment>
+          </ui:fragment>
           <label for="project-type-#{projectType.name()}"
             class="form__radio__label">#{projectType.name()} <span
             class="txt--meta">#{msgs['jsf.projectType.detail.'.concat(projectType)]}</span>
@@ -103,7 +103,7 @@
       </li>
     </ui:repeat>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{projectHome.managed and projectHome.instance.defaultProjectType eq null}">
       <li>
         <div class="form__radio js-form__radio"
@@ -118,6 +118,6 @@
           </label>
         </div>
       </li>
-    </s:fragment>
+    </ui:fragment>
   </ul>
-</s:fragment>
+</ui:fragment>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
index 9be5f02f74..0c8c86b52b 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
@@ -27,11 +27,11 @@
     </h:inputText>
   </div>
 
-  <s:fragment rendered="#{empty languages}">
+  <ui:fragment rendered="#{empty languages}">
     <div id="#{id}-no-languages" class="txt--meta">
       #{noLanguagesPlaceholder}
     </div>
-  </s:fragment>
+  </ui:fragment>
 
   <div class="#{ empty languages ? 'is-hidden' : ''}">
 
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
index 56ef996afc..19d9a8f7d4 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
@@ -23,7 +23,8 @@
         xmlns:h="http://java.sun.com/jsf/html"
         xmlns:a4j="http://richfaces.org/a4j"
         xmlns:rich="http://richfaces.org/rich"
-        xmlns:s="http://jboss.org/schema/seam/taglib">
+        xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
+        >
 
 <h2 class="l--push-all-0 gamma d--bottom">#{msgs['jsf.General']}</h2>
 
@@ -38,13 +39,13 @@
         <h:outputLabel for="homePage">#{msgs['jsf.project.HomePage']}
           <span class="txt--meta">#{msgs['jsf.field.optional']}</span>
         </h:outputLabel>
-        <s:decorate id="homePageField" template="../field.xhtml">
+        <zanata:decorate id="homePage" componentId="homePageField">
           <h:inputText id="homePage" required="false"
               value="#{projectHome.instance.sourceViewURL}">
             <rich:placeholder value="http://" styleClass="txt--neutral"/>
             <a4j:ajax event="blur" render="homePageField" execute="@this"/>
           </h:inputText>
-        </s:decorate>
+        </zanata:decorate>
 
         <p class="txt--meta">
           <h:outputText escape="false"
@@ -57,12 +58,12 @@
         <h:outputLabel for="repo">#{msgs['jsf.field.repository']}
           <span class="txt--meta">#{msgs['jsf.field.optional']}</span>
         </h:outputLabel>
-        <s:decorate id="repoField" template="../field.xhtml">
+        <zanata:decorate id="repo" componentId="repoField">
           <h:inputText id="repo" required="false"
               value="#{projectHome.instance.sourceCheckoutURL}">
             <a4j:ajax event="blur" render="repoField" execute="@this"/>
           </h:inputText>
-        </s:decorate>
+        </zanata:decorate>
 
         <p class="txt--meta">
           <h:outputText
@@ -83,8 +84,8 @@
 
   <hr/>
 
-  <s:div styleClass="g--tight" id="status">
-    <s:div styleClass="g__item w--1-2 l--push-bottom-1"
+  <h:panelGroup layout="block"  styleClass="g--tight" id="status">
+    <h:panelGroup layout="block"  styleClass="g__item w--1-2 l--push-bottom-1"
         rendered="#{projectHome.instance.status eq 'ACTIVE'}">
       <a4j:commandLink styleClass="button--warning l--push-bottom-half"
           id="button-lock-project"
@@ -93,14 +94,14 @@
       </a4j:commandLink>
 
       <p class="txt--meta">#{msgs['jsf.project.readonly.Message']}</p>
-    </s:div>
-    <s:div styleClass="g__item w--1-2 l--push-bottom-1"
+    </h:panelGroup>
+    <h:panelGroup layout="block"  styleClass="g__item w--1-2 l--push-bottom-1"
         rendered="#{projectHome.instance.status ne 'ACTIVE'}">
-      <s:fragment rendered="#{projectHome.instance.status eq 'OBSOLETE'}">
+      <ui:fragment rendered="#{projectHome.instance.status eq 'OBSOLETE'}">
         <button class="button--success l--push-bottom-half" disabled="disabled">
           <i class="i--left i--lock"></i> #{msgs['jsf.project.writable']}
         </button>
-      </s:fragment>
+      </ui:fragment>
       <a4j:commandLink styleClass="button--success l--push-bottom-half"
           id="button-unlock-project"
           rendered="#{projectHome.instance.status == 'READONLY'}"
@@ -109,11 +110,11 @@
       </a4j:commandLink>
 
       <p class="txt--meta">#{msgs['jsf.project.writable.Message']}</p>
-    </s:div>
+    </h:panelGroup>
 
-    <s:fragment
+    <ui:fragment
         rendered="#{identity.hasPermission(projectHome.instance, 'mark-obsolete')}">
-      <s:div styleClass="g__item w--1-2"
+      <h:panelGroup layout="block"  styleClass="g__item w--1-2"
           rendered="#{projectHome.instance.status ne 'OBSOLETE'}">
         <a href="javascript:void(0)" id="button-archive-project"
             class="button--danger l--push-bottom-half"
@@ -122,9 +123,9 @@
         </a>
 
         <p class="txt--meta">#{msgs['jsf.DeleteProject.Message']}</p>
-      </s:div>
-    </s:fragment>
-  </s:div>
+      </h:panelGroup>
+    </ui:fragment>
+  </h:panelGroup>
 </h:form>
 
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
index 1bdbdfedd5..72df729726 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
@@ -13,7 +13,7 @@
   </h2>
 
   <h:form id="settings-languages-form" styleClass="l--push-bottom-0">
-    <s:div id="settings-languages-list">
+    <h:panelGroup layout="block"  id="settings-languages-list">
 
       <button styleClass="button--small l--push-bottom-half" jsfc="a4j:commandButton"
         value="#{msgs['jsf.Language.useGlobal']}"
@@ -114,7 +114,7 @@
                       </button>
                     </div>
                     <ul class="dropdown__content js-dropdown__content">
-                      <s:fragment rendered="#{not projectHome.hasLocaleAlias(locale)}">
+                      <ui:fragment rendered="#{not projectHome.hasLocaleAlias(locale)}">
                         <li>
                           <h:outputLink id="addLocaleAliasLink"
                             styleClass="dropdown__content__link button--link i__item--left"
@@ -124,8 +124,8 @@
                             #{msgs['jsf.languages.AddAlias']}
                           </h:outputLink>
                         </li>
-                      </s:fragment>
-                      <s:fragment rendered="#{projectHome.hasLocaleAlias(locale)}">
+                      </ui:fragment>
+                      <ui:fragment rendered="#{projectHome.hasLocaleAlias(locale)}">
                         <li>
                           <h:outputLink id="editLocaleAliasLink"
                             styleClass="dropdown__content__link button--link i__item--left"
@@ -135,8 +135,8 @@
                             #{msgs['jsf.languages.EditAlias']}
                           </h:outputLink>
                         </li>
-                      </s:fragment>
-                      <s:fragment rendered="#{projectHome.hasLocaleAlias(locale)}">
+                      </ui:fragment>
+                      <ui:fragment rendered="#{projectHome.hasLocaleAlias(locale)}">
                         <li>
                           <button
                             class="dropdown__content__link button--link txt--danger i__item--left"
@@ -145,7 +145,7 @@
                             #{msgs['jsf.languages.DeleteAlias']}
                           </button>
                         </li>
-                      </s:fragment>
+                      </ui:fragment>
                     </ul>
                   </div>
                 </div>
@@ -270,7 +270,7 @@
 
       </ui:decorate>
 
-    </s:div>
+    </h:panelGroup>
   </h:form>
 
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
index 55ce6830f9..908ee1116a 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
@@ -169,14 +169,14 @@
     </ul>
     <hr/>
 
-    <s:div styleClass="l--push-bottom-half" id="user-roles">
+    <h:panelGroup layout="block"  styleClass="l--push-bottom-half" id="user-roles">
       <zanata:checkbox label="#{msgs['jsf.RestrictRoleAccessMessage']}"
         onValueChanged="onRestrictedByRoleValueChanged"
         labelStyle="js-reveal__toggle l--push-bottom-0"
         styleClass="js-form__restricted-by-role"
         checked="#{projectHome.instance.isRestrictedByRoles()}"
         value="restrict-access"/>
-      <s:div styleClass="bg--high l--pad-top-quarter l--pad-h-quarter"
+      <h:panelGroup layout="block"  styleClass="bg--high l--pad-top-quarter l--pad-h-quarter"
         rendered="#{projectHome.instance.restrictedByRoles}">
         <ul class="g--tighter">
           <ui:repeat value="#{projectHome.availableRoles}" var="availableRole">
@@ -188,8 +188,8 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:div>
-    </s:div>
+      </h:panelGroup>
+    </h:panelGroup>
   </h:form>
 </li>
 <li id="settings-webhooks" class="js-tabs-content">
@@ -222,7 +222,7 @@
         </h3>
         <div class="form__item">
           <label for="payloadUrlInput">#{msgs['jsf.project.PayloadURL']}
-            <s:span styleClass="txt--required">*</s:span>
+            <span class="txt--required">*</span>
           </label>
           <input type="text" id="payloadUrlInput" autocomplete="off"
             placeholder="#{msgs['jsf.project.PayloadURL']}"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
index 15647a392a..e03dec6b24 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
@@ -40,7 +40,7 @@
   <a4j:param name="val2" assignTo="#{state}"/>
 </a4j:jsFunction>
 
-<s:div id="validation-list">
+<h:panelGroup layout="block"  id="validation-list">
   <ul class="list--slat">
     <ui:repeat value="#{projectHome.validationList}"
         var="validationAction">
@@ -70,7 +70,7 @@
               <ui:repeat
                   value="#{projectHome.validationStates}"
                   var="state">
-                <s:fragment
+                <ui:fragment
                     rendered="#{validationAction.state == state}">
                   <input name="#{validationAction.id.name()}"
                       id="#{validationAction.id.name()}-#{state}"
@@ -79,8 +79,8 @@
                       type="radio"
                       class="form__item__input js-example__setter"
                       data-example=""/>
-                </s:fragment>
-                <s:fragment
+                </ui:fragment>
+                <ui:fragment
                     rendered="#{validationAction.state != state}">
                   <input name="#{validationAction.id.name()}"
                       id="#{validationAction.id.name()}-#{state}"
@@ -88,7 +88,7 @@
                       type="radio"
                       class="form__item__input js-example__setter"
                       data-example=""/>
-                </s:fragment>
+                </ui:fragment>
                 <label for="#{validationAction.id.name()}-#{state}"
                     class="button button--#{state.name() == 'Error'?'danger':state}">#{state}</label>
               </ui:repeat>
@@ -119,6 +119,6 @@
       </li>
     </ui:repeat>
   </ul>
-</s:div>
+</h:panelGroup>
 
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
index e5fa4eea9a..5c54797bfe 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
@@ -45,7 +45,7 @@
       onbegin="clearHTML('#{rich:clientId('versions_form')}')"
       status="versionTab-versionsLoader"/>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{identity.hasPermission(projectHome.instance, 'update')}">
       <div
         class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown"
@@ -56,16 +56,16 @@
         <ul class="dropdown__content js-dropdown__content" role="content"
           aria-labelledby="dropdownContent">
           <li>
-            <s:link id="new-version-link" propagation="none"
+            <h:link id="new-version-link"
               value="#{msgs['jsf.project.NewVersion']}"
-              view="/project/add_iteration.xhtml">
+              outcome="/project/add_iteration.xhtml">
               <f:param name="projectSlug" value="#{projectHomeAction.slug}"/>
               <i class="i i--plus i__item__icon"></i>
-            </s:link>
+            </h:link>
           </li>
         </ul>
       </div>
-    </s:fragment>
+    </ui:fragment>
   </div>
   <h2 class="panel__heading">#{msgs['jsf.Versions']}</h2>
 </div>
@@ -86,28 +86,28 @@
 </a4j:status>
 
 <h:form id="versions_form" styleClass="l--push-bottom-1">
-  <s:div styleClass="l--pad-all-half"
+  <h:panelGroup layout="block"  styleClass="l--pad-all-half"
     rendered="#{empty projectHomeAction.projectVersions}">
     <p class="txt--meta">#{msgs['jsf.NoVersions']}</p>
-    <s:fragment
+    <ui:fragment
       rendered="#{identity.hasPermission(projectHome.instance, 'update')}">
       <p>
-        <s:link styleClass="button--primary" propagation="none"
+        <h:link styleClass="button--primary"
           value="#{msgs['jsf.project.NewVersion']}"
-          view="/project/add_iteration.xhtml">
+          outcome="/project/add_iteration.xhtml">
           <f:param name="projectSlug" value="#{projectHomeAction.slug}"/>
           <i class="i i--plus i__item__icon"></i>
-        </s:link>
+        </h:link>
       </p>
-    </s:fragment>
-  </s:div>
+    </ui:fragment>
+  </h:panelGroup>
 
-  <s:div styleClass="l--pad-all-half"
+  <h:panelGroup layout="block"  styleClass="l--pad-all-half"
     rendered="#{not empty projectHomeAction.projectVersions and empty projectHomeAction.versionFilter.currentPage}">
     <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-  </s:div>
+  </h:panelGroup>
 
-  <s:fragment
+  <ui:fragment
     rendered="#{!projectHomeAction.versionFilter.currentPage.isEmpty()}">
     <ul class="list--stats">
       <ui:repeat
@@ -121,15 +121,15 @@
             enabled="#{projectHomeAction.isVersionCopying(version.project.slug, version.slug)}"
             oncomplete="clearVersionStats('#{version.slug}')"/>
 
-          <s:span id="copy-version-info">
+          <h:panelGroup id="copy-version-info">
             <h:outputScript
               rendered="#{not projectHomeAction.isVersionCopying(version.project.slug, version.slug)}">
               renderVersionInfo('#{rich:clientId('version-info')}');
             </h:outputScript>
-          </s:span>
+          </h:panelGroup>
 
-          <s:div id="version-info">
-            <s:div styleClass="list__item__action"
+          <h:panelGroup layout="block"  id="version-info">
+            <h:panelGroup layout="block"  styleClass="list__item__action"
               rendered="#{hasActions and not projectHomeAction.isVersionCopying(version.project.slug, version.slug)}">
               <div
                 class="dropdown dropdown--small dropdown--inline dropdown--single list__item__dropdown js-dropdown">
@@ -139,20 +139,20 @@
                     class="is-invisible">#{msgs['jsf.tooltip.TranslateOptions']}</span>
                 </a>
                 <ul class="dropdown__content js-dropdown__content">
-                  <s:fragment
+                  <ui:fragment
                     rendered="#{identity.hasPermission(projectHome.instance, 'update')}">
                     <li>
-                      <s:link view="/project/add_iteration.xhtml"
-                        propagation="none" styleClass="i__item--right"
+                      <h:link outcome="/project/add_iteration.xhtml"
+                        styleClass="i__item--right"
                         value="#{msgs['jsf.copyVersion.versionPage.label']}">
                         <f:param name="projectSlug"
                           value="#{projectHome.slug}"/>
                         <f:param name="copyFromVersionSlug"
                           value="#{version.slug}"/>
                         <i class="i i--plus i__item__icon"></i>
-                      </s:link>
+                      </h:link>
                     </li>
-                  </s:fragment>
+                  </ui:fragment>
                   <ui:repeat
                     value="#{projectHomeAction.getUserJoinedLocales(version)}"
                     var="hLocale">
@@ -186,9 +186,9 @@
                   </li>
                 </ul>
               </div>
-            </s:div>
+            </h:panelGroup>
 
-            <s:link view="/iteration/view.xhtml" propagation="none"
+            <h:link outcome="/iteration/view.xhtml"
               disabled="#{projectHomeAction.isVersionCopying(version.project.slug, version.slug)}">
               <f:param name="projectSlug" value="#{projectHomeAction.slug}"/>
               <f:param name="iterationSlug" value="#{version.slug}"/>
@@ -196,7 +196,7 @@
               <div class="list__item__content">
                 <div class="list__item__info">
                   <h3 class="list__title"><zanata:version-label version="#{version}"/></h3>
-                  <s:span styleClass="txt--meta"
+                  <h:panelGroup layout="span" styleClass="txt--meta"
                     rendered="#{projectHomeAction.isVersionCopying(version.project.slug, version.slug)}"
                     id="copy-version-message">
                     <h:outputFormat
@@ -208,15 +208,15 @@
                       <f:param
                         value="#{projectHomeAction.getCopyVersionCompletePercent(version.project.slug, version.slug)}"/>
                     </h:outputFormat>
-                  </s:span>
-                  <s:fragment
+                  </h:panelGroup>
+                  <ui:fragment
                     rendered="#{identity.hasPermission(projectHome.instance, 'update') and projectHomeAction.isVersionCopying(version.project.slug, version.slug)}">
                     <button class="button--danger txt--mini l--push-left-half"
                       title="#{msgs['jsf.copyVersion.cancel.message']}"
                       onclick="onCancelCopyVersion('#{version.project.slug}', '#{version.slug}');return false;">
                       #{msgs['jsf.copyVersion.stop']}
                     </button>
-                  </s:fragment>
+                  </ui:fragment>
                 </div>
 
                 <div class="list__item__stats">
@@ -227,7 +227,7 @@
                     </f:facet>
                   </a4j:status>
 
-                  <s:fragment
+                  <ui:fragment
                     rendered="#{projectHomeAction.pageRendered and not projectHomeAction.isVersionCopying(version.project.slug, version.slug)}">
                     <ui:param name="displayUnit"
                       value="#{projectHomeAction.getStatisticFigureForVersion(projectHomeAction.versionSortingList.selectedSortOption, version)}"/>
@@ -239,23 +239,23 @@
                             #{displayUnit.unit}
                           </span>
                         </span>
-                  </s:fragment>
+                  </ui:fragment>
 
-                  <s:fragment
+                  <ui:fragment
                     rendered="#{projectHomeAction.isVersionCopying(version.project.slug, version.slug)}">
                     <zanata:loader type="loader--small" layout="inline"/>
-                  </s:fragment>
+                  </ui:fragment>
                 </div>
               </div>
               <zanata:statistic
                 value="#{projectHomeAction.getStatisticForVersion(version.slug)}"
                 rendered="#{projectHomeAction.pageRendered}"/>
-            </s:link>
-          </s:div>
+            </h:link>
+          </h:panelGroup>
         </li>
       </ui:repeat>
     </ul>
-  </s:fragment>
+  </ui:fragment>
 </h:form>
 
 <zanata:list-filter listId="versions_form"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
index 92a8e273f2..1830bef799 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
@@ -40,12 +40,12 @@
     </a4j:status>
 
     <h:form id="search-project_form" styleClass="l--push-bottom-1">
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{zanataSearch.getTotalProjectCount() ge 0 and empty zanataSearch.projectTabProjectFilter.currentPage}">
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-      </s:div>
+      </h:panelGroup>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty zanataSearch.projectTabProjectFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat value="#{zanataSearch.projectTabProjectFilter.currentPage}"
@@ -74,7 +74,7 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
+      </ui:fragment>
 
     </h:form>
 
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
index a8ee67cd7a..9ecb83febc 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
@@ -40,12 +40,12 @@
     </a4j:status>
 
     <h:form id="search-user_form" styleClass="l--push-bottom-1">
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{zanataSearch.getTotalUserCount() ge 0 and empty zanataSearch.userTabUserFilter.currentPage}">
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-      </s:div>
+      </h:panelGroup>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty zanataSearch.userTabUserFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat value="#{zanataSearch.userTabUserFilter.currentPage}"
@@ -63,7 +63,7 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
+      </ui:fragment>
     </h:form>
 
     <zanata:list-filter status="users-loader"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
index f6f6bf36b3..39a3f81cd5 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
@@ -1,7 +1,7 @@
 <ui:composition
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:ui="http://java.sun.com/jsf/facelets"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j">
 
@@ -11,21 +11,21 @@
         title="#{msgs['jsf.transmemory.TransMemoryIdExample']}"></i>
       </span>
     </h:outputLabel>
-    <s:decorate id="slugField" template="field.xhtml" enclose="true">
+    <zanata:decorate id="slug" componentId="slugField">
       <h:inputText id="slug" required="true"
         value="#{translationMemoryHome.instance.slug}"
         valueChangeListener="#{translationMemoryHome.verifySlugAvailable}">
         <a4j:ajax event="blur" render="slugField" execute="@this"/>
       </h:inputText>
-    </s:decorate>
+    </zanata:decorate>
   </div>
 
   <div class="l--push-top-half form__item">
     <h:outputLabel for="description">#{msgs['jsf.Description']}</h:outputLabel>
-    <s:decorate id="descriptionField" template="field.xhtml" enclose="true">
+    <zanata:decorate id="description" componentId="descriptionField">
       <h:inputTextarea id="description" required="false"
         value="#{translationMemoryHome.instance.description}"/>
-    </s:decorate>
+    </zanata:decorate>
   </div>
 
   <div class="l--push-top-1">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
index 6163616801..d82242eceb 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
@@ -1,30 +1,32 @@
-<s:fragment
+<ui:fragment
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:a4j="http://richfaces.org/a4j">
 
   <div class="l--push-top-half form__item">
     <h:outputLabel for="name">#{msgs['jsf.GroupName']}
-      <s:span styleClass="txt--required">*</s:span>
+      <span class="txt--required">*</span>
     </h:outputLabel>
-    <s:decorate id="nameField" template="../field.xhtml" enclose="true">
+    <zanata:decorate id="name" componentId="nameField">
       <h:inputText id="name" required="true" maxlength="80"
         value="#{versionGroupHome.instance.name}">
         <a4j:ajax event="blur" render="nameField" execute="@this"/>
       </h:inputText>
-    </s:decorate>
+    </zanata:decorate>
   </div>
   <div class="l--push-top-half form__item">
     <h:outputLabel for="slug">#{msgs['jsf.GroupId']}
-      <s:span styleClass="txt--required">*</s:span>
+      <span class="txt--required">*</span>
     </h:outputLabel>
-    <s:decorate id="slugField" template="../field.xhtml" enclose="true">
-      <h:inputText rendered="#{versionGroupHome.managed}"
-        disabled="true"
-        value="#{versionGroupHome.instance.slug}">
-      </h:inputText>
+    <h:inputText rendered="#{versionGroupHome.managed}" id="slugReadOnly"
+      disabled="true"
+      value="#{versionGroupHome.instance.slug}">
+    </h:inputText>
+    <zanata:decorate id="slug" componentId="slugField">
       <h:inputText rendered="#{not versionGroupHome.managed}" maxlength="40"
         id="slug" required="true"
         value="#{versionGroupHome.instance.slug}"
@@ -32,18 +34,18 @@
         <a4j:ajax event="blur" render="slugField" execute="@this"/>
         <f:validateLength minimum="1"/>
       </h:inputText>
-    </s:decorate>
+    </zanata:decorate>
   </div>
   <div class="l--push-top-half form__item">
     <h:outputLabel for="description">
       #{msgs['jsf.GroupDescription']}
     </h:outputLabel>
-    <s:decorate id="descriptionField" template="../field.xhtml">
+    <zanata:decorate id="description" componentId="descriptionField">
       <h:inputTextarea id="description" required="false"
         value="#{versionGroupHome.instance.description}">
         <f:validateLength maximum="100"/>
         <a4j:ajax event="blur" render="descriptionField" execute="@this"/>
       </h:inputTextarea>
-    </s:decorate>
+    </zanata:decorate>
   </div>
-</s:fragment>
+</ui:fragment>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
index 100b44a8ab..fd01e9078f 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
@@ -18,7 +18,7 @@
         onbegin="clearHTML('#{rich:clientId('languages-language_form')}')"
         status="languageTab-languagesLoader"/>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
         <div
           class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
@@ -37,7 +37,7 @@
             </li>
           </ul>
         </div>
-      </s:fragment>
+      </ui:fragment>
     </div>
 
     <h2 class="panel__heading">#{msgs['jsf.Languages']}</h2>
@@ -60,10 +60,10 @@
   </a4j:status>
 
   <h:form id="languages-language_form" styleClass="l--push-bottom-1">
-    <s:div styleClass="l--pad-all-half"
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{empty versionGroupHomeAction.activeLocales}">
       <p class="txt--meta">#{msgs['jsf.NoActiveLanguages']}</p>
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
         <p>
           <a class="button--primary" id="addLanguagesButton"
@@ -72,15 +72,15 @@
             #{msgs['jsf.AddLanguages']}
           </a>
         </p>
-      </s:fragment>
-    </s:div>
+      </ui:fragment>
+    </h:panelGroup>
 
-    <s:div styleClass="l--pad-all-half"
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{not empty versionGroupHomeAction.activeLocales and empty versionGroupHomeAction.languageTabLanguageFilter.currentPage}">
       <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-    </s:div>
+    </h:panelGroup>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{not empty versionGroupHomeAction.languageTabLanguageFilter.currentPage}">
       <ul class="list--stats" id="languages-language_list">
         <ui:repeat
@@ -95,11 +95,12 @@
                 <div class="list__item__info">
                   <h3 class="list__title">
                     #{hLocale.retrieveDisplayName()}
-                    <s:span styleClass="badge--danger"
-                      rendered="#{!versionGroupHomeAction.getMissingVersion(hLocale.localeId).isEmpty()}"
-                      title="#{versionGroupHomeAction.getMissingVersionTitle(hLocale.localeId)}">
-                      #{versionGroupHomeAction.getMissingVersion(hLocale.localeId).size()}
-                    </s:span>
+                    <h:panelGroup layout="span" styleClass="badge--danger"
+                      rendered="#{!versionGroupHomeAction.getMissingVersion(hLocale.localeId).isEmpty()}">
+                      <span title="#{versionGroupHomeAction.getMissingVersionTitle(hLocale.localeId)}">
+                        #{versionGroupHomeAction.getMissingVersion(hLocale.localeId).size()}
+                      </span>
+                    </h:panelGroup>
                   </h3>
                   <span class="list__item__meta">#{hLocale.localeId}</span>
                 </div>
@@ -110,7 +111,7 @@
                     </f:facet>
                   </a4j:status>
 
-                  <s:fragment rendered="#{versionGroupHomeAction.pageRendered}">
+                  <ui:fragment rendered="#{versionGroupHomeAction.pageRendered}">
                     <ui:param name="displayUnit"
                       value="#{versionGroupHomeAction.getStatisticFigureForLocale(versionGroupHomeAction.languageSortingList.selectedSortOption, hLocale.localeId)}"/>
                      <span class="#{displayUnit.cssClass}"
@@ -118,7 +119,7 @@
                         <span class="stats__figure">#{displayUnit.figure}</span>
                         <span class="stats__unit">#{displayUnit.unit}</span>
                      </span>
-                  </s:fragment>
+                  </ui:fragment>
                 </div>
               </div>
 
@@ -129,7 +130,7 @@
           </li>
         </ui:repeat>
       </ul>
-    </s:fragment>
+    </ui:fragment>
   </h:form>
 
   <zanata:list-filter status="languageTab-languagesLoader"
@@ -161,9 +162,9 @@
     <h2 class="panel__heading">
       <zanata:loader jsHandle="true" layout="inline" type="loader--small"
         id="languagesTab-language-label-loader" visible="false"/>
-      <s:span id="language-label">
+      <h:panelGroup id="language-label">
         #{versionGroupHomeAction.selectedLocale.retrieveDisplayName()}
-      </s:span>
+      </h:panelGroup>
       #{msgs['jsf.Projects']}
     </h2>
   </div>
@@ -185,16 +186,16 @@
   </a4j:status>
 
   <h:form id="languages-project_list" styleClass="l--push-bottom-1">
-    <s:div styleClass="l--pad-all-half"
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{versionGroupHomeAction.selectedLocale == null}">
       <p class="txt--meta">#{msgs['jsf.SelectALanguageFromList']}</p>
-    </s:div>
+    </h:panelGroup>
 
-    <s:fragment rendered="#{versionGroupHomeAction.selectedLocale != null}">
-      <s:div styleClass="l--pad-all-half"
+    <ui:fragment rendered="#{versionGroupHomeAction.selectedLocale != null}">
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{empty versionGroupHomeAction.projectIterations}">
         <p class="txt--meta">#{msgs['jsf.NoProjectsInGroup']}</p>
-        <s:fragment
+        <ui:fragment
           rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
           <p>
             <a class="button--primary"
@@ -203,15 +204,15 @@
               #{msgs['jsf.AddProjectVersions']}
             </a>
           </p>
-        </s:fragment>
-      </s:div>
+        </ui:fragment>
+      </h:panelGroup>
 
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{not empty versionGroupHomeAction.projectIterations and empty versionGroupHomeAction.languageTabVersionFilter.currentPage}">
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-      </s:div>
+      </h:panelGroup>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty versionGroupHomeAction.languageTabVersionFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat
@@ -227,11 +228,11 @@
                         <i
                           class="txt--neutral i i--version"></i> <zanata:version-label version="#{version}"/>
 
-                        <s:fragment
+                        <ui:fragment
                           rendered="#{!versionGroupHomeAction.isLocaleActivatedInVersion(version, versionGroupHomeAction.selectedLocale.localeId)}">
                           <span
                             class="label--danger l--push-left-quarter">#{msgs['jsf.Missing']}</span>
-                        </s:fragment>
+                        </ui:fragment>
                       </span>
                   </div>
                   <div class="list__item__stats">
@@ -253,8 +254,8 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
-    </s:fragment>
+      </ui:fragment>
+    </ui:fragment>
   </h:form>
 
   <zanata:list-filter status="languageTab-projectsLoader"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
index 543128254b..cbaf8ba4d7 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
@@ -18,7 +18,7 @@
         onbegin="clearHTML('#{rich:clientId('projects-project_form')}')"
         status="projectsTab-projectsLoader"/>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
         <div
           class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
@@ -37,7 +37,7 @@
             </li>
           </ul>
         </div>
-      </s:fragment>
+      </ui:fragment>
 
     </div>
     <h2 class="panel__heading">#{msgs['jsf.Projects']}</h2>
@@ -58,10 +58,10 @@
   </a4j:status>
 
   <h:form id="projects-project_form" styleClass="l--push-bottom-1">
-    <s:div styleClass="l--pad-all-half"
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{empty versionGroupHomeAction.projectIterations}">
       <p class="txt--meta">#{msgs['jsf.NoProjectsInGroup']}</p>
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
         <p>
           <a class="button--primary" href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/settings/projects"
@@ -69,15 +69,15 @@
             #{msgs['jsf.AddProjectVersions']}
           </a>
         </p>
-      </s:fragment>
-    </s:div>
+      </ui:fragment>
+    </h:panelGroup>
 
-    <s:div styleClass="l--pad-all-half"
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{not empty versionGroupHomeAction.projectIterations and empty versionGroupHomeAction.projectTabVersionFilter.currentPage}">
       <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-    </s:div>
+    </h:panelGroup>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{not empty versionGroupHomeAction.projectTabVersionFilter.currentPage}">
       <ul class="list--stats" id="projects-project_list">
         <ui:repeat
@@ -92,12 +92,12 @@
                   <h3 class="list__title">#{version.project.name}</h3>
                     <span class="list__item__meta">
                       <i class="txt--neutral i i--version"></i> <zanata:version-label version="#{version}" />
-                      <s:fragment
+                      <ui:fragment
                         rendered="#{!versionGroupHomeAction.getMissingLocale(version).isEmpty()}">
                           <span
                             title="#{versionGroupHomeAction.getMissingLocaleTitle(version)}"
                             class="badge--danger l--push-left-quarter">#{versionGroupHomeAction.getMissingLocale(version).size()}</span>
-                      </s:fragment>
+                      </ui:fragment>
                     </span>
                 </div>
                 <div class="list__item__stats">
@@ -107,7 +107,7 @@
                     </f:facet>
                   </a4j:status>
 
-                  <s:fragment rendered="#{versionGroupHomeAction.pageRendered}">
+                  <ui:fragment rendered="#{versionGroupHomeAction.pageRendered}">
                     <ui:param name="displayUnit"
                       value="#{versionGroupHomeAction.getStatisticFigureForProject(versionGroupHomeAction.projectSortingList.selectedSortOption, version.id)}"/>
                      <span class="stats--small #{displayUnit.cssClass}">
@@ -118,7 +118,7 @@
                           #{displayUnit.unit}
                         </span>
                       </span>
-                  </s:fragment>
+                  </ui:fragment>
                 </div>
               </div>
               <zanata:statistic
@@ -128,7 +128,7 @@
           </li>
         </ui:repeat>
       </ul>
-    </s:fragment>
+    </ui:fragment>
   </h:form>
 
   <zanata:list-filter status="projectsTab-projectsLoader"
@@ -162,9 +162,9 @@
       <zanata:loader jsHandle="true" layout="inline" type="loader--small" visible="false"
         id="projectsTab-project-label-loader"/>
 
-      <s:span id="project-label" styleClass="i__text--right">
+      <h:panelGroup id="project-label" class="i__text--right">
         #{versionGroupHomeAction.selectedVersion.project.slug}
-      </s:span>
+      </h:panelGroup>
       #{msgs['Languages']}
     </h2>
   </div>
@@ -184,18 +184,18 @@
   </a4j:status>
 
   <h:form id="projects-language_list" styleClass="l--push-bottom-1">
-    <s:fragment
+    <ui:fragment
       rendered="#{versionGroupHomeAction.selectedVersion == null}">
       <div class="l--pad-all-half">
         <p class="txt--meta">#{msgs['jsf.SelectAProjectFromList']}</p>
       </div>
-    </s:fragment>
+    </ui:fragment>
 
-    <s:fragment rendered="#{versionGroupHomeAction.selectedVersion != null}">
-      <s:div styleClass="l--pad-all-half"
+    <ui:fragment rendered="#{versionGroupHomeAction.selectedVersion != null}">
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{empty versionGroupHomeAction.activeLocales}">
         <p class="txt--meta">#{msgs['jsf.NoActiveLanguages']}</p>
-        <s:fragment
+        <ui:fragment
           rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
           <p>
             <a class="button--primary" href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/settings/languages"
@@ -203,15 +203,15 @@
               #{msgs['jsf.AddLanguages']}
             </a>
           </p>
-        </s:fragment>
-      </s:div>
+        </ui:fragment>
+      </h:panelGroup>
 
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{not empty versionGroupHomeAction.activeLocales and empty versionGroupHomeAction.projectTabLanguageFilter.currentPage}">
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-      </s:div>
+      </h:panelGroup>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty versionGroupHomeAction.projectTabLanguageFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat
@@ -224,8 +224,8 @@
                   <div class="list__item__info">
                     <h3 class="list__title">
                       #{hLocale.retrieveDisplayName()}
-                      <s:span rendered="#{!versionGroupHomeAction.isLocaleActivatedInVersion(versionGroupHomeAction.selectedVersion, hLocale.localeId)}"
-                        styleClass="label--danger">#{msgs['jsf.Missing']}</s:span>
+                      <h:panelGroup layout="span" rendered="#{!versionGroupHomeAction.isLocaleActivatedInVersion(versionGroupHomeAction.selectedVersion, hLocale.localeId)}"
+                        styleClass="label--danger">#{msgs['jsf.Missing']}</h:panelGroup>
                     </h3>
                     <span class="list__item__meta">#{hLocale.localeId}</span>
                   </div>
@@ -244,8 +244,8 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
-    </s:fragment>
+      </ui:fragment>
+    </ui:fragment>
   </h:form>
   <zanata:list-filter status="projectsTab-languagesLoader"
     listId="projects-language_list"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
index 4049d18bb0..ab842ee16d 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
@@ -76,11 +76,11 @@
             <span class="txt--meta"> [#{result.slug}]</span>
           </zanata:autocomplete>
 
-          <s:div id="versions">
-            <s:fragment rendered="#{empty versionGroupJoinAction.versions and versionGroupJoinAction.projectSlug != null}">
+          <h:panelGroup layout="block"  id="versions">
+            <ui:fragment rendered="#{empty versionGroupJoinAction.versions and versionGroupJoinAction.projectSlug != null}">
               <div class="l--pad-all-quarter txt--understated">#{msgs['jsf.NoVersions']}</div>
-            </s:fragment>
-            <s:fragment rendered="#{not empty versionGroupJoinAction.versions}">
+            </ui:fragment>
+            <ui:fragment rendered="#{not empty versionGroupJoinAction.versions}">
               <ul class="list--slat" id="version-list">
                 <ui:repeat value="#{versionGroupJoinAction.versions}" var="version">
                   <li>
@@ -90,18 +90,18 @@
                   </li>
                 </ui:repeat>
               </ul>
-            </s:fragment>
-          </s:div>
+            </ui:fragment>
+          </h:panelGroup>
         </div>
 
-        <s:decorate id="messageField" template="/WEB-INF/layout/field.xhtml">
+        <zanata:decorate id="message" componentId="messageField" >
           <span>#{msgs['jsf.AdditionalInfo']}</span>
           <span class="txt--meta bx--block">#{msgs['jsf.group.email.AdditionalInfoMessage']}</span>
           <h:inputTextarea id="request-join-group-message" value="#{versionGroupJoinAction.message}"
             styleClass="l--push-bottom-0">
             <a4j:ajax event="blur" render="messageField" execute="@this"/>
           </h:inputTextarea>
-        </s:decorate>
+        </zanata:decorate>
       </div>
 
       <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
index 6804d6e351..279119f9ec 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
@@ -63,8 +63,8 @@
             styleClass="l--push-right-half button--primary"/>
         </div>
         <hr/>
-        <s:span id="status">
-          <s:fragment
+        <h:panelGroup id="status">
+          <ui:fragment
             rendered="#{versionGroupHome.instance.status == 'ACTIVE'}">
             <p>
               <a4j:commandLink styleClass="button--danger"
@@ -74,9 +74,9 @@
             </p>
 
             <p class="txt--meta">#{msgs['jsf.ArchiveGroupMessage']}</p>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment
+          <ui:fragment
             rendered="#{versionGroupHome.instance.status != 'ACTIVE'}">
             <p>
               <a4j:commandLink styleClass="button--success"
@@ -90,8 +90,8 @@
               <i
                 class="i--left i--archive"></i> #{msgs['jsf.ActivateGroupMessage']}
             </p>
-          </s:fragment>
-        </s:span>
+          </ui:fragment>
+        </h:panelGroup>
       </div>
     </h:form>
   </li>
@@ -154,14 +154,14 @@
           value="#{versionGroupHome.getSortedInstanceProjectIterations()}"
           var="version" varStatus="status">
           <li class="reveal">
-            <s:link view="/iteration/view.xhtml">
+            <h:link outcome="/iteration/view.xhtml">
               <f:param name="projectSlug" value="#{version.project.slug}"/>
               <f:param name="iterationSlug" value="#{version.slug}"/>
               #{version.project.name} <i class="i i--version"></i> <zanata:version-label version="#{version}"/>
-              <s:fragment rendered="#{version.status == 'OBSOLETE'}">
+              <ui:fragment rendered="#{version.status == 'OBSOLETE'}">
                 <span class="txt--danger l--push-left-half">#{msgs['jsf.group.ArchivedVersionNotIncluded']}</span>
-              </s:fragment>
-            </s:link>
+              </ui:fragment>
+            </h:link>
             <a4j:commandLink
               styleClass="button--link l--float-right reveal__target"
               action="#{versionGroupHome.removeVersion(version)}"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
index 7635c0f73f..b431b33907 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
@@ -19,7 +19,7 @@
       onbegin="clearHTML('#{rich:clientId('documents-document_form')}')"
       status="documentsTab-documentsLoader"/>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{versionHomeAction.documentUploadAllowed or identity.hasPermission(versionHomeAction.version, 'update')}">
       <div
         class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
@@ -28,7 +28,7 @@
           class="i i--ellipsis"></i></a>
         <ul class="dropdown__content js-dropdown__content" role="content"
           aria-labelledby="dropdownContent">
-          <s:fragment rendered="#{versionHomeAction.documentUploadAllowed}">
+          <ui:fragment rendered="#{versionHomeAction.documentUploadAllowed}">
             <li>
               <zanata:multi-file-upload styleClass="i__item--right"
                 id="doc-tab-file-upload-component"
@@ -41,9 +41,9 @@
                 <i class="i i--import i__item__icon"></i>
               </zanata:multi-file-upload>
             </li>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment
+          <ui:fragment
             rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
             <li>
               <a href="#{request.contextPath}/iteration/view/#{versionHomeAction.projectSlug}/#{versionHomeAction.versionSlug}/settings/documents"
@@ -52,10 +52,10 @@
                 class="i i--settings i__item__icon"></i>
               </a>
             </li>
-          </s:fragment>
+          </ui:fragment>
         </ul>
       </div>
-    </s:fragment>
+    </ui:fragment>
   </div>
   <h2 class="panel__heading">#{msgs['jsf.Documents']}</h2>
 </div>
@@ -74,11 +74,11 @@
 </a4j:status>
 
 <h:form id="documents-document_form" styleClass="l--push-bottom-1">
-  <s:div styleClass="l--pad-all-half"
+  <h:panelGroup layout="block"  styleClass="l--pad-all-half"
     rendered="#{empty versionHomeAction.documents}">
     <p
       class="txt--meta">#{msgs['jsf.iteration.NoDocumentInVersion']}</p>
-    <s:fragment
+    <ui:fragment
       rendered="#{versionHomeAction.documentUploadAllowed}">
       <p>
         <a href="#{request.contextPath}/iteration/view/#{versionHomeAction.projectSlug}/#{versionHomeAction.versionSlug}/settings/documents"
@@ -86,15 +86,15 @@
           #{msgs['jsf.iteration.files.UploadNewSourceDocument']}
         </a>
       </p>
-    </s:fragment>
-  </s:div>
+    </ui:fragment>
+  </h:panelGroup>
 
-  <s:div styleClass="l--pad-all-half"
+  <h:panelGroup layout="block"  styleClass="l--pad-all-half"
     rendered="#{not empty versionHomeAction.documents and empty versionHomeAction.documentsTabDocumentFilter.currentPage}">
     <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-  </s:div>
+  </h:panelGroup>
 
-  <s:fragment
+  <ui:fragment
     rendered="#{not empty versionHomeAction.documentsTabDocumentFilter.currentPage}">
     <ul class="list--stats" id="documents-document_list">
       <ui:repeat
@@ -104,7 +104,7 @@
           value="#{versionHomeAction.isPoDocument(document.docId) or !versionHomeAction.isPoDocument(document.docId) or versionHomeAction.hasOriginal(document.path, document.name) or versionHomeAction.documentUploadAllowed or versionHomeAction.documentRemovalAllowed}"/>
         <li id="#{versionHomeAction.encodeDocId(document.docId)}"
           class="progress-bar__expander #{hasActions ? 'list__item--actionable' : ''}" >
-          <s:div styleClass="list__item__action" rendered="#{hasActions}">
+          <h:panelGroup layout="block"  styleClass="list__item__action" rendered="#{hasActions}">
             <div
               class="dropdown dropdown--small dropdown--inline dropdown--single js-dropdown">
               <a class="dropdown__toggle js-dropdown__toggle txt--meta"
@@ -115,8 +115,8 @@
                   </span>
               </a>
               <ul class="dropdown__content js-dropdown__content">
-                <s:fragment rendered="#{versionHomeAction.version.projectType ne 'File'}"></s:fragment>
-                <s:fragment
+                <ui:fragment rendered="#{versionHomeAction.version.projectType ne 'File'}"></ui:fragment>
+                <ui:fragment
                   rendered="#{versionHomeAction.isPoDocument(document.docId) and versionHomeAction.version.projectType ne 'File'}">
                   <li>
                     <h:outputLink styleClass="i__item--right"
@@ -130,8 +130,8 @@
                       <i class="i i--export i__item__icon"></i>
                     </h:outputLink>
                   </li>
-                </s:fragment>
-                <s:fragment
+                </ui:fragment>
+                <ui:fragment
                   rendered="#{!versionHomeAction.isPoDocument(document.docId)}">
                   <li>
                     <h:outputLink styleClass="i__item--right"
@@ -146,9 +146,9 @@
                       <i class="i i--export i__item__icon"></i>
                     </h:outputLink>
                   </li>
-                </s:fragment>
+                </ui:fragment>
 
-                <s:fragment
+                <ui:fragment
                   rendered="#{versionHomeAction.hasOriginal(document.path, document.name)}">
                   <li>
                     <h:outputLink styleClass="i__item--right"
@@ -163,9 +163,9 @@
                       <i class="i i--export i__item__icon"></i>
                     </h:outputLink>
                   </li>
-                </s:fragment>
+                </ui:fragment>
 
-                <s:fragment
+                <ui:fragment
                   rendered="#{versionHomeAction.documentUploadAllowed}">
                   <li>
                     <a href="#" class="i__item--right"
@@ -174,8 +174,8 @@
                       <i class="i i--import i__item__icon"></i>
                     </a>
                   </li>
-                </s:fragment>
-                <s:fragment
+                </ui:fragment>
+                <ui:fragment
                   rendered="#{versionHomeAction.documentRemovalAllowed}">
                   <li>
                     <a4j:commandLink styleClass="i__item--right txt--danger"
@@ -187,10 +187,10 @@
                       <i class="i i--remove i__item__icon"></i>
                     </a4j:commandLink>
                   </li>
-                </s:fragment>
+                </ui:fragment>
               </ul>
             </div>
-          </s:div>
+          </h:panelGroup>
           <a href="#{request.contextPath}/iteration/view/#{versionHomeAction.projectSlug}/#{versionHomeAction.versionSlug}/documents/#{versionHomeAction.encodeDocId(document.docId)}"
             onclick="changeBrowserUrl(this.href, true);return false;">
             <div class="list__item__content">
@@ -205,7 +205,7 @@
                   </f:facet>
                 </a4j:status>
 
-                <s:fragment rendered="#{versionHomeAction.pageRendered}">
+                <ui:fragment rendered="#{versionHomeAction.pageRendered}">
                   <ui:param name="displayUnit"
                     value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.sourceDocumentSortingList.selectedSortOption, document)}"/>
                    <span class="#{displayUnit.cssClass}"
@@ -214,7 +214,7 @@
                         class="stats__figure">#{displayUnit.figure}</span>
                       <span class="stats__unit">#{displayUnit.unit}</span>
                    </span>
-                </s:fragment>
+                </ui:fragment>
               </div>
             </div>
             <zanata:statistic
@@ -224,7 +224,7 @@
         </li>
       </ui:repeat>
     </ul>
-  </s:fragment>
+  </ui:fragment>
 </h:form>
 
 <zanata:list-filter listId="documents-document_form"
@@ -247,7 +247,7 @@
         onbegin="clearHTML('#{rich:clientId('documents-language_list')}')"
         status="documentsTab-languagesLoader"/>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
         <div
           class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
@@ -265,7 +265,7 @@
             </li>
           </ul>
         </div>
-      </s:fragment>
+      </ui:fragment>
     </div>
 
     <a href="#" class="panel__header__back"
@@ -277,9 +277,9 @@
     <h2 class="panel__heading">
       <zanata:loader jsHandle="true" layout="inline" type="loader--small"
         visible="false" id="documentsTab-document-label-loader"/>
-      <s:span id="document-label">
+      <h:panelGroup id="document-label">
         #{versionHomeAction.selectedDocument.name}
-      </s:span>
+      </h:panelGroup>
       #{msgs['jsf.Languages']}
     </h2>
   </div>
@@ -298,18 +298,18 @@
   </a4j:status>
 
   <h:form id="documents-language_list" styleClass="l--push-bottom-1">
-    <s:fragment rendered="#{versionHomeAction.selectedDocument == null}">
+    <ui:fragment rendered="#{versionHomeAction.selectedDocument == null}">
       <div class="l--pad-all-half">
         <p class="txt--meta">#{msgs['jsf.SelectADocumentFromList']}</p>
       </div>
-    </s:fragment>
+    </ui:fragment>
 
-    <s:fragment rendered="#{versionHomeAction.selectedDocument != null}">
-      <s:div styleClass="l--pad-all-half"
+    <ui:fragment rendered="#{versionHomeAction.selectedDocument != null}">
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{empty versionHomeAction.supportedLocale}">
         <p
           class="txt--meta">#{msgs['jsf.iteration.NoLanguagesInVersion']}</p>
-        <s:fragment
+        <ui:fragment
           rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
           <p>
             <a class="button--primary" href="#{request.contextPath}/iteration/view/#{versionHomeAction.projectSlug}/#{versionHomeAction.versionSlug}/settings/languages"
@@ -318,15 +318,15 @@
               class="i i--settings i__item__icon"></i>
             </a>
           </p>
-        </s:fragment>
-      </s:div>
+        </ui:fragment>
+      </h:panelGroup>
 
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{not empty versionHomeAction.supportedLocale and empty versionHomeAction.documentsTabLanguageFilter.currentPage}">
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-      </s:div>
+      </h:panelGroup>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty versionHomeAction.documentsTabLanguageFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat
@@ -334,26 +334,28 @@
             var="hLocale">
             <li class="progress-bar__expander">
 
-              <s:fragment rendered="#{hLocale.active}">
+              <ui:fragment rendered="#{hLocale.active}">
                 <a
                   href="#{request.contextPath}/webtrans/Application.seam?project=#{versionHomeAction.projectSlug}&amp;iteration=#{versionHomeAction.versionSlug}&amp;localeId=#{hLocale.localeId}&amp;locale=#{locale.language}#view:doc;doc:#{versionHomeAction.selectedDocument.docId}">
                   <div class="list__item">
                     <div class="list__item__info">
                       <h3 class="list__title">
                         #{hLocale.retrieveDisplayName()}
-                        <s:fragment
+                        <ui:fragment
                           rendered="#{hLocale.active and versionHomeAction.isUserAllowedToTranslateOrReview(hLocale)}">
                           <i class="i--right i--translate txt--neutral"></i>
-                        </s:fragment>
-                        <s:span rendered="#{not hLocale.active}"
-                          styleClass="label"
-                          title="#{msgs['jsf.Language.Disabled']}">
-                          #{msgs['jsf.Disabled']}
-                        </s:span>
+                        </ui:fragment>
+                        <h:panelGroup layout="span" rendered="#{not hLocale.active}"
+                          styleClass="label">
+                          <!-- TODO check whether title is necessary -->
+                          <span title="#{msgs['jsf.Language.Disabled']}">
+                            #{msgs['jsf.Disabled']}
+                          </span>
+                        </h:panelGroup>
                       </h3>
                       <span class="list__item__meta">#{hLocale.localeId}</span>
                     </div>
-                    <s:div styleClass="list__item__stats"
+                    <h:panelGroup layout="block"  styleClass="list__item__stats"
                       rendered="#{versionHomeAction.pageRendered}">
                       <ui:param name="displayUnit"
                         value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.languageSortingList.selectedSortOption, hLocale.localeId, versionHomeAction.selectedDocument)}"/>
@@ -363,32 +365,34 @@
                             class="stats__figure">#{displayUnit.figure}</span>
                           <span class="stats__unit">#{displayUnit.unit}</span>
                        </span>
-                    </s:div>
+                    </h:panelGroup>
                   </div>
                   <zanata:statistic
                     value="#{versionHomeAction.getStatisticForDocument(versionHomeAction.selectedDocument.id, hLocale.localeId)}"
                     rendered="#{versionHomeAction.pageRendered}"/>
                   <zanata:loader rendered="#{!versionHomeAction.pageRendered}"/>
                 </a>
-              </s:fragment>
-              <s:fragment rendered="#{not hLocale.active}">
+              </ui:fragment>
+              <ui:fragment rendered="#{not hLocale.active}">
                 <div class="list__item">
                   <div class="list__item__info">
                     <h3 class="list__title">
                       #{hLocale.retrieveDisplayName()}
-                      <s:fragment
+                      <ui:fragment
                         rendered="#{hLocale.active and versionHomeAction.isUserAllowedToTranslateOrReview(hLocale)}">
                         <i class="i--right i--translate txt--neutral"></i>
-                      </s:fragment>
-                      <s:span rendered="#{not hLocale.active}"
-                        styleClass="label--danger"
-                        title="#{msgs['jsf.Language.Disabled']}">
-                        #{msgs['jsf.Disabled']}
-                      </s:span>
+                      </ui:fragment>
+                      <h:panelGroup layout="span" rendered="#{not hLocale.active}"
+                        styleClass="label--danger">
+                        <!-- TODO check whether title is necessary -->
+                        <span title="#{msgs['jsf.Language.Disabled']}">
+                          #{msgs['jsf.Disabled']}
+                        </span>
+                      </h:panelGroup>
                     </h3>
                     <span class="list__item__meta">#{hLocale.localeId}</span>
                   </div>
-                  <s:div styleClass="list__item__stats"
+                  <h:panelGroup layout="block"  styleClass="list__item__stats"
                     rendered="#{versionHomeAction.pageRendered}">
                     <ui:param name="displayUnit"
                       value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.languageSortingList.selectedSortOption, hLocale.localeId, versionHomeAction.selectedDocument)}"/>
@@ -397,18 +401,18 @@
                       <span class="stats__figure">#{displayUnit.figure}</span>
                       <span class="stats__unit">#{displayUnit.unit}</span>
                    </span>
-                  </s:div>
+                  </h:panelGroup>
                 </div>
                 <zanata:statistic
                   value="#{versionHomeAction.getStatisticForDocument(versionHomeAction.selectedDocument.id, hLocale.localeId)}"
                   rendered="#{versionHomeAction.pageRendered}"/>
                 <zanata:loader rendered="#{!versionHomeAction.pageRendered}"/>
-              </s:fragment>
+              </ui:fragment>
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
-    </s:fragment>
+      </ui:fragment>
+    </ui:fragment>
   </h:form>
 
   <zanata:list-filter status="documentsTab-languagesLoader"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
index a66e71f4aa..8f674f2350 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
@@ -1,4 +1,4 @@
-<s:fragment
+<ui:fragment
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:f="http://java.sun.com/jsf/core"
@@ -60,14 +60,14 @@
       <span class="txt--meta"><i class="i i--info"
         title="#{msgs['jsf.SlugExample']}"></i></span>
     </h:outputLabel>
-    <s:decorate id="slugField" template="../field.xhtml" enclose="true">
+    <zanata:decorate id="slug" componentId="slugField">
       <h:inputText maxlength="40"
         id="slug" required="true" value="#{versionHome.inputSlugValue}"
         valueChangeListener="#{versionHome.verifySlugAvailable}">
         <f:validateLength minimum="1"/>
         <a4j:ajax event="blur" render="slugField" execute="@this"/>
       </h:inputText>
-    </s:decorate>
+    </zanata:decorate>
   </div>
 
   <zanata:checkbox label="#{msgs['jsf.copyVersion.label']}" id="copy-from-version"
@@ -77,12 +77,12 @@
 
   <h:inputHidden id="copyFromVersion" value="#{versionHome.copyFromVersion}"/>
 
-  <s:div id="project-type-list">
+  <h:panelGroup layout="block"  id="project-type-list">
     <h:inputHidden id="selectedProjectType"
       value="#{versionHome.selectedProjectType}"
       valueChangeListener="#{versionHome.updateSelectedProjectType}"/>
 
-    <s:fragment rendered="#{not versionHome.copyFromVersion}">
+    <ui:fragment rendered="#{not versionHome.copyFromVersion}">
       <h3
         class="heading--secondary l--push-all-0">#{msgs['jsf.projectType']}</h3>
 
@@ -101,27 +101,27 @@
         oncomplete="zanata.form.appendRadios(getProjectTypeId())"
         disabled="#{versionHome.instance.projectType.name() eq versionHome.instance.project.defaultProjectType.name()}"/>
 
-      <s:div id="project-type">
+      <h:panelGroup layout="block"  id="project-type">
         <ul class="list--slat l--push-bottom-1">
           <ui:repeat value="#{versionHome.projectTypeList}" var="projectType"
             varStatus="status">
             <li>
               <div class="form__radio js-form__radio"
                 onclick="onProjectTypeChanged(this)">
-                <s:fragment
+                <ui:fragment
                   rendered="#{versionHome.selectedProjectType eq projectType.name()}">
                   <input type="radio" name="project-type"
                     value="#{projectType.name()}"
                     class="form__radio__input js-form__radio__input"
                     id="#{status.index}:project-type" checked="true"/>
-                </s:fragment>
-                <s:fragment
+                </ui:fragment>
+                <ui:fragment
                   rendered="#{versionHome.selectedProjectType ne projectType.name()}">
                   <input type="radio" name="project-type"
                     value="#{projectType.name()}"
                     class="form__radio__input js-form__radio__input"
                     id="#{status.index}:project-type"/>
-                </s:fragment>
+                </ui:fragment>
 
                 <label for="#{status.index}:project-type"
                   class="form__radio__label">#{projectType.name()} <span
@@ -130,7 +130,7 @@
               </div>
             </li>
           </ui:repeat>
-          <s:fragment
+          <ui:fragment
             rendered="#{(versionHome.isNewInstance() and versionHome.project.defaultProjectType eq null) or (versionHome.managed and versionHome.instance.projectType eq null)}">
             <li>
               <div class="form__radio js-form__radio"
@@ -146,17 +146,17 @@
                 </label>
               </div>
             </li>
-          </s:fragment>
+          </ui:fragment>
         </ul>
-      </s:div>
-    </s:fragment>
-  </s:div>
+      </h:panelGroup>
+    </ui:fragment>
+  </h:panelGroup>
 
-  <s:div id="project-version" rendered="#{not versionHome.managed}">
+  <h:panelGroup layout="block"  id="project-version" rendered="#{not versionHome.managed}">
     <h:inputHidden id="copyFromVersionSlug"
       value="#{versionHome.copyFromVersionSlug}"/>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{versionHome.copyFromVersion and not empty versionHome.project.projectIterations}">
       <ul class="list--slat l--push-bottom-1">
         <ui:repeat value="#{versionHome.getOtherVersions()}"
@@ -164,16 +164,16 @@
           <li>
             <div class="form__radio js-form__radio"
               onclick="onCopyFromVersionChanged('#{versionItem.version.slug}')">
-              <s:fragment rendered="#{versionItem.selected}">
+              <ui:fragment rendered="#{versionItem.selected}">
                 <input type="radio" name="project-type" value="#{versionItem.version.slug}"
                   class="form__radio__input js-form__radio__input"
                   checked="true" id="#{status.index}:version:#{versionItem.version.slug}"/>
-              </s:fragment>
-              <s:fragment rendered="#{!versionItem.selected}">
+              </ui:fragment>
+              <ui:fragment rendered="#{!versionItem.selected}">
                 <input type="radio" name="project-type" value="#{versionItem.version.slug}"
                   class="form__radio__input js-form__radio__input"
                   id="#{status.index}:version:#{versionItem.version.slug}"/>
-              </s:fragment>
+              </ui:fragment>
               <label for="#{status.index}:version:#{versionItem.version.slug}"
                 class="form__radio__label"><zanata:version-label version="#{versionItem.version}"/>
                 <span class="txt--meta l--push-left-half">
@@ -187,8 +187,8 @@
           </li>
         </ui:repeat>
       </ul>
-    </s:fragment>
-  </s:div>
+    </ui:fragment>
+  </h:panelGroup>
 
 
-</s:fragment>
+</ui:fragment>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
index 81d58aa7dc..2946a667c2 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
@@ -26,35 +26,35 @@
     </a4j:status>
 
     <h:form id="groups-form" styleClass="l--push-bottom-1">
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{empty versionHomeAction.groups}">
         <p class="txt--meta">#{msgs['jsf.NoGroups']}</p>
-        <s:fragment
+        <ui:fragment
           rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
           <p>
-            <s:link styleClass="button--primary"
+            <h:link styleClass="button--primary"
               value="#{msgs['jsf.group.FindGroup']}"
-              view="/version-group/home.xhtml"
-              propagation="none">
+              outcome="/version-group/home.xhtml"
+              >
               <i class="i i--plus i__item__icon"></i>
-            </s:link>
+            </h:link>
           </p>
-        </s:fragment>
-      </s:div>
+        </ui:fragment>
+      </h:panelGroup>
 
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{not empty versionHomeAction.groups and empty versionHomeAction.groupFilter.currentPage}">
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-      </s:div>
+      </h:panelGroup>
 
       <ul class="list--slat">
         <ui:repeat value="#{versionHomeAction.groupFilter.currentPage}"
           var="group">
           <li class="l--pad-all-half">
-            <s:link value="#{group.name}" propagation="none"
-              view="/version-group/version_group.xhtml">
+            <h:link value="#{group.name}"
+              outcome="/version-group/version_group.xhtml">
               <f:param name="versionGroupSlug" value="#{group.slug}"/>
-            </s:link>
+            </h:link>
           </li>
         </ui:repeat>
       </ul>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
index 34eb403d79..62b6017a3e 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
@@ -35,7 +35,7 @@
         onbegin="clearHTML('#{rich:clientId('languages-language_form')}')"
         status="languageTab-languagesLoader"/>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
         <div
           class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
@@ -53,7 +53,7 @@
             </li>
           </ul>
         </div>
-      </s:fragment>
+      </ui:fragment>
     </div>
     <h2 class="panel__heading">#{msgs['jsf.Languages']}</h2>
   </div>
@@ -74,10 +74,10 @@
   </a4j:status>
 
   <h:form id="languages-language_form" styleClass="l--push-bottom-1">
-    <s:div styleClass="l--pad-all-half"
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{empty versionHomeAction.supportedLocale}">
       <p class="txt--meta">#{msgs['jsf.NoActiveLanguages']}</p>
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
         <p>
           <a class="button--primary" href="#{request.contextPath}/iteration/view/#{versionHomeAction.projectSlug}/#{versionHomeAction.versionSlug}/settings/languages"
@@ -85,15 +85,15 @@
             #{msgs['jsf.AddLanguages']}
           </a>
         </p>
-      </s:fragment>
-    </s:div>
+      </ui:fragment>
+    </h:panelGroup>
 
-    <s:div styleClass="l--pad-all-half"
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{not empty versionHomeAction.supportedLocale and empty versionHomeAction.languageTabLanguageFilter.currentPage}">
       <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-    </s:div>
+    </h:panelGroup>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{not empty versionHomeAction.languageTabLanguageFilter.currentPage}">
       <ul class="list--stats" id="languages-language_list">
         <ui:repeat
@@ -106,15 +106,17 @@
                 <div class="list__item__info">
                   <h3 class="list__title">
                     #{hLocale.retrieveDisplayName()}
-                    <s:fragment
+                    <ui:fragment
                       rendered="#{versionHomeAction.isUserAllowedToTranslateOrReview(hLocale) and hLocale.active}">
                       <i class="i--right i--translate txt--neutral"></i>
-                    </s:fragment>
-
-                    <s:span rendered="#{not hLocale.active}" styleClass="label"
-                      title="#{msgs['jsf.Language.Disabled']}">
-                      #{msgs['jsf.Disabled']}
-                    </s:span>
+                    </ui:fragment>
+
+                    <h:panelGroup layout="span" rendered="#{not hLocale.active}" styleClass="label">
+                      <!-- TODO check whether title is necessary -->
+                      <span title="#{msgs['jsf.Language.Disabled']}">
+                        #{msgs['jsf.Disabled']}
+                      </span>
+                    </h:panelGroup>
                   </h3>
                   <span class="list__item__meta">#{hLocale.localeId}</span>
                 </div>
@@ -125,7 +127,7 @@
                     </f:facet>
                   </a4j:status>
 
-                  <s:fragment rendered="#{versionHomeAction.pageRendered}">
+                  <ui:fragment rendered="#{versionHomeAction.pageRendered}">
                     <ui:param name="displayUnit"
                       value="#{versionHomeAction.getStatisticFigureForLocale(versionHomeAction.languageSortingList.selectedSortOption, hLocale.localeId)}"/>
                      <span class="#{displayUnit.cssClass}"
@@ -133,7 +135,7 @@
                         <span class="stats__figure">#{displayUnit.figure}</span>
                         <span class="stats__unit">#{displayUnit.unit}</span>
                      </span>
-                  </s:fragment>
+                  </ui:fragment>
                 </div>
               </div>
 
@@ -144,7 +146,7 @@
           </li>
         </ui:repeat>
       </ul>
-    </s:fragment>
+    </ui:fragment>
   </h:form>
 
   <zanata:list-filter status="languageTab-languagesLoader"
@@ -170,7 +172,7 @@
 
     <h:form styleClass="l--push-bottom-0 bx--inline"
       id="languages-export_options">
-      <s:div
+      <h:panelGroup layout="block"
         styleClass="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown"
         rendered="#{identity.loggedIn and versionHomeAction.selectedLocale != null}">
         <a class="dropdown__toggle js-dropdown__toggle" href="#"
@@ -178,7 +180,7 @@
           class="i i--ellipsis"></i></a>
         <ul class="dropdown__content js-dropdown__content" role="content"
           aria-labelledby="dropdownContent">
-          <s:fragment
+          <ui:fragment
             rendered="#{versionHomeAction.zipFileDownloadAllowed}">
             <li>
               <a href="#" class="i__item--right"
@@ -186,18 +188,18 @@
                 onclick="prepareDownloadDialog('#{msgs.format('jsf.iteration.files.DownloadAllMsg', versionHomeAction.selectedLocale.localeId)}')"
                 data-toggle="modal"
                 data-target="#zipDownloadProgressDialog">
-                <s:fragment
+                <ui:fragment
                   rendered="#{versionHomeAction.poProject}">
                   #{msgs['jsf.iteration.files.DownloadAll']}
-                </s:fragment>
-                <s:fragment
+                </ui:fragment>
+                <ui:fragment
                   rendered="#{not versionHomeAction.poProject}">
                   #{msgs['jsf.iteration.files.DownloadAllOfflinePo']}
-                </s:fragment>
+                </ui:fragment>
                 <i class="i i--export i__item__icon"></i>
               </a>
             </li>
-          </s:fragment>
+          </ui:fragment>
 
           <li>
             <h:outputLink styleClass="i__item--right"
@@ -212,7 +214,7 @@
             </h:outputLink>
           </li>
         </ul>
-      </s:div>
+      </h:panelGroup>
     </h:form>
   </div>
 
@@ -224,16 +226,17 @@
 
   <h2 class="panel__heading">
     <zanata:loader jsHandle="true" layout="inline" type="loader--small" id="languagesTab-language-label-loader" visible="false"/>
-    <s:span id="language-label">
-      <s:span
+    <h:panelGroup id="language-label">
+      <h:panelGroup layout="span"
         rendered="#{versionHomeAction.selectedLocale ne null and not versionHomeAction.selectedLocale.active}"
-        styleClass="label"
-        title="#{msgs['jsf.Language.Disabled']}">
-        #{msgs['jsf.Disabled']}
-      </s:span>
+        styleClass="label">
+        <span title="#{msgs['jsf.Language.Disabled']}">
+          #{msgs['jsf.Disabled']}
+        </span>
+      </h:panelGroup>
 
       #{versionHomeAction.selectedLocale.retrieveDisplayName()}
-    </s:span>
+    </h:panelGroup>
     #{msgs['jsf.Documents']}
   </h2>
 </div>
@@ -254,16 +257,16 @@
 </a4j:status>
 
 <h:form id="languages-document_list" styleClass="l--push-bottom-1">
-  <s:div styleClass="l--pad-all-half"
+  <h:panelGroup layout="block"  styleClass="l--pad-all-half"
     rendered="#{versionHomeAction.selectedLocale == null}">
     <p class="txt--meta">#{msgs['jsf.SelectALanguageFromList']}</p>
-  </s:div>
+  </h:panelGroup>
 
-  <s:fragment rendered="#{versionHomeAction.selectedLocale != null}">
-    <s:div styleClass="l--pad-all-half"
+  <ui:fragment rendered="#{versionHomeAction.selectedLocale != null}">
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{empty versionHomeAction.documents}">
       <p class="txt--meta">#{msgs['jsf.iteration.NoDocumentInVersion']}</p>
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
         <p>
           <a class="button--primary" href="#{request.contextPath}/iteration/view/#{versionHomeAction.projectSlug}/#{versionHomeAction.versionSlug}/settings/documents"
@@ -271,15 +274,15 @@
             #{msgs['jsf.ManageDocuments']}
           </a>
         </p>
-      </s:fragment>
-    </s:div>
+      </ui:fragment>
+    </h:panelGroup>
 
-    <s:div styleClass="l--pad-all-half"
+    <h:panelGroup layout="block"  styleClass="l--pad-all-half"
       rendered="#{not empty versionHomeAction.documents and empty versionHomeAction.languageTabDocumentFilter.currentPage}">
       <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-    </s:div>
+    </h:panelGroup>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{not empty versionHomeAction.languageTabDocumentFilter.currentPage}">
       <ul class="list--stats">
         <ui:repeat varStatus="status"
@@ -289,7 +292,7 @@
             value="#{versionHomeAction.selectedLocale.active and (identity.loggedIn or versionHomeAction.isPoDocument(document.docId) or (versionHomeAction.knownProjectType and !versionHomeAction.isPoDocument(document.docId)) or versionHomeAction.hasOriginal(document.path, document.name) or (versionHomeAction.isFileUploadAllowed(versionHomeAction.selectedLocale) and versionHomeAction.isUserAllowedToTranslateOrReview(versionHomeAction.selectedLocale)))}"/>
           <li
             class="progress-bar__expander #{hasActions ? 'list__item--actionable' : ''}">
-            <s:div styleClass="list__item__action" rendered="#{hasActions}">
+            <h:panelGroup layout="block"  styleClass="list__item__action" rendered="#{hasActions}">
               <div
                 class="dropdown dropdown--small dropdown--inline dropdown--single js-dropdown">
                 <a class="dropdown__toggle js-dropdown__toggle txt--meta"
@@ -300,24 +303,24 @@
                   </span>
                 </a>
                 <ul class="dropdown__content js-dropdown__content">
-                  <s:fragment rendered="#{identity.loggedIn}">
+                  <ui:fragment rendered="#{identity.loggedIn}">
                     <li id="#{status.index}:link-translate-online">
                       <h:outputLink styleClass="i__item--right"
                         value="#{versionHomeAction.getEditorUrl(locale.language, document.docId)}">
-                        <s:fragment
+                        <ui:fragment
                           rendered="#{versionHomeAction.isUserAllowedToTranslateOrReview(versionHomeAction.selectedLocale)}">
                           #{msgs['jsf.iteration.TranslateOnline']} <i
                           class="i i--translate i__item__icon"></i>
-                        </s:fragment>
-                        <s:fragment
+                        </ui:fragment>
+                        <ui:fragment
                           rendered="#{!versionHomeAction.isUserAllowedToTranslateOrReview(versionHomeAction.selectedLocale)}">
                           #{msgs['jsf.iteration.ViewOnline']} <i
                           class="i i--translate i__item__icon"></i>
-                        </s:fragment>
+                        </ui:fragment>
                       </h:outputLink>
                     </li>
-                  </s:fragment>
-                  <s:fragment
+                  </ui:fragment>
+                  <ui:fragment
                     rendered="#{versionHomeAction.isPoDocument(document.docId) and versionHomeAction.version.projectType ne 'File'}">
                     <li>
                       <h:outputLink styleClass="i__item--right"
@@ -331,8 +334,8 @@
                         <i class="i i--export i__item__icon"></i>
                       </h:outputLink>
                     </li>
-                  </s:fragment>
-                  <s:fragment
+                  </ui:fragment>
+                  <ui:fragment
                     rendered="#{versionHomeAction.knownProjectType and !versionHomeAction.isPoDocument(document.docId)}">
                     <li>
                       <h:outputLink styleClass="i__item--right"
@@ -347,8 +350,8 @@
                         <i class="i i--export i__item__icon"></i>
                       </h:outputLink>
                     </li>
-                  </s:fragment>
-                  <s:fragment
+                  </ui:fragment>
+                  <ui:fragment
                     rendered="#{versionHomeAction.hasOriginal(document.path, document.name)}">
                     <li>
                       <h:outputLink styleClass="i__item--right"
@@ -362,8 +365,8 @@
                         <i class="i i--export i__item__icon"></i>
                       </h:outputLink>
                     </li>
-                  </s:fragment>
-                  <s:fragment
+                  </ui:fragment>
+                  <ui:fragment
                     rendered="#{versionHomeAction.isFileUploadAllowed(versionHomeAction.selectedLocale) and versionHomeAction.isUserAllowedToTranslateOrReview(versionHomeAction.selectedLocale)}">
                     <li>
                       <a href="#" class="i__item--right"
@@ -373,12 +376,12 @@
                         <i class="i i--import i__item__icon"></i>
                       </a>
                     </li>
-                  </s:fragment>
+                  </ui:fragment>
                 </ul>
               </div>
-            </s:div>
+            </h:panelGroup>
 
-            <s:fragment rendered="#{versionHomeAction.selectedLocale.active}">
+            <ui:fragment rendered="#{versionHomeAction.selectedLocale.active}">
               <a
                 href="#{versionHomeAction.getEditorUrl(locale.language, document.docId)}">
                 <div class="list__item__content">
@@ -387,7 +390,7 @@
                     <span class="list__item__meta">#{document.path}</span>
                   </div>
 
-                  <s:div styleClass="list__item__stats"
+                  <h:panelGroup layout="block"  styleClass="list__item__stats"
                     rendered="#{versionHomeAction.pageRendered}">
                     <ui:param name="displayUnit"
                       value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.documentSortingList.selectedSortOption, versionHomeAction.selectedLocale.localeId, document)}"/>
@@ -396,7 +399,7 @@
                         <span class="stats__figure">#{displayUnit.figure}</span>
                         <span class="stats__unit">#{displayUnit.unit}</span>
                      </span>
-                  </s:div>
+                  </h:panelGroup>
                 </div>
                 <zanata:statistic
                   value="#{versionHomeAction.getStatisticForDocument(document.id, versionHomeAction.selectedLocale.localeId)}"
@@ -404,8 +407,8 @@
 
                 <zanata:loader rendered="#{!versionHomeAction.pageRendered}"/>
               </a>
-            </s:fragment>
-            <s:fragment
+            </ui:fragment>
+            <ui:fragment
               rendered="#{not versionHomeAction.selectedLocale.active}">
               <div class="list__item__content">
                 <div class="list__item__info">
@@ -413,7 +416,7 @@
                   <span class="list__item__meta">#{document.path}</span>
                 </div>
 
-                <s:div styleClass="list__item__stats"
+                <h:panelGroup layout="block"  styleClass="list__item__stats"
                   rendered="#{versionHomeAction.pageRendered}">
                   <ui:param name="displayUnit"
                     value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.documentSortingList.selectedSortOption, versionHomeAction.selectedLocale.localeId, document)}"/>
@@ -422,19 +425,19 @@
                       <span class="stats__figure">#{displayUnit.figure}</span>
                       <span class="stats__unit">#{displayUnit.unit}</span>
                    </span>
-                </s:div>
+                </h:panelGroup>
               </div>
               <zanata:statistic
                 value="#{versionHomeAction.getStatisticForDocument(document.id, versionHomeAction.selectedLocale.localeId)}"
                 rendered="#{versionHomeAction.pageRendered}"/>
 
               <zanata:loader rendered="#{!versionHomeAction.pageRendered}"/>
-            </s:fragment>
+            </ui:fragment>
           </li>
         </ui:repeat>
       </ul>
-    </s:fragment>
-  </s:fragment>
+    </ui:fragment>
+  </ui:fragment>
 </h:form>
 
 <zanata:list-filter placeholder="#{msgs['jsf.document.search.placeholder']}"
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
index f07ab82ef8..e346080c60 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
@@ -5,6 +5,7 @@
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:f="http://java.sun.com/jsf/core"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
   class="modal" id="mergeTransDialog" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true">
 
@@ -84,7 +85,7 @@
           </div>
         </div>
 
-        <s:div styleClass="l--pad-all-half bg--pop-higher" id="selection-section">
+        <h:panelGroup layout="block"  styleClass="l--pad-all-half bg--pop-higher" id="selection-section">
           <h3 class="epsilon l--push-bottom-quarter">
             <h:outputText
               value="#{msgs['jsf.iteration.mergeTrans.fromVersion.label']}"
@@ -94,12 +95,12 @@
             <i class="i i--project l--push-right-quarter"></i>
             <div id="project-static" class="bx--inline-block">
               #{mergeTransAction.sourceProject.name}
-              <s:fragment rendered="#{not empty mergeTransAction.projects}">
+              <ui:fragment rendered="#{not empty mergeTransAction.projects}">
                 <a href="#" class="txt--mini l--push-left-1"
                   onclick="displayProjectSelector(true)">
                   #{msgs['jsf.iteration.mergeTrans.chooseAnotherProject']}
                 </a>
-              </s:fragment>
+              </ui:fragment>
             </div>
             <h:selectOneMenu id="projectSelector" rendered="#{not empty mergeTransAction.projects}"
               styleClass="w--1-2 is-hidden" onchange="bindSourceProjectSlug(this.value)">
@@ -108,20 +109,20 @@
                 itemValue="#{project.slug}" itemLabelEscaped="true"/>
             </h:selectOneMenu>
           </div>
-          <s:div id="sourceVersions">
-            <s:fragment rendered="#{empty mergeTransAction.sourceVersions}">
+          <h:panelGroup layout="block"  id="sourceVersions">
+            <ui:fragment rendered="#{empty mergeTransAction.sourceVersions}">
               <div class="bg--neutral l--pad-all-half">
                 <h3 class="epsilon">
                   #{msgs['jsf.iteration.mergeTrans.noVersionToMerge.heading']}
                 </h3>
-                <s:fragment rendered="#{not empty mergeTransAction.projects}">
+                <ui:fragment rendered="#{not empty mergeTransAction.projects}">
                   <p class="txt--meta">
                     #{msgs['jsf.iteration.mergeTrans.noVersionToMerge.description']}
                   </p>
-                </s:fragment>
+                </ui:fragment>
               </div>
-            </s:fragment>
-            <s:fragment rendered="#{not empty mergeTransAction.sourceVersions}">
+            </ui:fragment>
+            <ui:fragment rendered="#{not empty mergeTransAction.sourceVersions}">
               <i class="i i--version l--push-right-quarter"></i>
               <h:selectOneMenu styleClass="w--1-2"
                 onchange="bindSourceVersionSlug(this.value)">
@@ -129,8 +130,8 @@
                   var="version" itemLabel="#{version.slug}"
                   itemValue="#{version.slug}" itemLabelEscaped="true"/>
               </h:selectOneMenu>
-            </s:fragment>
-          </s:div>
+            </ui:fragment>
+          </h:panelGroup>
 
           <div class="l--push-top-half">
             <zanata:checkbox
@@ -144,12 +145,12 @@
               </span>
             </zanata:checkbox>
           </div>
-        </s:div>
+        </h:panelGroup>
       </div>
 
       <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
         <div class="g--tight">
-          <s:div styleClass="g__item txt--align-right"
+          <h:panelGroup layout="block"  styleClass="g__item txt--align-right"
             id="merge-trans-buttons">
             <a4j:commandButton id="merge-button"
               rendered="#{not mergeTransAction.isCopyActionsRunning(mergeTransAction.targetProjectSlug, mergeTransAction.targetVersionSlug)}"
@@ -157,11 +158,11 @@
               action="#{mergeTransAction.startMergeTranslations}"
               value="#{msgs['jsf.iteration.mergeTrans']}"/>
 
-            <s:fragment rendered="#{mergeTransAction.isCopyActionsRunning(mergeTransAction.targetProjectSlug, mergeTransAction.targetVersionSlug)}">
+            <ui:fragment rendered="#{mergeTransAction.isCopyActionsRunning(mergeTransAction.targetProjectSlug, mergeTransAction.targetVersionSlug)}">
               <zanata:loader type="loader--small" layout="inline" jsHandle="true"
                 id="merge-trans-loader"/>
-            </s:fragment>
-          </s:div>
+            </ui:fragment>
+          </h:panelGroup>
         </div>
       </footer>
 
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
index bd0ddb17d4..67fb5e2034 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
@@ -13,7 +13,7 @@
   </h2>
 
   <h:form id="settings-languages-form" styleClass="l--push-bottom-0">
-    <s:div id="settings-languages-list">
+    <h:panelGroup layout="block"  id="settings-languages-list">
 
       <button styleClass="button--small l--push-bottom-half" jsfc="a4j:commandButton"
         value="#{msgs['jsf.iteration.inheriteLanguage.label']}"
@@ -114,7 +114,7 @@
                       </button>
                     </div>
                     <ul class="dropdown__content js-dropdown__content">
-                      <s:fragment rendered="#{not versionHome.hasLocaleAlias(locale)}">
+                      <ui:fragment rendered="#{not versionHome.hasLocaleAlias(locale)}">
                         <li>
                           <h:outputLink id="addLocaleAliasLink"
                             styleClass="dropdown__content__link button--link i__item--left"
@@ -124,8 +124,8 @@
                             #{msgs['jsf.languages.AddAlias']}
                           </h:outputLink>
                         </li>
-                      </s:fragment>
-                      <s:fragment rendered="#{versionHome.hasLocaleAlias(locale)}">
+                      </ui:fragment>
+                      <ui:fragment rendered="#{versionHome.hasLocaleAlias(locale)}">
                         <li>
                           <h:outputLink id="editLocaleAliasLink"
                             styleClass="dropdown__content__link button--link i__item--left"
@@ -135,8 +135,8 @@
                             #{msgs['jsf.languages.EditAlias']}
                           </h:outputLink>
                         </li>
-                      </s:fragment>
-                      <s:fragment rendered="#{versionHome.hasLocaleAlias(locale)}">
+                      </ui:fragment>
+                      <ui:fragment rendered="#{versionHome.hasLocaleAlias(locale)}">
                         <li>
                           <button
                             class="dropdown__content__link button--link txt--danger i__item--left"
@@ -145,7 +145,7 @@
                             #{msgs['jsf.languages.DeleteAlias']}
                           </button>
                         </li>
-                      </s:fragment>
+                      </ui:fragment>
                     </ul>
                   </div>
                 </div>
@@ -270,7 +270,7 @@
 
       </ui:decorate>
 
-    </s:div>
+    </h:panelGroup>
   </h:form>
 
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
index bb722593be..5d236db26e 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
@@ -50,13 +50,13 @@
 
 <h1>#{msgs['jsf.iteration.VersionSettings']}</h1>
 
-<s:div styleClass="tabs--vertical js-tabs" id="version-settings">
-<s:fragment rendered="#{versionHomeAction.copyVersionHandler.inProgress}">
+<h:panelGroup layout="block"  styleClass="tabs--vertical js-tabs" id="version-settings">
+<ui:fragment rendered="#{versionHomeAction.copyVersionHandler.inProgress}">
   <div class="bg--pop-highest l--pad-all-1">
     #{msgs['jsf.copyVersion.versionSettingsDisabled']}
   </div>
-</s:fragment>
-<s:fragment rendered="#{not versionHomeAction.copyVersionHandler.inProgress}">
+</ui:fragment>
+<ui:fragment rendered="#{not versionHomeAction.copyVersionHandler.inProgress}">
 <ul class="tabs__nav js-tabs-nav">
   <li>
     <a id="settings-general_tab"
@@ -107,8 +107,8 @@
         styleClass="l--push-right-half button--primary"/>
     </div>
     <hr/>
-    <s:div styleClass="g--tight" id="status">
-      <s:div styleClass="g__item w--1-2 l--push-bottom-1"
+    <h:panelGroup layout="block"  styleClass="g--tight" id="status">
+      <h:panelGroup layout="block"  styleClass="g__item w--1-2 l--push-bottom-1"
         rendered="#{versionHome.instance.status == 'ACTIVE'}">
         <a4j:commandLink
           styleClass="button--warning l--push-bottom-half"
@@ -120,16 +120,16 @@
 
         <p
           class="txt--meta">#{msgs['jsf.iteration.readonly.Message']}</p>
-      </s:div>
-      <s:div styleClass="g__item w--1-2 l--push-bottom-1"
+      </h:panelGroup>
+      <h:panelGroup layout="block"  styleClass="g__item w--1-2 l--push-bottom-1"
         rendered="#{versionHome.instance.status ne 'ACTIVE'}">
-        <s:fragment
+        <ui:fragment
           rendered="#{versionHome.instance.status eq 'OBSOLETE'}">
           <button class="button--success l--push-bottom-half" disabled="true">
             <i class="i--left i--lock"></i>
             #{msgs['jsf.iteration.writable']}
           </button>
-        </s:fragment>
+        </ui:fragment>
         <a4j:commandLink
           styleClass="button--success l--push-bottom-half"
           rendered="#{versionHome.instance.status eq 'READONLY'}"
@@ -139,11 +139,11 @@
         </a4j:commandLink>
 
         <p class="txt--meta">#{msgs['jsf.iteration.writable.Message']}</p>
-      </s:div>
+      </h:panelGroup>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionHome.instance, 'mark-obsolete')}">
-        <s:div styleClass="g__item w--1-2"
+        <h:panelGroup layout="block"  styleClass="g__item w--1-2"
           rendered="#{versionHome.instance.status ne 'OBSOLETE'}">
           <a href="javascript:void(0)" class="button--danger l--push-bottom-half"
             onclick="zanata.modal.show('#delete-confirmation-modal')">
@@ -152,9 +152,9 @@
           </a>
           <p
             class="txt--meta">#{msgs['jsf.iteration.delete.Message']}</p>
-        </s:div>
-      </s:fragment>
-    </s:div>
+        </h:panelGroup>
+      </ui:fragment>
+    </h:panelGroup>
   </h:form>
 </li>
 <li id="settings-documents">
@@ -319,21 +319,21 @@
             <div class="g__item w--5-12">
               <div class="button--group txt--align-right">
                 <ui:repeat value="#{versionHome.validationStates}" var="state">
-                  <s:fragment rendered="#{validationAction.state eq state}">
+                  <ui:fragment rendered="#{validationAction.state eq state}">
                     <input name="#{validationAction.id.name()}"
                       id="#{validationAction.id.name()}-#{state}"
                       checked="true" type="radio"
                       onchange="onValidationOptionChange(this.id)"
                       class="form__item__input js-example__setter"
                       data-example=""/>
-                  </s:fragment>
-                  <s:fragment rendered="#{validationAction.state ne state}">
+                  </ui:fragment>
+                  <ui:fragment rendered="#{validationAction.state ne state}">
                     <input name="#{validationAction.id.name()}"
                       id="#{validationAction.id.name()}-#{state}"
                       onchange="onValidationOptionChange(this.id)"
                       type="radio" data-example=""
                       class="form__item__input js-example__setter"/>
-                  </s:fragment>
+                  </ui:fragment>
                   <label for="#{validationAction.id.name()}-#{state}"
                     class="button button--#{state.name() == 'Error'?'danger':state}">#{state}</label>
                 </ui:repeat>
@@ -367,8 +367,8 @@
   </h:form>
 </li>
 </ul>
-</s:fragment>
-</s:div>
+</ui:fragment>
+</h:panelGroup>
 
 <ui:include src="/WEB-INF/layout/copy_trans_inline_modal.xhtml"/>
   <ui:include src="/WEB-INF/layout/delete_confirmation_modal.xhtml">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
index 14577df69b..6e419d6677 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
@@ -1,6 +1,5 @@
 <div xmlns="http://www.w3.org/1999/xhtml"
   xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:rich="http://richfaces.org/rich"
@@ -13,16 +12,14 @@
       zanata.loader.deactivate('#upload-translation-loader');
       setUploadTranslationDocButtonEnabled(false);
       setUploadTranslationDocButtonVisible(true);
-      getUploadFileComponent().change(function() {
-        var isFileSelected = getUploadFileName() != '';
-        if (isFileSelected) {
-          renderAdapterSelection(getUploadFileName());
-        }
-        setUploadTranslationDocButtonEnabled(isFileSelected);
-        setUploadTranslationDocButtonVisible(true);
-      });
     });
 
+    function onTranslationFileSubmitted() {
+      renderAdapterSelection(getUploadFileName());
+      setUploadTranslationDocButtonEnabled(true);
+      setUploadTranslationDocButtonVisible(true);
+    }
+
     function setUploadTranslationDocButtonEnabled(enable) {
       getUploadTranslationDocButton().prop('disabled', !enable);
     }
@@ -35,16 +32,12 @@
       return jQuery('#' + jqSelector('#{rich:clientId('upload-button')}'));
     }
 
-    function getUploadFileComponent() {
-      return jQuery('#' + jqSelector('#{rich:clientId('upload-file')}'));
-    }
-
     function clearDocumentTypeSelection() {
       jQuery('#' + jqSelector('#{rich:clientId('documentType-selection')}')).html('');
     }
 
     function getUploadFileName() {
-      return getUploadFileComponent().val();
+      return jQuery('.rf-fu-itm-lbl').text();
     }
 
     function getDocTypeSelection() {
@@ -53,7 +46,6 @@
 
     function cancelUpload() {
       zanata.loader.deactivate('#upload-translation-loader');
-      getUploadFileComponent().val('');
       clearDocumentTypeSelection();
       setUploadTranslationDocButtonEnabled(false);
       setUploadTranslationDocButtonVisible(true);
@@ -105,7 +97,7 @@
       </button>
     </header>
 
-    <h:form id="uploadForm" styleClass="l--push-bottom-0" enctype="multipart/form-data">
+    <h:form id="uploadForm" styleClass="l--push-bottom-0">
       <h:inputHidden id="uploadDocId"
         value="#{versionHomeAction.translationFileUpload.docId}"/>
 
@@ -113,13 +105,18 @@
         <div class="l--pad-top-quarter form__item txt--understated" id="uploadPanelMsg"></div>
 
         <div class="form__item">
-          <s:fileUpload accept="*" id="upload-file"
-            data="#{versionHomeAction.translationFileUpload.fileContents}"
-            fileName="#{versionHomeAction.translationFileUpload.fileName}"/>
+          <rich:fileUpload id="upload-file"
+            fileUploadListener="#{versionHomeAction.transFileUploaded}"
+            onfilesubmit="onTranslationFileSubmitted()"
+            addControlLabel="Select file..." clearAllLabel="Clear all" clearLabel="Clear"
+            uploadLabel="upload" immediateUpload="true" maxFilesQuantity="1"
+            listHeight="100"
+            />
+
         </div>
 
-        <s:div id="documentType-selection">
-          <s:div styleClass="l--pad-top-half form__item"
+        <h:panelGroup layout="block"  id="documentType-selection">
+          <h:panelGroup layout="block"  styleClass="l--pad-top-half form__item"
             rendered="#{versionHomeAction.needDocumentTypeSelection(fileName)}">
             <h:outputLabel>#{msgs['jsf.iteration.documentType.select']}</h:outputLabel>
             <h:selectOneMenu id="documentTypes" onchange="bindDocumentType(jQuery(this).val())"
@@ -131,8 +128,8 @@
                 itemLabel="#{documentType.name()}"
                 itemValue="#{documentType.name()}"/>
             </h:selectOneMenu>
-          </s:div>
-        </s:div>
+          </h:panelGroup>
+        </h:panelGroup>
 
         <div class="l--pad-top-half form__item">
           <ul class="list--horizontal">
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
index 4b20951d36..3b411de5db 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
@@ -3,6 +3,7 @@
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
   class="modal" id="zipDownloadProgressDialog" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true">
 
@@ -23,7 +24,7 @@
     }
   </script>
 
-  <s:div id="zip-download-dialog">
+  <h:panelGroup layout="block"  id="zip-download-dialog">
     <a4j:jsFunction name="cancelDownload" oncomplete="enableDownload(true)"
       action="#{projectIterationZipFileAction.cancelFileDownload}"
       render="download-progress" limitRender="true"/>
@@ -46,8 +47,8 @@
           <div class="l--pad-top-half form__item txt--understated"
             id="downloadDialogMsg"></div>
 
-          <s:div styleClass="l--pad-top-half form__item" id="download-progress">
-            <s:fragment
+          <h:panelGroup layout="block"  styleClass="l--pad-top-half form__item" id="download-progress">
+            <ui:fragment
               rendered="#{projectIterationZipFileAction.zipFilePrepHandle ne null and not projectIterationZipFileAction.zipFilePrepHandle.done}">
               <a4j:poll render="download-progress" interval="500"
                 enabled="#{projectIterationZipFileAction.zipFilePrepHandle ne null and not projectIterationZipFileAction.zipFilePrepHandle.done}"/>
@@ -72,9 +73,9 @@
                   </div>
                 </li>
               </ul>
-            </s:fragment>
+            </ui:fragment>
 
-            <s:fragment
+            <ui:fragment
               rendered="#{projectIterationZipFileAction.zipFilePrepHandle.done}">
               <script type="text/javascript">
                 window.location =
@@ -82,8 +83,8 @@
                 enableDownload(true);
                 zanata.modal.hide('#zipDownloadProgressDialog');
               </script>
-            </s:fragment>
-          </s:div>
+            </ui:fragment>
+          </h:panelGroup>
         </div>
 
         <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
@@ -108,5 +109,5 @@
         </footer>
       </h:form>
     </div>
-  </s:div>
+  </h:panelGroup>
 </div>
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
index 82d805535d..d619de8eef 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
@@ -4,6 +4,7 @@
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
   <script type="text/javascript">
@@ -13,10 +14,10 @@
   </script>
 
   <h1 class="header__title">
-    <s:link view="/home.xhtml" propagation="none" id="home">
+    <h:link outcome="/home.xhtml"  id="home">
       <img class="header__site-logo" src="#{assets['img/logo/logo.svg']}"/>
       #{msgs['jsf.Zanata']}
-    </s:link>
+    </h:link>
   </h1>
 
   <nav id="nav-main" class="header__main-nav js-dropdown">
@@ -40,55 +41,55 @@
           onSelectItem="selectItem"
           inputClass="form--search__input js-form--search__input">
 
-          <s:link propagation="none" view="/project/project.xhtml"
+          <h:link  outcome="/project/project.xhtml"
             rendered="#{!result.isProjectNull()}">
             <i class="i i--project"></i> #{result.project.name}
             <f:param name="slug" value="#{result.project.slug}"/>
-          </s:link>
+          </h:link>
 
-          <s:link propagation="none" view="/profile/home.xhtml"
+          <h:link  outcome="/profile/home.xhtml"
             rendered="#{!result.isUserNull()}">
             <i class="i i--user"></i> #{result.account.username}
             <f:param name="username" value="#{result.account.username}"/>
-          </s:link>
+          </h:link>
 
-          <s:link view="/search.xhtml" rendered="#{result.isProjectNull() and result.isUserNull()}">
+          <h:link outcome="/search.xhtml" rendered="#{result.isProjectNull() and result.isUserNull()}">
             <i class="i i--search"></i> Search Zanata for
             '#{zanataSearch.autocomplete.query}'
             <f:param name="query" value="#{zanataSearch.autocomplete.query}"/>
-          </s:link>
+          </h:link>
 
         </zanata:autocomplete>
 
       </h:form>
       <ul class="header__main-nav__menu">
         <li>
-          <s:link id="projects_link" view="/project/home.xhtml"
-            propagation="none">#{msgs['jsf.Projects']}
+          <h:link id="projects_link" outcome="/project/home.xhtml"
+            >#{msgs['jsf.Projects']}
             <i class="is-hidden--m-up l--float-right i--inline i--project"></i>
-          </s:link>
+          </h:link>
         </li>
         <li>
-          <s:link id="version-groups_link" view="/version-group/home.xhtml"
-            propagation="none">#{msgs['jsf.Groups']}
+          <h:link id="version-groups_link" outcome="/version-group/home.xhtml"
+            >#{msgs['jsf.Groups']}
             <i class="is-hidden--m-up l--float-right i--inline i--group"></i>
-          </s:link>
+          </h:link>
         </li>
         <li>
-          <s:link id="languages_link" view="/language/home.xhtml"
-            propagation="none">#{msgs['jsf.Languages']}
+          <h:link id="languages_link" outcome="/language/home.xhtml"
+            >#{msgs['jsf.Languages']}
             <i class="is-hidden--m-up l--float-right i--inline i--language"></i>
-          </s:link>
+          </h:link>
         </li>
-        <s:fragment rendered="#{identity.loggedIn}">
+        <ui:fragment rendered="#{identity.loggedIn}">
           <li>
-            <s:link id="glossary_link" view="/glossary/view.xhtml"
-              propagation="none">#{msgs['jsf.Glossary']}
+            <h:link id="glossary_link" outcome="/glossary/view.xhtml"
+              >#{msgs['jsf.Glossary']}
               <i
                 class="is-hidden--m-up l--float-right i--inline i--glossary"></i>
-            </s:link>
+            </h:link>
           </li>
-        </s:fragment>
+        </ui:fragment>
 
         <li>
           <a id="help_link" target="_blank" href="#{applicationConfigurationAction.helpUrl}">
@@ -100,7 +101,7 @@
     </div>
   </nav>
 
-  <s:fragment
+  <ui:fragment
     rendered="#{identity.loggedIn and authenticatedAccountHome.instance.enabled}">
     <nav class="header__user-nav js-dropdown">
       <a href="#nav-user" class="header__user-nav__toggle js-dropdown__toggle"
@@ -115,11 +116,11 @@
       </a>
       <ul id="nav-user" class="header__user-nav__menu js-dropdown__content">
         <li>
-          <s:link id="dashboard" view="/dashboard/home.xhtml"
-            propagation="none">
+          <h:link id="dashboard" outcome="/dashboard/home.xhtml"
+            >
             #{msgs['jsf.Dashboard']} <i
             class="l--float-right i--inline i--dashboard"></i>
-          </s:link>
+          </h:link>
         </li>
         <li>
           <a href="#{request.contextPath}/dashboard/settings">
@@ -127,15 +128,15 @@
             class="l--float-right i--inline i--settings"></i>
           </a>
         </li>
-        <s:fragment rendered="#{identity.hasRole('admin')}">
+        <ui:fragment rendered="#{identity.hasRole('admin')}">
           <li>
-            <s:link id="administration" view="/admin/home.xhtml"
-              propagation="none">
+            <h:link id="administration" outcome="/admin/home.xhtml"
+              >
               #{msgs['jsf.Administration']} <i
               class="l--float-right i--inline i--admin"></i>
-            </s:link>
+            </h:link>
           </li>
-        </s:fragment>
+        </ui:fragment>
         <li>
           <a jsfc="s:link" id="right_menu_sign_out_link"
             view="/home.xhtml"
@@ -145,20 +146,20 @@
         </li>
       </ul>
     </nav>
-  </s:fragment>
+  </ui:fragment>
 
-  <s:fragment rendered="#{not identity.loggedIn}">
-    <s:div styleClass="header__login l--float-right">
-      <s:link id="register_link_internal_auth" view="/account/register.xhtml"
+  <ui:fragment rendered="#{not identity.loggedIn}">
+    <h:panelGroup layout="block"  styleClass="header__login l--float-right">
+      <h:link id="register_link_internal_auth" outcome="/account/register.xhtml"
         value="#{msgs['jsf.Signup']}"
-        propagation="none" styleClass="is-hidden--s button"
+         styleClass="is-hidden--s button"
         rendered="#{applicationConfiguration.internalAuth}"/>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{applicationConfigurationAction.registrationLinkNeeded}">
         <a id="register_link" href="#{applicationConfiguration.registerPath}"
           class="is-hidden--s button">#{msgs['jsf.Signup']}</a>
-      </s:fragment>
+      </ui:fragment>
 
       <h:outputLink id="signin_link"
         value="#{request.contextPath}/account/sign_in?continue=#{urlUtil.getEncodedLocalUrl(request)}"
@@ -181,7 +182,7 @@
         rendered="#{applicationConfiguration.kerberosAuth}">
         #{msgs['jsf.Login']}
       </h:outputLink>
-    </s:div>
-  </s:fragment>
+    </h:panelGroup>
+  </ui:fragment>
 
 </header>
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
index df77c1fe26..d855cb4849 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
@@ -8,23 +8,23 @@
   xmlns:rich="http://richfaces.org/rich">
 
   <h:form>
-    <s:link view="/home.xhtml" propagation="none"
+    <h:link outcome="/home.xhtml"
       rendered="#{not empty breadcrumbs.locations}"
       styleClass="breadcrumbs_home">
       <span class="icon-home-1" title="#{msgs['jsf.Zanata']}"/>
-    </s:link>
+    </h:link>
 
     <c:forEach items="#{breadcrumbs.locations}" var="breadcrumb">
       <span class="icon-right-open breadcrumbs-seperator"/>
-      <s:link value="#{breadcrumb.display}" view="#{breadcrumb.location}"
+      <h:link value="#{breadcrumb.display}" outcome="#{breadcrumb.location}"
         styleClass="breadcrumbs_link"
         rendered="#{not empty breadcrumb.location}">
         <c:forEach items="#{breadcrumb.params.keySet()}" var="param">
           <f:param name="#{param}" value="#{breadcrumb.params.get(param)}"/>
         </c:forEach>
-      </s:link>
-      <s:span styleClass="breadcrumbs_display"
-        rendered="#{empty breadcrumb.location}">#{breadcrumb.display}</s:span>
+      </h:link>
+      <h:panelGroup layout="span" styleClass="breadcrumbs_display"
+        rendered="#{empty breadcrumb.location}">#{breadcrumb.display}</h:panelGroup>
     </c:forEach>
   </h:form>
 </div>
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
index 125cf9d099..4ccd84d959 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
@@ -18,12 +18,12 @@
                 target="_blank">#{msgs['jsf.Blog']}</a></li>
               <li><a href="#{applicationConfigurationAction.helpUrl}"
                 target="_blank">#{msgs['jsf.Help']}</a></li>
-              <s:fragment rendered="#{identity.loggedIn}">
+              <ui:fragment rendered="#{identity.loggedIn}">
                 <ui:include src="../layout/admin/contact_admin_modal.xhtml"/>
                 <li><a href="#"
                     data-toggle="modal" data-target="#contactAdminDialog">
                     #{msgs['jsf.ContactAdmin']}</a></li>
-              </s:fragment>
+              </ui:fragment>
               <li><a href="http://zanata.org/issues"
                 target="_blank">#{msgs['jsf.ReportAProblem']}</a>
               </li>
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
index 202027735d..f9eed7cf26 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
@@ -3,7 +3,7 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:s="http://jboss.org/schema/seam/taglib">
-  <s:fragment
+  <ui:fragment
     rendered="#{not empty applicationConfiguration.piwikUrl and not empty applicationConfiguration.piwikIdSite}">
     <!-- Piwik -->
     <script type="text/javascript">
@@ -50,7 +50,7 @@
     //]]>
     </script>
     <!-- End Piwik Code -->
-  </s:fragment>
+  </ui:fragment>
 
   <ui:remove>
   <!--                                                                         -->
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
index 3b019ab277..fc005787a0 100755
--- a/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
@@ -85,7 +85,7 @@
   <h:body styleClass="new-zanata">
     <ui:include src="banner.xhtml"/>
     <a4j:outputPanel layout="block" ajaxRendered="true" id="messages">
-      <s:fragment rendered="#{showGlobalMessages != 'false'}">
+      <ui:fragment rendered="#{showGlobalMessages != 'false'}">
         <ul class="list--no-bullets message--global">
           <zanata:global-messages value="#{jsfMessages.globalMessagesList}"
             rendered="#{not facesContext.validationFailed and not empty jsfMessages.globalMessagesList}"/>
@@ -96,7 +96,7 @@
           rendered="#{conversationScopeMessages.hasMessages() or (not facesContext.validationFailed and not empty jsfMessages.globalMessagesList)}">
           startGlobalMessageTimer();
         </h:outputScript>
-      </s:fragment>
+      </ui:fragment>
     </a4j:outputPanel>
 
     <main role="main" class="l--pad-v-1">
diff --git a/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml b/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
index f43cf5d20d..eca6dca991 100644
--- a/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
+++ b/zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
@@ -3,14 +3,15 @@
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   template="/WEB-INF/template/template_nobanner.xhtml">
 
   <ui:define name="page_title">#{msgs['jsf.ResetPassword']}</ui:define>
   <ui:define name="center_content">
     <div class="header__logo-only">
-      <s:link view="/home.xhtml" propagation="none" id="home" tabindex="1">
+      <h:link outcome="/home.xhtml" id="home" tabindex="1">
         <img src="#{assets['img/logo/logo.svg']}" alt="Zanata"/>
-      </s:link>
+      </h:link>
     </div>
     <div class="g--centered">
       <div class="g__item l--constrain-small">
@@ -31,14 +32,13 @@
             </a4j:outputPanel>
 
             <div class="l--push-top-half l--pad-all-1 bg--pop-higher">
-              <s:decorate id="usernameEmailField" template="/WEB-INF/layout/field.xhtml"
-                enclose="true">
+              <zanata:decorate id="usernameEmail" componentId="usernameEmailField">
                 <h:outputLabel for="usernameEmail">#{msgs['jsf.UsernameOrEmail.placeholder']}</h:outputLabel>
                 <h:inputText id="usernameEmail" required="true" placeholder="#{msgs['jsf.UsernameOrEmail.placeholder']}"
                   value="#{passwordResetRequest.usernameOrEmail}" maxlength="260">
                   <a4j:ajax event="blur" render="usernameEmailField"/>
                 </h:inputText>
-              </s:decorate>
+              </zanata:decorate>
               <a4j:commandButton styleClass="l--push-top-1 button--primary button--full"
                 value="#{msgs['jsf.ResetPassword']}" render="actions"
                 action="#{passwordResetRequest.requestReset}" id="submitRequest"/>
diff --git a/zanata-war/src/main/webapp/account/inactive_account.xhtml b/zanata-war/src/main/webapp/account/inactive_account.xhtml
index dfb6fff0d9..78ceace67c 100644
--- a/zanata-war/src/main/webapp/account/inactive_account.xhtml
+++ b/zanata-war/src/main/webapp/account/inactive_account.xhtml
@@ -4,6 +4,7 @@
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   template="../WEB-INF/template/template_nobanner.xhtml">
 
   <ui:define name="page_title">#{msgs['jsf.InactiveAccount']}</ui:define>
@@ -14,9 +15,9 @@
 
 
     <div class="header__logo-only">
-      <s:link view="/home.xhtml" propagation="none" id="home" tabindex="1">
+      <h:link outcome="/home.xhtml" id="home" tabindex="1">
         <img src="#{assets['img/logo/logo.svg']}" alt="Zanata"/>
-      </s:link>
+      </h:link>
     </div>
 
     <div class="g--centered">
@@ -35,12 +36,11 @@
 
               <h:outputText value="#{msgs['jsf.or']}"/>
 
-              <s:decorate id="emailField" template="../WEB-INF/layout/field.xhtml" styleClass="l--push-top-quarter">
+              <zanata:decorate id="email" styleClass="l--push-top-quarter" componentId="emailField">
                 <div class="form--inline">
                   <h:inputText id="email" styleClass="form--inline__input" value="#{inactiveAccountAction.email}"
                     placeholder="#{msgs['jsf.email.placeholder']}">
                     <a4j:ajax event="blur" render="emailField"/>
-                    <rich:placeholder value="#{msgs['jsf.email.placeholder']}" styleClass="txt--neutral"/>
                   </h:inputText>
 
                   <div class="form--inline__suffix">
@@ -49,7 +49,7 @@
                       action="#{inactiveAccountAction.changeEmail}"/>
                   </div>
                 </div>
-              </s:decorate>
+              </zanata:decorate>
             </h:form>
           </div>
         </div>
diff --git a/zanata-war/src/main/webapp/account/login.xhtml b/zanata-war/src/main/webapp/account/login.xhtml
index 8191ed6a92..0680f4aa78 100644
--- a/zanata-war/src/main/webapp/account/login.xhtml
+++ b/zanata-war/src/main/webapp/account/login.xhtml
@@ -12,9 +12,9 @@
   <ui:define name="center_content">
 
     <div class="header__logo-only">
-      <s:link view="/home.xhtml" propagation="none" id="home" tabindex="1">
+      <h:link outcome="/home.xhtml" id="home" tabindex="1">
         <img src="#{assets['img/logo/logo.svg']}" alt="Zanata"/>
-      </s:link>
+      </h:link>
     </div>
 
     <div class="g--centered">
@@ -33,20 +33,20 @@
             <ui:remove>
               <!--Internal, JAAS and Kerberos Login form-->
             </ui:remove>
-            <s:div
+            <h:panelGroup layout="block"
               styleClass="l--push-top-half g__item #{applicationConfiguration.multiAuth ? 'w--1-2 w--1-m' : ''}"
               rendered="#{applicationConfiguration.internalAuth or applicationConfiguration.jaasAuth or applicationConfiguration.kerberosAuth}">
-              <s:fragment rendered="#{applicationConfiguration.multiAuth}">
+              <ui:fragment rendered="#{applicationConfiguration.multiAuth}">
                 <h2
                   class="gamma heading--sub">#{msgs['jsf.login.WithZanata.label']}</h2>
-              </s:fragment>
-              <s:fragment rendered="#{applicationConfiguration.kerberosAuth}">
+              </ui:fragment>
+              <ui:fragment rendered="#{applicationConfiguration.kerberosAuth}">
                 <p class="txt--meta">
                   <h:outputText escape="false"
                     value="#{msgs['jsf.auth.KerberosNotice.label']}">
                   </h:outputText>
                 </p>
-              </s:fragment>
+              </ui:fragment>
 
               <h:form id="loginForm"
                 styleClass="l--push-top-half l--pad-all-1 bg--pop-higher">
@@ -61,11 +61,11 @@
                   <h:outputLabel for="password"
                     styleClass="l--float-left">#{msgs['jsf.Password']}</h:outputLabel>
                   <span class="txt--meta l--float-right">
-                    <s:link view="/account/password_reset_request.xhtml"
-                      propagation="none" tabindex="4"
+                    <h:link outcome="/account/password_reset_request.xhtml"
+                      tabindex="4"
                       rendered="#{applicationConfiguration.internalAuth}">
                       #{msgs['jsf.ForgotYourPassword']}
-                    </s:link>
+                    </h:link>
                   </span>
                 </div>
                 <h:inputSecret id="password" value="#{loginAction.password}"
@@ -77,44 +77,44 @@
                     value="#{msgs['jsf.Login']}"
                     styleClass="button--primary button--full"/>
 
-                  <s:fragment
+                  <ui:fragment
                     rendered="#{applicationConfiguration.internalAuth}">
                     <div
                       class="txt--align-center txt--align-center-s l--push-top-half">
-                      #{msgs['jsf.login.DontHaveAnAccount.label']} <s:link
-                      view="/account/register.xhtml"
+                      #{msgs['jsf.login.DontHaveAnAccount.label']} <h:link
+                      outcome="/account/register.xhtml"
                       value="#{msgs['jsf.SignUp']}"/>
                     </div>
-                  </s:fragment>
-                  <s:fragment
+                  </ui:fragment>
+                  <ui:fragment
                     rendered="#{not applicationConfiguration.internalAuth and not empty applicationConfiguration.registerPath}">
                     <h:outputLink value="#{applicationConfiguration.registerPath}">
                       <h:outputText value="#{msgs['jsf.Signup']}"/>
                     </h:outputLink>
-                  </s:fragment>
+                  </ui:fragment>
                 </div>
               </h:form>
-            </s:div>
+            </h:panelGroup>
             <ui:remove>
               <!-- OpenId Login form-->
             </ui:remove>
-            <s:div
+            <h:panelGroup layout="block"
               styleClass="l--push-top-half g__item #{applicationConfiguration.multiAuth ? 'w--1-2 w--1-m' : ''}"
               rendered="#{applicationConfiguration.openIdAuth}">
               <h:form>
-                <s:fragment rendered="#{applicationConfiguration.multiAuth}">
+                <ui:fragment rendered="#{applicationConfiguration.multiAuth}">
                   <h2
                     class="gamma heading--sub">#{msgs['jsf.login.OrLoginUsing.label']}</h2>
-                </s:fragment>
+                </ui:fragment>
                 <ul class="list--no-bullets">
                   <li class="l--push-top-half">
                     <h:commandLink action="#{loginAction.openIdLogin('Fedora')}"
                       styleClass="button--full button--fedora" value="Fedora"/>
                   </li>
                   <li class="l--push-top-half">
-                    <s:link value="Google" styleClass="button--full button--google"
-                      view="/account/google_password_reset_request.xhtml" propagation="none">
-                    </s:link>
+                    <h:link value="Google" styleClass="button--full button--google"
+                      outcome="/account/google_password_reset_request.xhtml">
+                    </h:link>
                   </li>
                   <li class="l--push-top-half">
                     <h:commandLink action="#{loginAction.openIdLogin('Yahoo')}"
@@ -137,7 +137,7 @@
                   </li>
                 </ul>
               </h:form>
-            </s:div>
+            </h:panelGroup>
           </div>
         </div>
       </div>
diff --git a/zanata-war/src/main/webapp/account/password_reset.xhtml b/zanata-war/src/main/webapp/account/password_reset.xhtml
index 089b25f431..e19814ffb7 100644
--- a/zanata-war/src/main/webapp/account/password_reset.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset.xhtml
@@ -5,14 +5,15 @@
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   template="../WEB-INF/template/template_nobanner.xhtml">
 
   <ui:define name="page_title">#{msgs['jsf.ResetPassword']}</ui:define>
   <ui:define name="center_content">
     <div class="header__logo-only">
-      <s:link view="/home.xhtml" propagation="none" id="home" tabindex="1">
+      <h:link outcome="/home.xhtml" id="home" tabindex="1">
         <img src="#{assets['img/logo/logo.svg']}" alt="Zanata"/>
-      </s:link>
+      </h:link>
     </div>
 
     <div class="g--centered">
@@ -30,22 +31,20 @@
             <h2 class="gamma heading--sub">#{msgs['jsf.ResetPassword']}</h2>
             <h:form id="passwordResetActivationForm" styleClass="l--push-top-half l--pad-all-1 bg--pop-higher">
               <s:token allowMultiplePosts="true"/>
-              <s:decorate id="passwordField" template="../WEB-INF/layout/field.xhtml"
-                enclose="true">
+              <zanata:decorate componentId="passwordField">
                 <h:outputLabel for="password">#{msgs['jsf.NewPassword']}</h:outputLabel>
                 <h:inputSecret id="password" redisplay="true" required="true"
                   value="#{passwordReset.password}">
                   <a4j:ajax event="blur" render="passwordField"/>
                 </h:inputSecret>
-              </s:decorate>
-              <s:decorate id="passwordConfirmField"
-                template="../WEB-INF/layout/field.xhtml" enclose="true">
+              </zanata:decorate>
+              <zanata:decorate componentId="passwordConfirmField">
                 <h:outputLabel for="passwordConfirm">#{msgs['jsf.ConfirmPassword']}</h:outputLabel>
                 <h:inputSecret id="passwordConfirm" redisplay="true" required="true"
                   value="#{passwordReset.passwordConfirm}">
                   <a4j:ajax event="blur" render="passwordConfirmField"/>
                 </h:inputSecret>
-              </s:decorate>
+              </zanata:decorate>
               <h:commandButton styleClass="l--push-top-1 button--primary button--full" value="#{msgs['jsf.ChangePassword']}"
                 action="#{passwordReset.changePassword}"/>
             </h:form>
diff --git a/zanata-war/src/main/webapp/account/password_reset_request.xhtml b/zanata-war/src/main/webapp/account/password_reset_request.xhtml
index f9f680e8fc..3a78b86f60 100644
--- a/zanata-war/src/main/webapp/account/password_reset_request.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset_request.xhtml
@@ -3,15 +3,16 @@
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   template="/WEB-INF/template/template_nobanner.xhtml">
 
   <ui:define name="page_title">#{msgs['jsf.ResetPassword']}</ui:define>
   <ui:define name="center_content">
     <div class="header__logo-only">
-      <s:link view="/home.xhtml" propagation="none" id="home" tabindex="1">
+      <h:link outcome="/home.xhtml" id="home" tabindex="1">
         <img src="#{assets['img/logo/logo.svg']}"
           alt="Zanata"/>
-      </s:link>
+      </h:link>
     </div>
     <div class="g--centered">
       <div class="g__item l--constrain-small">
@@ -36,25 +37,24 @@
                 <a4j:param name="val1" assignTo="#{usernameOrEmail}"/>
               </a4j:jsFunction>
 
-              <s:div id="actions">
-                <s:fragment rendered="#{passwordResetRequest.accountWaitingForActivation}">
+              <h:panelGroup layout="block"  id="actions">
+                <ui:fragment rendered="#{passwordResetRequest.accountWaitingForActivation}">
                   <div class="l--push-top-half">
                     <a href="#" onclick="sendActivationEmail('#{passwordResetRequest.usernameOrEmail}')"
                       class="loader">
                       <span class="loader__label">#{msgs['jsf.ResendActivationEmail']}</span>
                     </a>
                   </div>
-                </s:fragment>
-              </s:div>
+                </ui:fragment>
+              </h:panelGroup>
 
-              <s:decorate id="usernameEmailField" template="/WEB-INF/layout/field.xhtml"
-                enclose="true">
+              <zanata:decorate id="usernameEmail" componentId="usernameEmailField">
                 <h:outputLabel for="usernameEmail">#{msgs['jsf.UsernameOrEmail.placeholder']}</h:outputLabel>
                 <h:inputText id="usernameEmail" required="true" placeholder="#{msgs['jsf.UsernameOrEmail.placeholder']}"
                   value="#{passwordResetRequest.usernameOrEmail}" maxlength="260">
                   <a4j:ajax event="blur" render="usernameEmailField"/>
                 </h:inputText>
-              </s:decorate>
+              </zanata:decorate>
               <a4j:commandButton styleClass="l--push-top-1 button--primary button--full"
                 value="#{msgs['jsf.ResetPassword']}" render="actions"
                 action="#{passwordResetRequest.requestReset}" id="submitRequest"/>
diff --git a/zanata-war/src/main/webapp/account/register.xhtml b/zanata-war/src/main/webapp/account/register.xhtml
index 40f35a6b0c..3b618267cc 100644
--- a/zanata-war/src/main/webapp/account/register.xhtml
+++ b/zanata-war/src/main/webapp/account/register.xhtml
@@ -5,15 +5,16 @@
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   template="../WEB-INF/template/template_nobanner.xhtml">
 
   <ui:define name="page_title">#{msgs['jsf.Register']}</ui:define>
   <ui:define name="center_content">
 
     <div class="header__logo-only">
-      <s:link view="/home.xhtml" propagation="none" id="home" tabindex="1">
+      <h:link outcome="/home.xhtml" id="home" tabindex="1">
         <img src="#{assets['img/logo/logo.svg']}" alt="Zanata"/>
-      </s:link>
+      </h:link>
     </div>
 
     <div class="g--centered">
@@ -29,46 +30,46 @@
               rendered="#{showGlobalMessages != 'false'}"/>
           </a4j:outputPanel>
           <div class="g">
-            <s:div
+            <h:panelGroup layout="block"
               styleClass="l--push-top-half g__item #{applicationConfiguration.multiAuth ? 'w--1-2 w--1-m' : ''}"
               rendered="#{applicationConfiguration.internalAuth or applicationConfiguration.jaasAuth}">
-              <s:fragment rendered="#{applicationConfiguration.multiAuth}">
+              <ui:fragment rendered="#{applicationConfiguration.multiAuth}">
                 <h2
                   class="gamma heading--sub">#{msgs['jsf.register.WithZanata']}</h2>
-              </s:fragment>
+              </ui:fragment>
 
               <h:form id="loginForm"
                 styleClass="l--push-top-half l--pad-all-1 bg--pop-higher js-form-password-parent">
                 <h:outputLabel
                   for="name">#{msgs['jsf.register.FullName.label']}</h:outputLabel>
-                <h:inputText id="name" value="#{register.person.name}"
-                  tabindex="2"/>
+                <zanata:decorate id="nameField">
+                  <h:inputText id="name" value="#{register.person.name}"
+                    tabindex="2"/>
+                </zanata:decorate>
+
 
                 <h:outputLabel
                   for="username">#{msgs['jsf.Username']}</h:outputLabel>
-                <s:decorate id="usernameField"
-                  template="../WEB-INF/layout/field.xhtml">
+                <zanata:decorate id="username" componentId="usernameField">
                   <h:inputText id="username" value="#{register.username}"
                     tabindex="3">
-                    <a4j:ajax event="blur" render="usernameField"
-                      execute="@this"/>
+                    <a4j:ajax event="blur" render="usernameField" />
                   </h:inputText>
-                </s:decorate>
+                </zanata:decorate>
+
 
                 <h:outputLabel
                   for="email">#{msgs['jsf.Email']}</h:outputLabel>
-                <s:decorate id="emailField"
-                  template="../WEB-INF/layout/field.xhtml">
+                <zanata:decorate id="email" componentId="emailField">
                   <h:inputText id="email" value="#{register.email}"
                     tabindex="4">
                     <a4j:ajax event="blur" render="emailField" execute="@this"/>
                   </h:inputText>
-                </s:decorate>
+                </zanata:decorate>
 
                 <h:outputLabel
                   for="password">#{msgs['jsf.Password']}</h:outputLabel>
-                <s:decorate id="passwordField"
-                  template="../WEB-INF/layout/field.xhtml">
+                <zanata:decorate id="passwordField">
                   <div class="form__password js-form-password">
                     <h:inputSecret id="password"
                       styleClass="js-form-password-input form__input"
@@ -78,19 +79,19 @@
                     <a href="#"
                       class="form__toggle js-form-password-toggle">Show</a>
                   </div>
-                </s:decorate>
+                </zanata:decorate>
 
                 <h:outputLabel for="human"
                   styleClass="is-hidden">If you are a human, do not fill in this field.</h:outputLabel>
                 <h:inputText id="human" styleClass="is-hidden"
                   value="#{register.humanField}"/>
 
-                <s:fragment rendered="#{not empty applicationConfiguration.termsOfUseUrl}">
+                <ui:fragment rendered="#{not empty applicationConfiguration.termsOfUseUrl}">
                   <p class="txt--meta l--push-top-half">
                     <h:outputText value="#{msgs.format('jsf.register.agreeToTOS',
                       applicationConfiguration.termsOfUseUrl)}" escape="false"/>
                   </p>
-                </s:fragment>
+                </ui:fragment>
 
                 <div class="l--push-top-1">
                   <h:commandButton value="Sign Up" action="#{register.register}"
@@ -98,21 +99,21 @@
 
                   <div
                     class="l--push-top-half txt--align-center txt--align-center-s">
-                    #{msgs['jsf.register.AlreadyHaveAccount.label']} <s:link
-                    view="/account/login.xhtml"
+                    #{msgs['jsf.register.AlreadyHaveAccount.label']} <h:link
+                    outcome="/account/login.xhtml"
                     value="#{msgs['jsf.register.LogIn.label']}"/>
                   </div>
                 </div>
               </h:form>
-            </s:div>
-            <s:div
+            </h:panelGroup>
+            <h:panelGroup layout="block"
               styleClass="l--push-top-half g__item #{applicationConfiguration.multiAuth ? 'w--1-2 w--1-m' : ''}"
               rendered="#{applicationConfiguration.openIdAuth}">
               <h:form>
-                <s:fragment rendered="#{applicationConfiguration.multiAuth}">
+                <ui:fragment rendered="#{applicationConfiguration.multiAuth}">
                   <h2
                     class="gamma heading--sub">#{msgs['jsf.register.WithOther.label']}</h2>
-                </s:fragment>
+                </ui:fragment>
                 <ul class="list--no-bullets">
                   <li class="l--push-top-half">
                     <h:commandLink action="#{loginAction.openIdLogin('Fedora')}"
@@ -139,7 +140,7 @@
                   </li>
                 </ul>
               </h:form>
-            </s:div>
+            </h:panelGroup>
           </div>
         </div>
       </div>
diff --git a/zanata-war/src/main/webapp/admin/home.xhtml b/zanata-war/src/main/webapp/admin/home.xhtml
index 71c40e5fbe..b34548ce7d 100644
--- a/zanata-war/src/main/webapp/admin/home.xhtml
+++ b/zanata-war/src/main/webapp/admin/home.xhtml
@@ -11,8 +11,8 @@
       <h1 class="txt--meta l--push-all-0">#{msgs['jsf.Administration']}</h1>
       <ul class="g g--tighter l--push-top-1">
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Admin_Server_configuration_home"
-            view="/admin/server_configuration.xhtml" propagation="none"
+          <h:link id="Admin_Server_configuration_home"
+            outcome="/admin/server_configuration.xhtml"
             styleClass="bg--pop-high bg--highest--hover bx--block">
           <div class="l--pad-all-half">
             <i class="i i--settings gamma"></i>
@@ -20,12 +20,12 @@
               #{msgs['jsf.ServerConfiguration']}
             </span>
           </div>
-          </s:link>
+          </h:link>
         </li>
 
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Admin_Manage_users_home"
-            view="/admin/usermanager.xhtml" propagation="none"
+          <h:link id="Admin_Manage_users_home"
+            outcome="/admin/usermanager.xhtml"
             styleClass="bg--pop-high bg--highest--hover bx--block">
             <div class="l--pad-all-half">
               <i class="i i--users gamma"></i>
@@ -33,12 +33,12 @@
               #{msgs['jsf.ManageUsers']}
             </span>
             </div>
-          </s:link>
+          </h:link>
         </li>
 
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Admin_Manage_roles_home"
-            view="/admin/rolemanager.xhtml" propagation="none"
+          <h:link id="Admin_Manage_roles_home"
+            outcome="/admin/rolemanager.xhtml"
             styleClass="bg--pop-high bg--highest--hover bx--block">
             <div class="l--pad-all-half">
               <i class="i i--user gamma"></i>
@@ -46,12 +46,12 @@
                 #{msgs['jsf.ManageRoles']}
               </span>
             </div>
-          </s:link>
+          </h:link>
         </li>
 
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Admin_Manage_search_home"
-            view="/admin/search.xhtml" propagation="none"
+          <h:link id="Admin_Manage_search_home"
+            outcome="/admin/search.xhtml"
             styleClass="bg--pop-high bg--highest--hover bx--block">
             <div class="l--pad-all-half">
               <i class="i i--search gamma"></i>
@@ -59,12 +59,12 @@
                 #{msgs['jsf.ManageSearch']}
               </span>
             </div>
-          </s:link>
+          </h:link>
         </li>
 
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Admin_Role_Assignment_Rules_home"
-            view="/admin/rolerules.xhtml" propagation="none"
+          <h:link id="Admin_Role_Assignment_Rules_home"
+            outcome="/admin/rolerules.xhtml"
             styleClass="bg--pop-high bg--highest--hover bx--block">
             <div class="media l--pad-h-half l--pad-v-quarter">
               <div class="media__item--left">
@@ -75,12 +75,12 @@
                 <span class="zeta">#{msgs['jsf.RoleAssignmentRules']}</span>
               </div>
             </div>
-          </s:link>
+          </h:link>
         </li>
 
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Translation_Memory_home"
-            view="/tm/home.xhtml" propagation="none"
+          <h:link id="Translation_Memory_home"
+            outcome="/tm/home.xhtml"
             styleClass="bg--pop-high bg--highest--hover bx--block">
             <div class="media l--pad-h-half l--pad-v-quarter">
               <div class="media__item--left">
@@ -91,12 +91,12 @@
                 <span class="zeta">#{msgs['jsf.transmemory.Title']}</span>
               </div>
             </div>
-          </s:link>
+          </h:link>
         </li>
 
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Process_Management_home"
-            view="/admin/processmanager.xhtml" propagation="none"
+          <h:link id="Process_Management_home"
+            outcome="/admin/processmanager.xhtml"
             styleClass="bg--pop-high bg--highest--hover bx--block">
             <div class="l--pad-all-half">
               <i class="i i--clock gamma"></i>
@@ -104,12 +104,12 @@
                 #{msgs['jsf.ProcessManager']}
               </span>
             </div>
-          </s:link>
+          </h:link>
         </li>
 
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Admin_Manage_stats_home"
-            view="/admin/stats.xhtml" propagation="none"
+          <h:link id="Admin_Manage_stats_home"
+            outcome="/admin/stats.xhtml"
             styleClass="bg--pop-high bg--highest--hover bx--block">
             <div class="media l--pad-h-half l--pad-v-quarter">
               <div class="media__item--left">
@@ -120,12 +120,12 @@
                 <span class="zeta">#{msgs['jsf.OverallStatistics']}</span>
               </div>
             </div>
-          </s:link>
+          </h:link>
         </li>
 
         <li class="g__item w--1-3-l w--1-2-m w--1-5 l--push-bottom-1">
-          <s:link id="Admin_Monitoring_home"
-            view="/admin/monitoring" propagation="none"
+          <h:link id="Admin_Monitoring_home"
+            outcome="/admin/monitoring"
             styleClass="bg--pop-high bg--highest--hover bx--block">
             <div class="media l--pad-h-half l--pad-v-quarter">
               <div class="media__item--left">
@@ -135,7 +135,7 @@
                 <span class="zeta">#{msgs['jsf.ServerMonitoring']}</span>
               </div>
             </div>
-          </s:link>
+          </h:link>
         </li>
 
       </ul>
diff --git a/zanata-war/src/main/webapp/admin/processmanager.xhtml b/zanata-war/src/main/webapp/admin/processmanager.xhtml
index c321b128c0..dffb9c74a4 100644
--- a/zanata-war/src/main/webapp/admin/processmanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/processmanager.xhtml
@@ -20,7 +20,7 @@
     <div class="g">
       <div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none"
+          <h:link outcome="/admin/home.xhtml"
             value="#{msgs['jsf.Administration']}"/>
         </p>
 
@@ -31,7 +31,7 @@
           </h1>
         </div>
 
-        <s:div styleClass="panel l--push-top-1" id="progress">
+        <h:panelGroup layout="block"  styleClass="panel l--push-top-1" id="progress">
           <div class="panel__header">
             <h2 class="panel__heading--small">
             #{msgs['jsf.processmanager.currentStates']}
@@ -44,19 +44,19 @@
               #{msgs['jsf.processmanager.TotalFinished']}<span class="l--push-left-quarter badge">
               #{processManagerAction.stoppedCount}</span>
           </div>
-        </s:div>
+        </h:panelGroup>
       </div>
 
       <div class="g__item w--1-m w--5-8-l w--2-3 l--push-top-1">
         <div class="panel">
 
           <h:form id="process_form" styleClass="l--push-bottom-0">
-            <s:div styleClass="l--pad-all-half"
+            <h:panelGroup layout="block"  styleClass="l--pad-all-half"
               rendered="#{empty processManagerAction.runningProcesses}">
               <p class="txt--meta">#{msgs['jsf.processmanager.process.empty']}</p>
-            </s:div>
+            </h:panelGroup>
 
-            <s:fragment rendered="#{not empty processManagerAction.runningProcesses}">
+            <ui:fragment rendered="#{not empty processManagerAction.runningProcesses}">
               <ul class="list--stats">
                 <ui:repeat value="#{processManagerAction.runningProcesses}" var="handle">
                   <li
@@ -71,32 +71,32 @@
                           rendered="#{not handle.done}" styleClass="button button--danger l--push-left-half l--push-bottom-quarter"/>
 
                         <span class="list__item__meta txt--warning">
-                          <s:fragment rendered="#{handle.done}">
+                          <ui:fragment rendered="#{handle.done}">
                             #{msgs['jsf.processmanager.status.Finished']}
-                          </s:fragment>
-                          <s:fragment rendered="#{not handle.done}">
+                          </ui:fragment>
+                          <ui:fragment rendered="#{not handle.done}">
                             #{msgs.format('jsf.processmanager.progress', handle.currentProgress, handle.maxProgress)}
-                          </s:fragment>
+                          </ui:fragment>
                         </span>
                       </div>
                       <div class="list__item__stats">
-                        <s:fragment rendered="#{not handle.done}">
+                        <ui:fragment rendered="#{not handle.done}">
                           <zanata:loader type="loader--small" layout="inline"/>
-                        </s:fragment>
+                        </ui:fragment>
 
-                        <s:span styleClass="txt--understated" rendered="#{handle.done}">
+                        <h:panelGroup layout="span" styleClass="txt--understated" rendered="#{handle.done}">
                           <span
                             class="txt--hero">#{handle.executingTime}</span>
                           <span class="stats__unit txt--lowercase">
                             #{msgs['jsf.processmanager.miliseconds']}
                           </span>
-                        </s:span>
+                        </h:panelGroup>
                       </div>
                     </div>
                   </li>
                 </ui:repeat>
               </ul>
-            </s:fragment>
+            </ui:fragment>
           </h:form>
         </div>
       </div>
diff --git a/zanata-war/src/main/webapp/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
index b59183bc15..379abc108d 100644
--- a/zanata-war/src/main/webapp/admin/roledetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/roledetail.xhtml
@@ -3,6 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:c="http://java.sun.com/jsf/core"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:s="http://jboss.org/schema/seam/taglib">
 
@@ -22,13 +24,13 @@
     <div class="g--centered">
       <div class="g__item w--1-3-m w--3-8-l w--1-3 l--push-bottom-1">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none">
+          <h:link outcome="/admin/home.xhtml">
             #{msgs['jsf.Administration']}
-          </s:link>
+          </h:link>
           <i class="i i--arrow-right"></i>
-          <s:link view="/admin/rolemanager.xhtml" propagation="none">
+          <h:link outcome="/admin/rolemanager.xhtml">
             #{msgs['jsf.ManageRoles']}
-          </s:link>
+          </h:link>
         </p>
 
         <h1 class="l--push-all-0">#{msgs['jsf.RoleDetails']}</h1>
@@ -38,30 +40,31 @@
 
           <div class="form__item l--push-top-1">
             <h:outputLabel for="role">#{msgs['jsf.Role']}</h:outputLabel>
-            <s:decorate id="roleField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+            <zanata:decorate id="role" componentId="roleField">
               <h:inputText id="role" value="#{zanataRoleAction.role}"
                 readonly="#{identityManager.userExists(zanataRoleAction.role)}"
                 required="true">
-                <a4j:ajax event="blur" render="roleField" execute="@this"/>
+                <a4j:ajax event="blur" render="roleField" execute="@this" bypassUpdates="true"/>
               </h:inputText>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <div class="form__item l--push-top-1">
             <h:outputLabel>#{msgs['jsf.MemberOf']}</h:outputLabel>
-            <s:decorate id="groupsField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+            <zanata:decorate id="groups" componentId="groupsField">
               <h:selectManyCheckbox id="groups" value="#{zanataRoleAction.groups}"
                 layout="pageDirection" styleClass="groups">
-                <s:selectItems value="#{identityManager.listRoles()}" var="role"
-                  label="#{role}"/>
+                <c:selectItems value="#{identityManager.listRoles()}" var="role"
+                  itemLabel="#{role}"/>
               </h:selectManyCheckbox>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <h:commandButton value="#{msgs['jsf.Save']}"
             action="#{zanataRoleAction.save}" styleClass="button button--primary"/>
-          <s:button view="/admin/rolemanager.xhtml"
-            value="#{msgs['jsf.Cancel']}" propagation="end" styleClass="button button--link l--push-left-half"/>
+          <h:commandLink action="#{zanataRoleAction.cancel}"
+            value="#{msgs['jsf.Cancel']}"
+            styleClass="button button--link l--push-left-half" />
         </h:form>
       </div>
     </div>
diff --git a/zanata-war/src/main/webapp/admin/rolemanager.xhtml b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
index 71b55e8dbb..7976f43f1b 100644
--- a/zanata-war/src/main/webapp/admin/rolemanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:a4j="http://richfaces.org/a4j"
   xmlns:s="http://jboss.org/schema/seam/taglib">
 
 <ui:composition template="../WEB-INF/template/template.xhtml">
@@ -10,6 +11,8 @@
   <ui:define name="page_title">#{msgs['jsf.ManageRoles']}</ui:define>
 
   <ui:define name="center_content">
+    <a4j:jsFunction name="createRole" action="#{zanataRoleAction.createRole}"/>
+
     <script type="text/javascript">
       function confirmDelete() {
         return confirm("#{msgs['jsf.AreYouSureYouWishToDeleteThisRoleThisActionCannotBeUndone']}");
@@ -18,7 +21,7 @@
     <div class="g--centered">
       <div class="g__item w--1-m w--1-2-l w--1-2 l--push-bottom-half">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none"
+          <h:link outcome="/admin/home.xhtml"
             value="#{msgs['jsf.Administration']}"/>
         </p>
 
@@ -37,11 +40,12 @@
                   role="content"
                   aria-labelledby="dropdownContent">
                   <li>
-                    <s:link action="#{zanataRoleAction.createRole}" styleClass="i__item--right"
+                    <h:link styleClass="i__item--right"
+                      onclick="createRole()"
                       rendered="#{identity.hasPermission('seam.account', 'create', null)}"
                       value="#{msgs['jsf.CreateRole']}">
                       <i class="i i--plus i__item__icon"></i>
-                    </s:link>
+                    </h:link>
                   </li>
                 </ul>
               </div>
@@ -60,7 +64,7 @@
                         <span class="is-invisible">Options</span>
                       </a>
                       <ul class="dropdown__content js-dropdown__content">
-                        <s:fragment
+                        <ui:fragment
                           rendered="#{identity.hasPermission('seam.role', 'delete') and accountRoleDAO.findByName(role).roleType.toString() ne 'AUTO'}">
                           <li>
                             <h:commandLink
@@ -70,18 +74,19 @@
                               <i class="i i--remove i__item__icon"></i>
                             </h:commandLink>
                           </li>
-                        </s:fragment>
+                        </ui:fragment>
                       </ul>
                     </div>
                   </div>
+                  <!-- TODO [CDI] change this to pass selected role as param to zanataRoleAction so that we don't need to use conversation scope -->
                   <h:commandLink
                     action="#{zanataRoleAction.editRole(zanataRoleSearch.selectedRole)}"
                     disabled="#{not identity.hasPermission('seam.role', 'update') or accountRoleDAO.findByName(role).roleType.toString() eq 'AUTO'}">
                     <div class="list__item__content">
                       <div class="list__item__info">
                         <h3 class="list__title">#{role}
-                        <s:span rendered="#{not zanataRoleSearch.getRoleGroups(role).isEmpty()}"
-                          styleClass="txt--meta l--push-left-half">[#{zanataRoleSearch.getRoleGroups(role)}]</s:span>
+                        <h:panelGroup layout="span" rendered="#{not zanataRoleSearch.getRoleGroups(role).isEmpty()}"
+                          styleClass="txt--meta l--push-left-half">[#{zanataRoleSearch.getRoleGroups(role)}]</h:panelGroup>
                         </h3>
                       </div>
                     </div>
diff --git a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
index f13ce3d006..c5f72d5bc4 100644
--- a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
+++ b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
@@ -1,9 +1,10 @@
 <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:c="http://java.sun.com/jsf/core"
   template="../WEB-INF/template/template.xhtml"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:h="http://java.sun.com/jsf/html">
 
   <ui:define
@@ -13,10 +14,10 @@
     <div class="g--centered">
       <div class="g__item w--1-2-m w--3-8-l w--1-3 l--push-bottom-1">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none"
+          <h:link outcome="/admin/home.xhtml"
             value="#{msgs['jsf.Administration']}"/>
           <i class="i i--arrow-right"></i>
-          <s:link view="/admin/rolerules.xhtml" propagation="none"
+          <h:link outcome="/admin/rolerules.xhtml"
             value="#{msgs['jsf.RoleAssignmentRules']}"/>
         </p>
 
@@ -28,15 +29,15 @@
               title="#{msgs['jsf.rolerules.PolicyName.tooltip']}"></i>
             </span>
             </h:outputLabel>
-            <s:decorate id="policyNameField" template="/WEB-INF/layout/field.xhtml"
-              enclose="true">
+            <zanata:decorate id="policyName" componentId="policyNameField">
               <h:selectOneMenu id="policyName"
                 value="#{roleAssignmentRuleAction.instance.policyName}">
-                <s:selectItems value="#{roleAssignmentRuleAction.availablePolicyNames}"
-                  var="policy" label="#{policy}"
-                  noSelectionLabel=""/>
+                <c:selectItem noSelectionOption="true" itemLabel="" />
+                <c:selectItems value="#{roleAssignmentRuleAction.availablePolicyNames}"
+                  var="policy" itemLabel="#{policy}"
+                  />
               </h:selectOneMenu>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <div class="form__item l--push-top-1">
@@ -46,11 +47,10 @@
                 title="#{msgs['jsf.rolerules.IdentityPattern.tooltip']}"></i>
               </span>
             </h:outputLabel>
-            <s:decorate id="identityPatternField" template="/WEB-INF/layout/field.xhtml"
-              enclose="true">
+            <zanata:decorate id="identityPattern" componentId="identityPatternField">
               <h:inputText id="identityPattern"
                 value="#{roleAssignmentRuleAction.instance.identityRegExp}"/>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <div class="form__item l--push-top-1">
@@ -59,14 +59,13 @@
               title="#{msgs['jsf.rolerules.RoleToAssign.tooltip']}"></i>
             </span>
             </h:outputLabel>
-            <s:decorate id="roleField" template="/WEB-INF/layout/field.xhtml"
-              enclose="true">
+            <zanata:decorate id="role" componentId="roleField">
               <h:selectOneMenu id="roles"
                 value="#{roleAssignmentRuleAction.roleToAssign}">
-                <s:selectItems value="#{identityManager.listGrantableRoles()}"
-                  var="role" label="#{role}"/>
+                <c:selectItems value="#{identityManager.listGrantableRoles()}"
+                  var="role" itemLabel="#{role}"/>
               </h:selectOneMenu>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <h:commandButton id="save" styleClass="button button--primary"
@@ -79,10 +78,9 @@
             action="#{roleAssignmentRuleAction.update}"
             rendered="#{roleAssignmentRuleAction.managed}"/>
 
-          <s:button id="cancel" styleClass="button button--link l--push-left-half"
+          <h:button id="cancel" styleClass="button button--link l--push-left-half"
             value="#{msgs['jsf.Cancel']}"
-            propagation="none"
-            view="/admin/rolerules.xhtml"/>
+            outcome="/admin/rolerules.xhtml"/>
         </h:form>
 
       </div>
diff --git a/zanata-war/src/main/webapp/admin/rolerules.xhtml b/zanata-war/src/main/webapp/admin/rolerules.xhtml
index 7073283965..9ffcd84376 100644
--- a/zanata-war/src/main/webapp/admin/rolerules.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolerules.xhtml
@@ -5,7 +5,7 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:rich="http://richfaces.org/rich"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
+  >
 
 <ui:composition template="../WEB-INF/template/template.xhtml">
 
@@ -22,7 +22,7 @@
     <div class="g--centered">
       <div class="g__item w--1-s w--1-2 l--push-bottom-half">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none"
+          <h:link outcome="/admin/home.xhtml"
             value="#{msgs['jsf.Administration']}"/>
         </p>
 
@@ -42,10 +42,10 @@
                   role="content"
                   aria-labelledby="dropdownContent">
                   <li>
-                    <s:link value="#{msgs['jsf.rolerules.CreateRule']}"
-                      view="/admin/roleruledetails.xhtml" styleClass="i__item--right">
+                    <h:link value="#{msgs['jsf.rolerules.CreateRule']}"
+                      outcome="/admin/roleruledetails.xhtml" styleClass="i__item--right">
                       <i class="i i--plus i__item__icon"></i>
-                    </s:link>
+                    </h:link>
                   </li>
                 </ul>
               </div>
@@ -53,17 +53,16 @@
             <h2 class="panel__heading">#{msgs['jsf.rolerules.title']}</h2>
           </div>
 
-          <s:div styleClass="l--pad-all-half"
+          <h:panelGroup layout="block"  styleClass="l--pad-all-half"
             rendered="#{empty roleAssignmentRuleAction.allRules}">
             <p class="txt--meta">#{msgs['jsf.rolerules.norules']}</p>
             <p>
-              <s:link value="#{msgs['jsf.rolerules.CreateRule']}"
-                propagation="none"
-                view="/admin/roleruledetails.xhtml" styleClass="button button--primary">
+              <h:link value="#{msgs['jsf.rolerules.CreateRule']}"
+                outcome="/admin/roleruledetails.xhtml" styleClass="button button--primary">
                 <i class="i i--plus i__item__icon"></i>
-              </s:link>
+              </h:link>
             </p>
-          </s:div>
+          </h:panelGroup>
 
 
           <h:form styleClass="l--push-bottom-0" id="roleRules"
diff --git a/zanata-war/src/main/webapp/admin/search.xhtml b/zanata-war/src/main/webapp/admin/search.xhtml
index 435abdeb25..3b90c6c2d3 100644
--- a/zanata-war/src/main/webapp/admin/search.xhtml
+++ b/zanata-war/src/main/webapp/admin/search.xhtml
@@ -21,7 +21,7 @@
     <div class="g">
       <div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none"
+          <h:link outcome="/admin/home.xhtml"
             value="#{msgs['jsf.Administration']}"/>
         </p>
 
@@ -32,39 +32,39 @@
           </h1>
         </div>
 
-        <s:div styleClass="panel l--push-top-1" id="progress">
+        <h:panelGroup layout="block"  styleClass="panel l--push-top-1" id="progress">
           <div class="panel__header">
-            <s:div styleClass="panel__header__actions l--push-right-half l--push-bottom-0"
+            <h:panelGroup layout="block"  styleClass="panel__header__actions l--push-right-half l--push-bottom-0"
               rendered="#{reindexAction.inProgress and !reindexAction.canceled}">
               <h:form styleClass="l--push-bottom-0">
                 <a4j:commandLink id="cancel" styleClass="button--small button--link"
                   value="#{msgs['jsf.ManageSearch.Abort']}"
                   action="#{reindexAction.cancel}" render="actions,progress"/>
               </h:form>
-            </s:div>
+            </h:panelGroup>
             <h2 class="panel__heading--small">#{msgs['jsf.ManageSearch.CurrentProgress']}</h2>
           </div>
 
           <div class="l--pad-all-half">
-            <s:fragment rendered="#{!reindexAction.inProgress}">
+            <ui:fragment rendered="#{!reindexAction.inProgress}">
               <p id="noOperationsRunning" class="txt--meta">
                 <h:outputText escape="false"
                   value="#{msgs['jsf.ManageSearch.NoOperationsRunning']}" />
               </p>
-            </s:fragment>
-            <s:fragment rendered="#{reindexAction.reindexedSinceServerRestart and !reindexAction.inProgress and !reindexAction.canceled and !reindexAction.error}">
+            </ui:fragment>
+            <ui:fragment rendered="#{reindexAction.reindexedSinceServerRestart and !reindexAction.inProgress and !reindexAction.canceled and !reindexAction.error}">
               <p id="completed" class="txt--meta">
                 <h:outputText
                   value="#{msgs.format('jsf.ManageSearch.Completed', reindexAction.elapsedTime)}" />
               </p>
-            </s:fragment>
-            <s:fragment rendered="#{reindexAction.canceled}">
+            </ui:fragment>
+            <ui:fragment rendered="#{reindexAction.canceled}">
               <p id="aborted" class="txt--meta">
                 <h:outputText escape="false"
                   value="#{msgs.format('jsf.ManageSearch.Aborted', reindexAction.elapsedTime)}" />
               </p>
-            </s:fragment>
-            <s:fragment rendered="#{reindexAction.error}">
+            </ui:fragment>
+            <ui:fragment rendered="#{reindexAction.error}">
               <p class="txt--meta txt--danger">
                 <h:outputText escape="false"
                   value="#{msgs['jsf.manageSearch.ErrorMessage']}" />
@@ -72,12 +72,12 @@
                 <h:outputText escape="false"
                   value="#{msgs['jsf.manageSearch.PleaseReindex']}" />
               </p>
-            </s:fragment>
+            </ui:fragment>
 
             <a4j:outputPanel layout="block">
               <a4j:poll render="progress,actions" enabled="#{reindexAction.inProgress}"/>
 
-              <s:fragment rendered="#{reindexAction.inProgress}">
+              <ui:fragment rendered="#{reindexAction.inProgress}">
                 <ul class="list--panel bg--higher">
                   <li>
                     <div class="list__item__content">
@@ -105,16 +105,16 @@
                     </div>
                   </li>
                 </ul>
-              </s:fragment>
+              </ui:fragment>
             </a4j:outputPanel>
           </div>
-        </s:div>
+        </h:panelGroup>
       </div>
 
       <div class="g__item w--1-m w--5-8-l w--2-3">
         <h:form id="form">
           <s:token allowMultiplePosts="true"/>
-            <s:div id="actions">
+            <h:panelGroup layout="block"  id="actions">
                 <table class="bg--pop-highest l--push-bottom-1">
                   <thead>
                     <tr>
@@ -130,7 +130,7 @@
                           disabled="#{not reindexAction.canceled and reindexAction.inProgress}">
                           <a4j:ajax event="click" render="actions" execute="@this"/>
                         </h:selectBooleanCheckbox>
-                        <s:span styleClass="l--push-left-quarter">
+                        <span class="l--push-left-quarter">
                           #{msgs['jsf.manageSearch.purge']} <i class="i i--info txt--meta"></i>
                           <rich:tooltip showDelay="800">
                             <p>#{msgs['jsf.manageSearch.purge.Description']}</p>
@@ -139,14 +139,14 @@
 
                             <p>#{msgs['jsf.manageSearch.purge.RemoveByRunningOptimize']}</p>
                           </rich:tooltip>
-                        </s:span>
+                        </span>
                       </th>
                       <th class="l--pad-v-half">
                         <h:selectBooleanCheckbox value="#{reindexAction.reindexAll}" id="reindexAllChk"
                           disabled="#{not reindexAction.canceled and reindexAction.inProgress}">
                           <a4j:ajax event="click" render="actions" execute="@this"/>
                         </h:selectBooleanCheckbox>
-                        <s:span styleClass="l--push-left-quarter">
+                        <span class="l--push-left-quarter">
                           #{msgs['jsf.manageSearch.reindex']} <i class="i i--info txt--meta"></i>
                           <rich:tooltip showDelay="800">
                             <p>#{msgs['jsf.manageSearch.reindex.Description']}</p>
@@ -163,14 +163,14 @@
                               <em>#{msgs['jsf.manageSearch.reindex.RunDuringOffPeak']}</em>
                             </p>
                           </rich:tooltip>
-                        </s:span>
+                        </span>
                       </th>
                       <th class="l--pad-v-half">
                         <h:selectBooleanCheckbox value="#{reindexAction.optimizeAll}"
                           disabled="#{not reindexAction.canceled and reindexAction.inProgress}">
                           <a4j:ajax event="click" render="actions" execute="@this"/>
                         </h:selectBooleanCheckbox>
-                        <s:span styleClass="l--push-left-quarter">
+                        <span class="l--push-left-quarter">
                           #{msgs['jsf.manageSearch.optimize']} <i class="i i--info txt--meta"></i>
                           <rich:tooltip showDelay="800">
                             <p>#{msgs['jsf.manageSearch.optimize.Description']}</p>
@@ -183,7 +183,7 @@
                               <em>#{msgs['jsf.manageSearch.optimize.TempFileWarning']}</em>
                             </p>
                           </rich:tooltip>
-                        </s:span>
+                        </span>
                       </th>
                     </tr>
                   </thead>
@@ -220,7 +220,7 @@
                   </tbody>
                 </table>
 
-                <s:fragment rendered="#{not reindexAction.isAnyOptionSelected() or (not reindexAction.canceled and reindexAction.inProgress)}">
+                <ui:fragment rendered="#{not reindexAction.isAnyOptionSelected() or (not reindexAction.canceled and reindexAction.inProgress)}">
                   <button id="clearSelection" onclick="return false;"
                     class="button--link l--push-right-half" disabled="disabled">
                     #{msgs['jsf.ManageSearch.SelectNone']}
@@ -230,9 +230,9 @@
                     class="button button--primary" disabled="disabled">
                     #{msgs['jsf.ManageSearch.PerformSelectedActions']}
                   </button>
-                </s:fragment>
+                </ui:fragment>
 
-                <s:fragment rendered="#{reindexAction.isAnyOptionSelected() and (reindexAction.canceled or not reindexAction.inProgress)}">
+                <ui:fragment rendered="#{reindexAction.isAnyOptionSelected() and (reindexAction.canceled or not reindexAction.inProgress)}">
                   <button id="clearSelection" onclick="clearAllSelection();return false;"
                     class="button--link l--push-right-half">
                     #{msgs['jsf.ManageSearch.SelectNone']}
@@ -242,9 +242,9 @@
                     class="button button--primary ">
                     #{msgs['jsf.ManageSearch.PerformSelectedActions']}
                   </button>
-                </s:fragment>
+                </ui:fragment>
 
-              </s:div>
+              </h:panelGroup>
         </h:form>
       </div>
     </div>
diff --git a/zanata-war/src/main/webapp/admin/server_configuration.xhtml b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
index 8646892920..d6857143ed 100644
--- a/zanata-war/src/main/webapp/admin/server_configuration.xhtml
+++ b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
@@ -1,11 +1,11 @@
 <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:rich="http://richfaces.org/rich"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:a4j="http://richfaces.org/a4j"
   template="../WEB-INF/template/template.xhtml">
 
@@ -15,7 +15,7 @@
   <div class="g--centered">
     <div class="g__item w--3-4-m w--5-8-l w--1-3 l--push-bottom-1">
       <p class="txt--meta l--push-all-0">
-        <s:link view="/admin/home.xhtml" propagation="none"
+        <h:link outcome="/admin/home.xhtml"
           value="#{msgs['jsf.Administration']}"/>
       </p>
 
@@ -28,12 +28,12 @@
               <i class="i i--info" title="#{msgs['jsf.UrlToolTip']}"></i>
             </span>
           </h:outputLabel>
-          <s:decorate id="urlField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="url" componentId="urlField">
             <h:inputText id="url" value="#{serverConfigurationBean.serverUrl}">
               <a4j:ajax event="blur" render="urlField" execute="@this"/>
               <rich:placeholder value="#{msgs['jsf.Url.placeholder']}" styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="form__item l--push-top-1">
@@ -42,13 +42,13 @@
               <i class="i i--info" title="#{msgs['jsf.RegisterUrlToolTip']}"></i>
             </span>
           </h:outputLabel>
-          <s:decorate id="registerField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="register" componentId="registerField">
             <h:inputText id="registerUrl" value="#{serverConfigurationBean.registerUrl}">
               <a4j:ajax event="blur" render="registerField" execute="@this"/>
               <rich:placeholder value="#{msgs['jsf.RegisterUrl.placeholder']}"
                 styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="form__item l--push-top-1">
@@ -57,13 +57,13 @@
               <i class="i i--info" title="#{msgs['jsf.EmailDomainNameToolTip']}"></i>
             </span>
           </h:outputLabel>
-          <s:decorate id="emailDomainField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="emailDomain" componentId="emailDomainField">
             <h:inputText id="emailDomain" value="#{serverConfigurationBean.emailDomain}">
               <a4j:ajax event="blur" render="emailDomainField" execute="@this"/>
               <rich:placeholder value="#{msgs['jsf.email.domainName.placeholder']}"
                 styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="form__item l--push-top-1">
@@ -72,13 +72,13 @@
               <i class="i i--info" title="#{msgs['jsf.config.AdminEmail.tooltip']} #{msgs['jsf.config.AdminEmail.DoesNotChangeUserEmail']}"></i>
             </span>
           </h:outputLabel>
-          <s:decorate id="adminEmailField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="adminEmail" componentId="adminEmailField" >
             <h:inputText id="adminEml" value="#{serverConfigurationBean.adminEmail}">
               <a4j:ajax event="blur" render="adminEmailField" execute="@this"/>
               <rich:placeholder value="#{msgs['jsf.email.placeholder']} #{msgs['jsf.email.list.placeholder']}"
                 styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="form__item l--push-top-1">
@@ -87,14 +87,13 @@
               <i class="i i--info" title="#{msgs['jsf.config.FromEmailAddr.tooltip']}"></i>
             </span>
           </h:outputLabel>
-          <s:decorate id="fromEmailField" template="../WEB-INF/layout/field.xhtml"
-            enclose="true">
+          <zanata:decorate id="fromEmail" componentId="fromEmailField">
             <h:inputText id="fromEml" value="#{serverConfigurationBean.fromEmailAddr}">
               <a4j:ajax event="blur" render="fromEmailField" execute="@this"/>
               <rich:placeholder value="#{msgs['jsf.email.placeholder']}"
                 styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="form__item l--push-top-1">
@@ -103,13 +102,13 @@
             <i class="i i--info" title="#{msgs['jsf.config.TermsOfUseUrltooltip']}"></i>
           </span>
           </h:outputLabel>
-          <s:decorate id="termsOfUseUrlField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="termsOfUseUrl" componentId="termsOfUseUrlField">
             <h:inputText id="termsOfUseUrlEml" value="#{serverConfigurationBean.termsOfUseUrl}">
               <a4j:ajax event="blur" render="termsOfUseUrlField" execute="@this"/>
               <rich:placeholder value="#{msgs.format('jsf.config.TermsOfUseUrl.placeholder', serverConfigurationBean.defaultTermOfUseUrl)}"
                 styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="form__item l--push-top-1">
@@ -118,13 +117,13 @@
             <i class="i i--info" title="#{msgs['jsf.config.HelpUrltooltip']}"></i>
           </span>
           </h:outputLabel>
-          <s:decorate id="helpUrlField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="helpUrl" componentId="helpUrlField">
             <h:inputText id="helpInput" value="#{serverConfigurationBean.helpUrl}">
               <a4j:ajax event="blur" render="helpUrlField" execute="@this"/>
               <rich:placeholder value="#{msgs.format('jsf.config.HelpUrl.placeholder', serverConfigurationBean.defaultHelpUrl)}"
                 styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <div class="form__item l--push-top-1">
@@ -140,8 +139,8 @@
               <a4j:ajax execute="@this" render="emailLogSettings"/>
              </h:selectBooleanCheckbox>
           </div>
-          <s:div id="emailLogSettings">
-            <s:div styleClass="l--push-top-half" rendered="#{serverConfigurationBean.enableLogEmail}">
+          <h:panelGroup layout="block"  id="emailLogSettings">
+            <h:panelGroup layout="block"  styleClass="l--push-top-half" rendered="#{serverConfigurationBean.enableLogEmail}">
               <h:outputLabel>#{msgs['jsf.config.LogEmailLevel']}
                 <span class="txt--meta l--push-right-quarter">
                   <i class="i i--info" title="#{msgs['jsf.config.LogEmailLevel.tooltip']}"></i>
@@ -154,22 +153,22 @@
                 <f:selectItem itemLabel="#{msgs['jsf.Error']}"
                   itemValue="ERROR"/>
               </h:selectOneMenu>
-            </s:div>
-            <s:div styleClass="l--push-top-half" rendered="#{serverConfigurationBean.enableLogEmail}">
+            </h:panelGroup>
+            <h:panelGroup layout="block"  styleClass="l--push-top-half" rendered="#{serverConfigurationBean.enableLogEmail}">
               <h:outputLabel for="logDestEml">#{msgs['jsf.config.LogDestEmail']}
               <span class="txt--meta">
                 <i class="i i--info" title="#{msgs['jsf.config.LogDestEmail.tooltip']}"></i>
               </span>
               </h:outputLabel>
-              <s:decorate id="logDestEmailField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+              <zanata:decorate id="logDestEmail" componentId="logDestEmailField">
                 <h:inputText id="logDestEml" value="#{serverConfigurationBean.logDestinationEmails}">
                   <a4j:ajax event="blur" render="logDestEmailField" execute="@this"/>
                   <rich:placeholder value="#{msgs['jsf.email.placeholder']} #{msgs['jsf.email.list.placeholder']}"
                     styleClass="txt--neutral" />
                 </h:inputText>
-              </s:decorate>
-            </s:div>
-          </s:div>
+              </zanata:decorate>
+            </h:panelGroup>
+          </h:panelGroup>
         </div>
 
         <div class="form__item l--push-top-1">
@@ -177,13 +176,13 @@
           <p>#{msgs['jsf.config.Piwiktooltip']}</p>
           <div class="g--tight">
             <div class="w--3-4 w--s-3-4 g__item">
-              <s:decorate id="piwikUrlField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+              <zanata:decorate id="piwikUrl" componentId="piwikUrlField">
                 <h:inputText id="piwikUrlEml" value="#{serverConfigurationBean.piwikUrl}">
                   <a4j:ajax event="blur" render="piwikUrlField" execute="@this"/>
                   <rich:placeholder value="#{msgs['jsf.config.Piwik.url.placeholder']}"
                     styleClass="txt--neutral" />
                 </h:inputText>
-              </s:decorate>
+              </zanata:decorate>
             </div>
             <div class="w--1-4 w--s-1-4 g__item">
               <h:inputText id="piwikIdSiteEml"
@@ -203,43 +202,43 @@
               <i class="i i--info" title="#{msgs['jsf.config.MaxConcurrentRequestsPerApiKeytooltip']}"></i>
             </span>
           </h:outputLabel>
-          <s:decorate id="maxConcurrentPerApiKeyField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="maxConcurrentPerApiKey" componentId="maxConcurrentPerApiKeyField">
             <h:inputText id="maxConcurrentPerApiKeyEml" value="#{serverConfigurationBean.maxConcurrentRequestsPerApiKey}">
               <a4j:ajax event="blur" render="maxConcurrentPerApiKeyField" execute="@this"/>
               <rich:placeholder value="default is 6" styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
 
           <h:outputLabel for="maxActiveRequestsPerApiKeyEml">#{msgs['jsf.config.MaxActiveRequestsPerApiKey']}
             <span class="txt--meta">
               <i class="i i--info" title="#{msgs['jsf.config.MaxActiveRequestsPerApiKeytooltip']}"></i>
             </span>
           </h:outputLabel>
-          <s:decorate id="maxActiveRequestsPerApiKeyField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="maxActiveRequestsPerApiKey" componentId="maxActiveRequestsPerApiKeyField">
             <h:inputText id="maxActiveRequestsPerApiKeyEml" value="#{serverConfigurationBean.maxActiveRequestsPerApiKey}">
               <a4j:ajax event="blur" render="maxActiveRequestsPerApiKeyField" execute="@this"/>
               <rich:placeholder value="default is 2" styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
 
           <h:outputLabel for="maxFilesPerUploadFieldInput">#{msgs['jsf.config.MaxFilesPerUpload']}
             <span class="txt--meta">
               <i class="i i--info" title="#{msgs['jsf.config.MaxFilesPerUploadTooltip']}"></i>
             </span>
           </h:outputLabel>
-          <s:decorate id="maxFilesPerUploadField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+          <zanata:decorate id="maxFilesPerUpload" componentId="maxFilesPerUploadField">
             <h:inputText id="maxFilesPerUploadFieldInput" value="#{serverConfigurationBean.maxFilesPerUpload}">
               <a4j:ajax event="blur" render="maxFilesPerUploadField" execute="@this"/>
               <rich:placeholder value="#{msgs['jsf.config.MaxFilesPerUploadDefault']}"
                 styleClass="txt--neutral" />
             </h:inputText>
-          </s:decorate>
+          </zanata:decorate>
         </div>
 
         <h:commandButton value="#{msgs['jsf.Save']}" id="save" styleClass="button--primary"
             action="#{serverConfigurationBean.update}"/>
-        <s:button view="/admin/home.xhtml" value="#{msgs['jsf.Cancel']}" id="cancel"
-            propagation="none" styleClass="button button--link l--push-left-half"/>
+        <h:button outcome="/admin/home.xhtml" value="#{msgs['jsf.Cancel']}" id="cancel"
+            styleClass="button button--link l--push-left-half"/>
       </h:form>
     </div>
   </div>
diff --git a/zanata-war/src/main/webapp/admin/stats.xhtml b/zanata-war/src/main/webapp/admin/stats.xhtml
index 7cbcb2392d..18b7c9b419 100644
--- a/zanata-war/src/main/webapp/admin/stats.xhtml
+++ b/zanata-war/src/main/webapp/admin/stats.xhtml
@@ -39,35 +39,35 @@
     <div class="g--centered">
       <div class="g__item w--1-2-m w--3-8-l w--1-3 l--push-bottom-1">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none">
+          <h:link outcome="/admin/home.xhtml">
               #{msgs['jsf.Administration']}
-          </s:link>
+          </h:link>
         </p>
 
         <h1 class="l--push-all-0">#{msgs['jsf.Statistics']}</h1>
-        <s:div styleClass="panel l--pad-all-half l--push-v-half"  id="userStats">
+        <h:panelGroup layout="block"  styleClass="panel l--pad-all-half l--push-v-half"  id="userStats">
           <i class="i i--users delta l--push-right-quarter"></i>
-          <s:fragment rendered="#{not adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{not adminStatsAction.documentReady}">
               <zanata:loader layout="inline"/>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment rendered="#{adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{adminStatsAction.documentReady}">
             #{msgs['jsf.TotalTranslators']} <span class="badge">#{adminStatsAction.totalTranslator}</span>
 
             <span class="l--push-h-quarter">
               #{msgs['jsf.TotalReviewers']} <span class="badge">#{adminStatsAction.totalReviewer}</span>
             </span>
-          </s:fragment>
-        </s:div>
+          </ui:fragment>
+        </h:panelGroup>
 
-        <s:div styleClass="panel l--pad-all-half l--push-v-half" id="projectStats">
+        <h:panelGroup layout="block"  styleClass="panel l--pad-all-half l--push-v-half" id="projectStats">
           <i class="i i--project delta l--push-right-quarter"></i>
           #{msgs['jsf.TotalProjects']}
-          <s:fragment rendered="#{not adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{not adminStatsAction.documentReady}">
             <zanata:loader layout="inline"/>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment rendered="#{adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{adminStatsAction.documentReady}">
             <span class="badge">#{adminStatsAction.totalProjectCount}</span>
 
             <div class="l--push-top-quarter">
@@ -83,18 +83,18 @@
                 #{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteProjectCount}</span>
               </span>
             </div>
-          </s:fragment>
-        </s:div>
+          </ui:fragment>
+        </h:panelGroup>
 
 
-        <s:div styleClass="panel l--pad-all-half l--push-v-half" id="versionStats">
+        <h:panelGroup layout="block"  styleClass="panel l--pad-all-half l--push-v-half" id="versionStats">
           <i class="i i--version delta l--push-right-quarter"></i>
           #{msgs['jsf.Versions']}
-          <s:fragment rendered="#{not adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{not adminStatsAction.documentReady}">
             <zanata:loader layout="inline"/>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment rendered="#{adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{adminStatsAction.documentReady}">
             <span class="badge">#{adminStatsAction.totalProjectIterCount}</span>
             <div class="l--push-top-quarter">
               <span class="l--push-h-quarter txt--meta">
@@ -109,17 +109,17 @@
                 #{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteProjectIterCount}</span>
               </span>
             </div>
-          </s:fragment>
-        </s:div>
+          </ui:fragment>
+        </h:panelGroup>
 
-        <s:div styleClass="panel l--pad-all-half l--push-v-half" id="documentStats">
+        <h:panelGroup layout="block"  styleClass="panel l--pad-all-half l--push-v-half" id="documentStats">
           <i class="i i--document delta l--push-right-quarter"></i>
           #{msgs['jsf.TotalDocuments']}
-          <s:fragment rendered="#{not adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{not adminStatsAction.documentReady}">
             <zanata:loader layout="inline"/>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment rendered="#{adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{adminStatsAction.documentReady}">
             <span class="badge">#{adminStatsAction.totalDocuments}</span>
             <div class="l--push-top-quarter">
               <span class="l--push-h-quarter txt--meta">
@@ -130,18 +130,18 @@
                 #{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteDocuments}</span>
               </span>
             </div>
-          </s:fragment>
-        </s:div>
+          </ui:fragment>
+        </h:panelGroup>
 
-        <s:div styleClass="panel l--pad-all-half l--push-v-half" id="textFlowStats">
+        <h:panelGroup layout="block"  styleClass="panel l--pad-all-half l--push-v-half" id="textFlowStats">
           <i class="i i--translate delta l--push-right-quarter"></i>
           #{msgs['jsf.TotalTextFlows']}
 
-          <s:fragment rendered="#{not adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{not adminStatsAction.documentReady}">
             <zanata:loader layout="inline"/>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment rendered="#{adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{adminStatsAction.documentReady}">
             <span class="badge">#{adminStatsAction.totalTextFlows}</span>
             <div class="l--push-top-quarter">
               <span class="l--push-h-quarter txt--meta">
@@ -152,17 +152,17 @@
                 #{msgs['jsf.Deleted']} <span class="badge--danger">#{adminStatsAction.totalObsoleteTextFlows}</span>
               </span>
             </div>
-          </s:fragment>
-        </s:div>
+          </ui:fragment>
+        </h:panelGroup>
 
-        <s:div styleClass="panel l--pad-all-half l--push-v-half" id="translationStats">
+        <h:panelGroup layout="block"  styleClass="panel l--pad-all-half l--push-v-half" id="translationStats">
           <i class="i i--translate delta l--push-right-quarter"></i>
           #{msgs['jsf.TotalTextFlowTargets']}
-          <s:fragment rendered="#{not adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{not adminStatsAction.documentReady}">
             <zanata:loader layout="inline"/>
-          </s:fragment>
+          </ui:fragment>
 
-          <s:fragment rendered="#{adminStatsAction.documentReady}">
+          <ui:fragment rendered="#{adminStatsAction.documentReady}">
             <span class="badge">#{adminStatsAction.totalTextFlowTargets}</span>
             <div class="l--push-top-quarter">
               <span class="l--push-h-quarter txt--meta">
@@ -187,8 +187,8 @@
                 #{msgs['jsf.Untranslated']} <span class="badge">#{adminStatsAction.totalUntranslatedTextFlowTargets}</span>
               </div>
             </div>
-          </s:fragment>
-        </s:div>
+          </ui:fragment>
+        </h:panelGroup>
       </div>
     </div>
 
diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
index 343a36c4f7..f9fce15364 100644
--- a/zanata-war/src/main/webapp/admin/userdetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -3,6 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:c="http://java.sun.com/jsf/core"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:s="http://jboss.org/schema/seam/taglib">
 
 <ui:composition template="../WEB-INF/template/template.xhtml">
@@ -21,13 +23,13 @@
     <div class="g--centered">
       <div class="g__item w--3-4-m w--5-8-l w--1-3 l--push-bottom-1">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none">
+          <h:link outcome="/admin/home.xhtml">
             #{msgs['jsf.Administration']}
-          </s:link>
+          </h:link>
           <i class="i i--arrow-right"></i>
-          <s:link view="/admin/usermanager.xhtml" propagation="none">
+          <h:link outcome="/admin/usermanager.xhtml">
             #{msgs['jsf.ManageUsers']}
-          </s:link>
+          </h:link>
         </p>
 
         <h1 class="l--push-all-0">#{msgs['jsf.AccountDetails']}</h1>
@@ -48,11 +50,11 @@
               value="#{userAction.getEmail(userAction.username)}"/>
           </div>
 
-          <s:div styleClass="form__item l--push-top-1"
+          <h:panelGroup layout="block"  styleClass="form__item l--push-top-1"
             rendered="#{applicationConfiguration.internalAuth}">
             <h:outputLabel for="password">#{msgs['jsf.password.change']}</h:outputLabel>
-            <s:decorate id="passwordField"
-              template="../WEB-INF/layout/field.xhtml" enclose="true">
+            <zanata:decorate id="password"
+              componentId="passwordField">
               <div class="form__password js-form-password-parent">
                 <h:inputSecret id="password"
                   styleClass="js-form-password-input form__input"
@@ -60,14 +62,14 @@
                 </h:inputSecret>
                 <a href="#" class="form__toggle js-form-password-toggle">Show</a>
               </div>
-            </s:decorate>
-          </s:div>
+            </zanata:decorate>
+          </h:panelGroup>
 
-          <s:div styleClass="form__item l--push-top-1"
+          <h:panelGroup layout="block"  styleClass="form__item l--push-top-1"
             rendered="#{applicationConfiguration.internalAuth}">
             <h:outputLabel for="confirm">#{msgs['jsf.ConfirmPassword']}</h:outputLabel>
-            <s:decorate id="passwordConfirmField"
-              template="../WEB-INF/layout/field.xhtml" enclose="true">
+            <zanata:decorate id="passwordConfirm"
+              componentId="passwordConfirmField">
               <div class="form__password js-form-password-parent">
                 <h:inputSecret id="confirm"
                   styleClass="js-form-password-input form__input"
@@ -75,19 +77,19 @@
                 </h:inputSecret>
                 <a href="#" class="form__toggle js-form-password-toggle">Show</a>
               </div>
-            </s:decorate>
-          </s:div>
+            </zanata:decorate>
+          </h:panelGroup>
 
 
           <div class="form__item l--push-top-1">
             <h:outputLabel>#{msgs['jsf.MemberOf']}</h:outputLabel>
-            <s:decorate id="rolesField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+            <zanata:decorate id="roles" componentId="rolesField">
               <h:selectManyCheckbox id="roles" value="#{userAction.roles}"
                 layout="pageDirection" styleClass="checkbox">
-                <s:selectItems value="#{identityManager.listGrantableRoles()}" var="role"
-                  label="#{role}"/>
+                <c:selectItems value="#{identityManager.listGrantableRoles()}" var="role"
+                  itemLabel="#{role}"/>
               </h:selectManyCheckbox>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <div class="form__item l--push-top-1 checkbox">
@@ -99,8 +101,8 @@
           <h:commandButton id="userdetailSave" value="#{msgs['jsf.Save']}"
             action="#{userAction.save}" styleClass="button--primary"/>
 
-          <s:button id="userdetailCancel" view="/admin/usermanager.xhtml"
-            value="#{msgs['jsf.Cancel']}" propagation="end"
+          <h:commandLink id="userdetailCancel"
+            value="#{msgs['jsf.Cancel']}" action="#{userAction.cancel}"
             styleClass="button button--link l--push-left-half"/>
 
         </h:form>
diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
index 695c046ea0..a566564621 100644
--- a/zanata-war/src/main/webapp/admin/usermanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -11,6 +11,7 @@
 <ui:composition template="../WEB-INF/template/template.xhtml">
   <ui:define name="page_title">#{msgs['jsf.ManageUsers']}</ui:define>
   <ui:define name="center_content">
+    <!-- TODO [CDI] change this to pass selected role as param to zanataUserAction so that we don't need to use conversation scope -->
     <a4j:jsFunction name="editUser" action="#{userAction.editUser(username)}">
       <a4j:param name="val1" assignTo="#{username}"/>
     </a4j:jsFunction>
@@ -24,7 +25,7 @@
     <div class="g--centered">
       <div class="g__item w--2-3 l--push-bottom-half">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none"
+          <h:link outcome="/admin/home.xhtml"
             value="#{msgs['jsf.Administration']}"/>
         </p>
 
@@ -70,7 +71,7 @@
                         <span class="is-invisible">Options</span>
                       </a>
                       <ul class="dropdown__content js-dropdown__content">
-                        <s:fragment
+                        <ui:fragment
                           rendered="#{identity.hasPermission('seam.user', 'delete')}">
                           <li>
                             <a onclick="if(confirmDelete()){deleteUser('#{user}')};return false;"
@@ -79,7 +80,7 @@
                               <i class="i i--remove i__item__icon"></i>
                             </a>
                           </li>
-                        </s:fragment>
+                        </ui:fragment>
                       </ul>
                     </div>
                   </div>
@@ -91,16 +92,16 @@
                         <h3 class="list__title">
                           <span
                             class="#{identityManager.isUserEnabled(user) ? '' : 'txt--danger'}">
-                            <s:fragment
+                            <ui:fragment
                               rendered="#{not identityManager.isUserEnabled(user)}">
                               <i class="i i--lock"></i>
-                            </s:fragment>
+                            </ui:fragment>
                             #{user}
                           </span>
-                          <s:span styleClass="txt--meta l--push-h-quarter"
+                          <h:panelGroup layout="span" styleClass="txt--meta l--push-h-quarter"
                             rendered="#{not userSearch.getUserRoles(user).isEmpty()}">
                             [#{userSearch.getUserRoles(user)}]
-                          </s:span>
+                          </h:panelGroup>
                         </h3>
                         <span class="list__item__meta">
                           #{userAction.getEmail(user)}
diff --git a/zanata-war/src/main/webapp/dashboard/home.xhtml b/zanata-war/src/main/webapp/dashboard/home.xhtml
index e8073f3c86..7dc49a25c5 100644
--- a/zanata-war/src/main/webapp/dashboard/home.xhtml
+++ b/zanata-war/src/main/webapp/dashboard/home.xhtml
@@ -1,7 +1,7 @@
 <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:h="http://java.sun.com/jsf/html"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   template="../WEB-INF/template/template.xhtml">
 
@@ -29,13 +29,13 @@
       })
     </script>
 
-    <s:fragment rendered="#{identity.loggedIn}">
+    <ui:fragment rendered="#{identity.loggedIn}">
       <div class="g">
         <div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">
           <p class="txt--meta l--push-all-0">#{msgs['jsf.Dashboard']}</p>
 
           <div class="g--loose">
-            <s:div id="profile-overview" styleClass="g__item w--1-2-m">
+            <h:panelGroup layout="block"  id="profile-overview" styleClass="g__item w--1-2-m">
               <div class="media l--push-bottom-half">
                 <div class="media__item--right bx--round">
                   <img
@@ -53,7 +53,7 @@
                   </ul>
                 </div>
               </div>
-            </s:div>
+            </h:panelGroup>
             <div class="g__item w--1-2-m">
               <div class="tabs--lined js-tabs">
                 <ul class="tabs__nav js-tabs-nav">
@@ -125,6 +125,6 @@
           </div>
         </div>
       </div>
-    </s:fragment>
+    </ui:fragment>
   </ui:define>
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/edit_home_content.xhtml b/zanata-war/src/main/webapp/edit_home_content.xhtml
index 2b0cee141b..02d26857b5 100644
--- a/zanata-war/src/main/webapp/edit_home_content.xhtml
+++ b/zanata-war/src/main/webapp/edit_home_content.xhtml
@@ -29,10 +29,8 @@
           <h:commandButton id="update"
             value="#{msgs['jsf.Update']}"
             action="#{serverConfigurationBean.updateHomeContent}"/>
-          <s:button id="cancel" view="/home.xhtml"
-            value="#{msgs['jsf.Cancel']}"
-            propagation="none"
-            action="#{serverConfigurationBean.cancel}"/>
+          <h:button id="cancel" outcome="/home.xhtml"
+            value="#{msgs['jsf.Cancel']}"/>
         </div>
 
         <hr/>
diff --git a/zanata-war/src/main/webapp/error.xhtml b/zanata-war/src/main/webapp/error.xhtml
index 4895834e44..bdc69545b9 100644
--- a/zanata-war/src/main/webapp/error.xhtml
+++ b/zanata-war/src/main/webapp/error.xhtml
@@ -9,12 +9,12 @@
   <ui:define name="page_title">#{msgs['jsf.Error']}</ui:define>
   <ui:param name="showGlobalMessages" value="false"/>
   <ui:define name="center_content">
-    <s:fragment
+    <ui:fragment
       rendered="#{empty org.jboss.seam.international.statusMessages.currentGlobalMessages}">
       <h2>#{msgs['jsf.NoErrors']}</h2>
-    </s:fragment>
+    </ui:fragment>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{not empty org.jboss.seam.international.statusMessages.currentGlobalMessages}">
       <ul class="list--no-bullets">
         <li>
@@ -42,6 +42,6 @@
           </div>
         </li>
       </ul>
-    </s:fragment>
+    </ui:fragment>
   </ui:define>
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/glossary/view.xhtml b/zanata-war/src/main/webapp/glossary/view.xhtml
index 425db1b8c7..5934507443 100644
--- a/zanata-war/src/main/webapp/glossary/view.xhtml
+++ b/zanata-war/src/main/webapp/glossary/view.xhtml
@@ -40,7 +40,7 @@
             onbegin="clearHTML('#{rich:clientId('glossary_form')}')"
             status="glossaryLoader"/>
 
-          <s:fragment
+          <ui:fragment
             rendered="#{identity.hasPermission('', 'glossary-delete') or identity.hasPermission('', 'glossary-insert')}">
             <div
               class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown"
@@ -50,7 +50,7 @@
                 class="i i--ellipsis"></i></a>
               <ul class="dropdown__content js-dropdown__content" role="content"
                 aria-labelledby="dropdownContent">
-                <s:fragment
+                <ui:fragment
                   rendered="#{identity.hasPermission('', 'glossary-insert')}">
                   <li>
                     <a href="#" data-toggle="modal" data-target="#glossaryUploadDialog">
@@ -58,10 +58,10 @@
                       <i class="i i--import i__item__icon"></i>
                     </a>
                   </li>
-                </s:fragment>
+                </ui:fragment>
               </ul>
             </div>
-          </s:fragment>
+          </ui:fragment>
         </div>
         <h2 class="panel__heading">#{msgs['jsf.Glossary.entries.label']}</h2>
       </div>
@@ -82,10 +82,10 @@
       </a4j:status>
 
       <h:form id="glossary_form" styleClass="l--push-bottom-1">
-        <s:div styleClass="l--pad-all-half"
+        <h:panelGroup layout="block"  styleClass="l--pad-all-half"
           rendered="#{empty glossaryAction.getEntries()}">
           <p class="txt--meta">#{msgs['jsf.Glossary.empty']}</p>
-          <s:fragment
+          <ui:fragment
             rendered="#{identity.hasPermission('', 'glossary-insert')}">
             <p>
               <a href="#" data-toggle="modal" data-target="#glossaryUploadDialog"
@@ -94,15 +94,15 @@
                 <i class="i i--plus i__item__icon"></i>
               </a>
             </p>
-          </s:fragment>
-        </s:div>
+          </ui:fragment>
+        </h:panelGroup>
 
-        <s:div styleClass="l--pad-all-half"
+        <h:panelGroup layout="block"  styleClass="l--pad-all-half"
           rendered="#{not empty glossaryAction.getEntries() and empty glossaryAction.glossaryFilter.currentPage}">
           <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-        </s:div>
+        </h:panelGroup>
 
-        <s:fragment
+        <ui:fragment
           rendered="#{!glossaryAction.glossaryFilter.currentPage.isEmpty()}">
           <ul class="list--stats">
             <ui:repeat
@@ -112,7 +112,7 @@
                 value="#{identity.hasPermission('', 'glossary-delete')}"/>
               <li
                 class="#{hasActions ? 'list__item--actionable' : ''}">
-                <s:div styleClass="list__item__action" rendered="#{hasActions}">
+                <h:panelGroup layout="block"  styleClass="list__item__action" rendered="#{hasActions}">
                   <div
                     class="dropdown dropdown--small dropdown--inline dropdown--single list__item__dropdown js-dropdown">
                     <a href="#"
@@ -123,7 +123,7 @@
                       </span>
                     </a>
                     <ul class="dropdown__content js-dropdown__content">
-                      <s:fragment
+                      <ui:fragment
                         rendered="#{identity.hasPermission('', 'glossary-delete')}">
                         <li>
                           <a href="#" onclick="if(confirmDelete('#{glossaryAction.getDeleteConfirmationMessage(glossary.displayName)}')) {deleteGlossary('#{glossary.localeId}')}; return false;"
@@ -132,12 +132,12 @@
                             class="i i--remove i__item__icon"></i>
                           </a>
                         </li>
-                      </s:fragment>
+                      </ui:fragment>
                     </ul>
                   </div>
-                </s:div>
+                </h:panelGroup>
 
-                <s:link view="/language/language.xhtml">
+                <h:link outcome="/language/language.xhtml">
                   <f:param name="id" value="#{glossary.localeId}"/>
                   <div class="list__item__content">
                     <div class="list__item__info">
@@ -159,11 +159,11 @@
                       </span>
                     </div>
                   </div>
-                </s:link>
+                </h:link>
               </li>
             </ui:repeat>
           </ul>
-        </s:fragment>
+        </ui:fragment>
       </h:form>
 
       <zanata:list-filter listId="glossary_form"
diff --git a/zanata-war/src/main/webapp/home.xhtml b/zanata-war/src/main/webapp/home.xhtml
index 4a9a4e8579..34a5329a33 100644
--- a/zanata-war/src/main/webapp/home.xhtml
+++ b/zanata-war/src/main/webapp/home.xhtml
@@ -1,7 +1,6 @@
 <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
@@ -18,10 +17,10 @@
   <ui:define name="right_content">
     <rich:panel id="loggedIn" rendered="#{identity.hasRole('admin')}">
       <f:facet name="header">#{msgs['jsf.Actions']}</f:facet>
-      <s:link styleClass="action_link"
+      <h:link styleClass="action_link"
         value="#{msgs['jsf.server.EditHomePage.label']}"
-        view="/edit_home_content.xhtml" propagation="none">
-      </s:link>
+        outcome="/edit_home_content.xhtml">
+      </h:link>
     </rich:panel>
   </ui:define>
 
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index 275e3115bd..19598688ba 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -2,7 +2,6 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:f="http://java.sun.com/jsf/core"
@@ -185,30 +184,30 @@
 <div class="g" id="version-page">
 <div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">
   <p class="txt--meta l--push-all-0">
-    <s:link view="/project/home.xhtml" propagation="none"
+    <h:link outcome="/project/home.xhtml"
       value="#{msgs['jsf.Projects']}"/>
     <i class="i i--arrow-right"></i>
-    <s:link
-      value="#{versionHomeAction.version.project.name}" propagation="none"
-      view="/project/project.xhtml">
+    <h:link
+      value="#{versionHomeAction.version.project.name}"
+      outcome="/project/project.xhtml">
       <f:param name="slug" value="#{versionHomeAction.projectSlug}"/>
-    </s:link>
+    </h:link>
   </p>
 
-  <s:div styleClass="l--push-bottom-half" id="version-info">
+  <h:panelGroup layout="block"  styleClass="l--push-bottom-half" id="version-info">
     <h1 class="l--push-all-0"><zanata:version-label version="#{versionHome.instance}"/></h1>
-  </s:div>
+  </h:panelGroup>
 
-  <s:div styleClass="progress-bar--large__expander l--pad-bottom-half"
+  <h:panelGroup layout="block"  styleClass="progress-bar--large__expander l--pad-bottom-half"
     id="overall_statistic">
-    <s:fragment rendered="#{versionHomeAction.pageRendered}">
+    <ui:fragment rendered="#{versionHomeAction.pageRendered}">
       <p class="d--top l--pad-top-half txt--mini">
         #{msgs['jsf.TotalSourceContains']}
         <strong>#{versionHomeAction.overallStatistic.total} words</strong>
       </p>
       <ul class="g--tight g--fit">
         <ui:param name="showApproved" value="#{versionHomeAction.overallStatistic.percentApproved ne 0 || versionHome.instance.requireTranslationReview}"/>
-          <s:fragment rendered="#{showApproved}">
+          <ui:fragment rendered="#{showApproved}">
           <li class="g__item l--push-bottom-half">
               <span class="stats txt--state-highlight">
                 <span class="stats__figure">
@@ -218,7 +217,7 @@
                   class="stats__unit txt--lowercase"> #{msgs['jsf.stats.Approved']}</span>
               </span>
           </li>
-        </s:fragment>
+        </ui:fragment>
 
         <li class="g__item l--push-bottom-half">
               <span
@@ -244,11 +243,11 @@
       <zanata:statistic
         value="#{versionHomeAction.overallStatistic}"
         type="large"/>
-    </s:fragment>
+    </ui:fragment>
 
     <zanata:loader type="loader--large"
       rendered="#{!versionHomeAction.pageRendered}"/>
-  </s:div>
+  </h:panelGroup>
   <zanata:version-copy-action-loader id="copyTrans"
     oncomplete="onCopyTransComplete()"
     canCancelProcess="#{identity.hasPermission(versionHomeAction.version, 'update')}"
@@ -287,9 +286,9 @@
           <i class="i i--language"></i>
           <span class="is-hidden--s i__text--right">
             #{msgs['jsf.Languages']}
-            <s:span styleClass="txt--neutral" id="languages-size">
+            <h:panelGroup class="txt--neutral" id="languages-size">
               #{versionHomeAction.getSupportedLocale().size}
-            </s:span>
+            </h:panelGroup>
           </span>
         </a>
       </li>
@@ -300,14 +299,13 @@
           <i class="i i--document"></i>
           <span class="is-hidden--s i__text--right">
             #{msgs['jsf.Documents']}
-            <s:span styleClass="txt--neutral"
-              id="documents-size">
+            <h:panelGroup class="txt--neutral" id="documents-size">
               #{versionHomeAction.getDocuments().size}
-            </s:span>
+            </h:panelGroup>
           </span>
         </a>
       </li>
-      <s:fragment rendered="#{not empty versionHomeAction.groups}">
+      <ui:fragment rendered="#{not empty versionHomeAction.groups}">
         <li>
           <a id="groups_tab"
             href="#{request.contextPath}/iteration/view/#{versionHomeAction.projectSlug}/#{versionHomeAction.versionSlug}/groups"
@@ -315,19 +313,19 @@
             <i class="i i--group"></i>
             <span class="is-hidden--s i__text--right">
               #{msgs['jsf.Groups']}
-              <s:span styleClass="txt--neutral" id="groups-size">
+              <h:panelGroup class="txt--neutral" id="groups-size">
                 #{versionHomeAction.groups.size}
-              </s:span>
+              </h:panelGroup>
             </span>
           </a>
         </li>
-      </s:fragment>
+      </ui:fragment>
       <li class="tab__end">
         <h:form>
-          <s:div
+          <h:panelGroup layout="block"
             styleClass="dropdown dropdown--tab dropdown--small dropdown--right dropdown--inline js-dropdown"
             id="version-more-actions">
-            <s:fragment
+            <ui:fragment
               rendered="#{identity.loggedIn}">
               <a class="dropdown__toggle js-dropdown__toggle"
                 title="#{msgs['jsf.tooltip.MoreActions']}" href="#">
@@ -335,8 +333,8 @@
               </a>
               <ul class="dropdown__content js-dropdown__content"
                 role="content" aria-labelledby="dropdownContent">
-                <s:fragment rendered="#{not versionHomeAction.isCopyActionsRunning()}">
-                  <s:fragment
+                <ui:fragment rendered="#{not versionHomeAction.isCopyActionsRunning()}">
+                  <ui:fragment
                     rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
                     <li>
                       <a href="javascript:void(0)" class="i__item--right"
@@ -354,22 +352,22 @@
                         <i class="i i--import i__item__icon"></i>
                       </a>
                     </li>
-                  </s:fragment>
-                  <s:fragment
+                  </ui:fragment>
+                  <ui:fragment
                     rendered="#{identity.hasPermission(versionHome.instance, 'insert')}">
                     <li>
-                      <s:link view="/project/add_iteration.xhtml"
-                        styleClass="i__item--right" propagation="none"
+                      <h:link outcome="/project/add_iteration.xhtml"
+                        styleClass="i__item--right"
                         value="#{msgs['jsf.copyVersion.versionPage.label']}">
                         <f:param name="projectSlug"
                           value="#{versionHome.projectSlug}"/>
                         <f:param name="copyFromVersionSlug"
                           value="#{versionHome.slug}"/>
                         <i class="i i--plus i__item__icon"></i>
-                      </s:link>
+                      </h:link>
                     </li>
-                  </s:fragment>
-                </s:fragment>
+                  </ui:fragment>
+                </ui:fragment>
                 <li>
                   <h:commandLink title="#{msgs['jsf.GenerateProjectConfig']}"
                     styleClass="i__item--right"
@@ -392,11 +390,11 @@
                   </h:outputLink>
                 </li>
               </ul>
-            </s:fragment>
-          </s:div>
+            </ui:fragment>
+          </h:panelGroup>
         </h:form>
       </li>
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
         <li class="tab__end">
           <a id="settings_tab"
@@ -409,7 +407,7 @@
             <i class="i i--settings"></i>
           </a>
         </li>
-      </s:fragment>
+      </ui:fragment>
     </ul>
 
     <ul class="tabs__content panels__container js-tabs-content l--push-top-1">
@@ -423,29 +421,29 @@
           src="../WEB-INF/layout/version/documents-tab.xhtml"/>
       </li>
 
-      <s:fragment rendered="#{!versionHomeAction.groups.isEmpty()}">
+      <ui:fragment rendered="#{!versionHomeAction.groups.isEmpty()}">
         <li id="groups">
           <ui:include
             src="../WEB-INF/layout/version/groups-tab.xhtml"/>
         </li>
-      </s:fragment>
+      </ui:fragment>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
         <li id="settings">
           <ui:include
             src="../WEB-INF/layout/version/settings-tab.xhtml"/>
         </li>
-      </s:fragment>
+      </ui:fragment>
     </ul>
   </div>
 </div>
 </div>
 
-  <s:fragment
+  <ui:fragment
     rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
     <ui:include src="../WEB-INF/layout/version/merge_trans_modal.xhtml"/>
-  </s:fragment>
+  </ui:fragment>
 
 <rich:popupPanel id="uploadSourcePanel"
   moveable="#{true}"
@@ -454,29 +452,30 @@
   <f:facet name="header">
     <h:outputText id="uploadSourcePanelHeader"/>
   </f:facet>
-  <h:form id="uploadSrcForm" enctype="multipart/form-data">
-    <s:fileUpload id="specificDocFileInput"
-      accept="*"
-      onchange="checkIfFileSelected();"
-      data="#{versionHomeAction.sourceFileUpload.fileContents}"
-      fileName="#{versionHomeAction.sourceFileUpload.fileName}"/>
+  <h:form id="uploadSrcForm" >
+    <rich:fileUpload
+      fileUploadListener="#{versionHomeAction.sourceFileUploaded}"
+      addControlLabel="Select file..." clearAllLabel="Clear all" clearLabel="Clear"
+      uploadLabel="upload" immediateUpload="true" maxFilesQuantity="1" listHeight="60"
+
+      />
     <h:inputHidden id="uploadSourceDocId"
       value="#{versionHomeAction.sourceFileUpload.docId}"/>
     <br/>
     <h:selectOneMenu
       value="#{versionHomeAction.sourceFileUpload.sourceLang}">
-      <f:selectItem itemLabel="#{msgs['jsf.upload.selectDocType']}"
+      <f:selectItem itemLabel="#{msgs['jsf.SelectALanguageFromList']}"
         itemValue="#{null}" noSelectionOption="false" />
-      <s:selectItems
+      <f:selectItems
         value="#{versionHomeAction.availableSourceLocales}" var="locale"
-        label="#{locale.retrieveNativeName()}"
+        itemLabel="#{locale.retrieveNativeName()}" itemLabelEscaped="true"
         itemValue="#{locale.localeId.toString()}"
-        escape="true"/>
+        />
       <h:outputLabel value="#{msgs['jsf.SourceLanguage']}"/>
     </h:selectOneMenu>
 
-    <s:div id="source-documentType-selection">
-      <s:fragment rendered="#{versionHomeAction.needDocumentTypeSelection(selectedSourceDocName)}">
+    <h:panelGroup layout="block"  id="source-documentType-selection">
+      <ui:fragment rendered="#{versionHomeAction.needDocumentTypeSelection(selectedSourceDocName)}">
         <h:outputLabel styleClass="l--push-top-half">#{msgs['jsf.iteration.documentType.select']}</h:outputLabel>
         <h:selectOneMenu id="sourceDocumentTypes" onchange="bindSourceDocumentType(jQuery(this).val())"
           value="#{versionHomeAction.sourceFileUpload.documentType}">
@@ -487,8 +486,8 @@
             itemLabel="#{documentType.name()}"
             itemValue="#{documentType.name()}"/>
         </h:selectOneMenu>
-      </s:fragment>
-    </s:div>
+      </ui:fragment>
+    </h:panelGroup>
 
     <rich:collapsiblePanel
       header="#{msgs['jsf.iteration.files.CustomParams']}"
diff --git a/zanata-war/src/main/webapp/language/home.xhtml b/zanata-war/src/main/webapp/language/home.xhtml
index 486d8d0e9c..1fc89c1aa2 100644
--- a/zanata-war/src/main/webapp/language/home.xhtml
+++ b/zanata-war/src/main/webapp/language/home.xhtml
@@ -27,7 +27,7 @@
                 onbegin="clearHTML('#{rich:clientId('languageForm')}')"
                 status="languageLoader"/>
 
-              <s:div
+              <h:panelGroup layout="block"
                 styleClass="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown"
                 id="more-actions" rendered="#{identity.hasRole('admin')}">
                 <a class="dropdown__toggle js-dropdown__toggle" href="#"
@@ -44,7 +44,7 @@
                     </a>
                   </li>
                 </ul>
-              </s:div>
+              </h:panelGroup>
             </div>
             <h2 class="panel__heading">#{msgs['jsf.Languages']}</h2>
           </div>
@@ -68,26 +68,28 @@
             <ul class="list--stats">
               <ui:repeat value="#{languagesAction.currentPage}" var="language">
                 <li class="l--pad-all-quarter #{not language.active ? 'is-disabled' : ''}">
-                  <s:link view="/language/language.xhtml" propagation="none">
+                  <h:link outcome="/language/language.xhtml">
                     <f:param name="id" value="#{language.localeId.id}"/>
 
                     <div class="list__item__content">
                       <div class="list__item__info">
                         <h3 class="list__title">
                           #{language.retrieveDisplayName()}
-                          <s:span rendered="#{language.enabledByDefault}" styleClass="label"
+                          <h:panelGroup layout="span" rendered="#{language.enabledByDefault}" styleClass="label"
                             title="#{msgs['jsf.language.enableByDefault']}">
                             #{msgs['jsf.language.enabledByDefault']}
-                          </s:span>
+                          </h:panelGroup>
 
-                          <s:span rendered="#{not language.active}" styleClass="label"
-                            title="#{msgs['jsf.Disabled']}">
-                            #{msgs['jsf.Disabled']}
-                          </s:span>
+                          <h:panelGroup layout="span" rendered="#{not language.active}" styleClass="label">
+                            <!-- TODO h:panelGroup do not support title attribute. But do we really need a title here? -->
+                            <span title="#{msgs['jsf.Disabled']}">
+                              #{msgs['jsf.Disabled']}
+                            </span>
+                          </h:panelGroup>
 
-                          <s:fragment rendered="#{languagesAction.isUserTeamMember(language)}">
+                          <ui:fragment rendered="#{languagesAction.isUserTeamMember(language)}">
                             <i class="i i--translate txt--neutral" title="#{msgs['jsf.language.member.joined']}"></i>
-                          </s:fragment>
+                          </ui:fragment>
                         </h3>
                         <span
                           class="list__item__meta">#{language.localeId.id} [#{language.retrieveNativeName()}]</span>
@@ -99,7 +101,7 @@
                         </span>
                       </div>
                     </div>
-                  </s:link>
+                  </h:link>
                 </li>
               </ui:repeat>
             </ul>
@@ -114,9 +116,9 @@
             actionBean="#{languagesAction}"/>
         </div>
 
-        <s:fragment rendered="#{identity.hasRole('admin')}">
+        <ui:fragment rendered="#{identity.hasRole('admin')}">
           <ui:include src="../WEB-INF/layout/language/new_language_modal.xhtml"/>
-        </s:fragment>
+        </ui:fragment>
       </div>
     </div>
 
diff --git a/zanata-war/src/main/webapp/language/language.xhtml b/zanata-war/src/main/webapp/language/language.xhtml
index ee5882081a..076ad93e12 100644
--- a/zanata-war/src/main/webapp/language/language.xhtml
+++ b/zanata-war/src/main/webapp/language/language.xhtml
@@ -34,11 +34,11 @@
     <div class="g" id="language-page">
       <div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/language/home.xhtml" propagation="none"
+          <h:link outcome="/language/home.xhtml"
             value="#{msgs['jsf.Languages']}"/>
         </p>
 
-        <s:div styleClass="l--push-bottom-half" id="language-info">
+        <h:panelGroup layout="block"  styleClass="l--push-bottom-half" id="language-info">
           <h1 class="l--push-all-0 #{not languageAction.locale.active or not languageAction.locale.enabledByDefault ? 'txt--neutral' : ''}">
             <i class="i i--language"></i> #{languageAction.locale.retrieveDisplayName()}
           </h1>
@@ -49,25 +49,30 @@
             <div>
               #{msgs['jsf.NativeName']}<span class="l--push-left-quarter label">#{languageAction.locale.retrieveNativeName()}</span>
             </div>
-            <s:div rendered="#{languageAction.locale.asULocale().country ne ''}">
+            <h:panelGroup layout="block"  rendered="#{languageAction.locale.asULocale().country ne ''}">
               #{msgs['jsf.CountryCode']}<span class="l--push-left-quarter label">#{languageAction.locale.asULocale().country}</span>
-            </s:div>
-            <s:div rendered="#{languageAction.locale.asULocale().variant ne ''}">
+            </h:panelGroup>
+            <h:panelGroup layout="block"  rendered="#{languageAction.locale.asULocale().variant ne ''}">
               #{msgs['jsf.Variant']}<span class="l--push-left-quarter label">#{languageAction.locale.asULocale().variant}</span>
-            </s:div>
+            </h:panelGroup>
           </div>
-          <s:div rendered="#{not languageAction.locale.active or not languageAction.locale.enabledByDefault}">
-            <s:span styleClass="label" rendered="#{not languageAction.locale.active}"
-              title="#{msgs['jsf.Disabled']}">
-              #{msgs['jsf.Disabled']}
-            </s:span>
-            <s:span styleClass="label" rendered="#{not languageAction.locale.enabledByDefault}"
+          <h:panelGroup layout="block"  rendered="#{not languageAction.locale.active or not languageAction.locale.enabledByDefault}">
+            <h:panelGroup layout="span" styleClass="label" rendered="#{not languageAction.locale.active}">
+              <!-- TODO h:panelGroup do not support title attribute. But do we really need a title here? -->
+              <span title="#{msgs['jsf.Disabled']}">
+                #{msgs['jsf.Disabled']}
+              </span>
+            </h:panelGroup>
+            <h:panelGroup layout="span" styleClass="label" rendered="#{not languageAction.locale.enabledByDefault}"
               title="#{msgs['jsf.language.disableByDefault']}">
-              #{msgs['jsf.language.disableByDefault']}
-            </s:span>
-          </s:div>
+              <!-- TODO h:panelGroup do not support title attribute. But do we really need a title here? -->
+              <span title="#{msgs['jsf.language.disableByDefault']}">
+                #{msgs['jsf.language.disableByDefault']}
+              </span>
+            </h:panelGroup>
+          </h:panelGroup>
 
-        </s:div>
+        </h:panelGroup>
       </div>
 
       <div class="g__item w--1-m w--5-8-l w--2-3">
@@ -80,14 +85,14 @@
                 <i class="i i--users"></i>
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Members']}
-                <s:span styleClass="txt--neutral" id="members-size">
+                <h:panelGroup class="txt--neutral" id="members-size">
                   #{languageAction.localeMembers.size}
-                </s:span>
+                </h:panelGroup>
               </span>
               </a>
             </li>
 
-            <s:fragment rendered="#{identity.loggedIn}">
+            <ui:fragment rendered="#{identity.loggedIn}">
               <li class="tab__end">
                 <h:form styleClass="l--push-bottom-0 dropdown dropdown--tab dropdown--small dropdown--right dropdown--inline js-dropdown"
                   id="language-more-actions">
@@ -106,8 +111,8 @@
                       </a>
                     </li>
 
-                    <s:fragment rendered="#{not languageAction.isUserInTeam()}">
-                      <s:fragment rendered="#{not identity.hasRole('admin')}">
+                    <ui:fragment rendered="#{not languageAction.isUserInTeam()}">
+                      <ui:fragment rendered="#{not identity.hasRole('admin')}">
                         <li>
                           <a href="#" class="i__item--right"
                             data-toggle="modal"
@@ -116,8 +121,8 @@
                             <i class="i i--plus i__item__icon"></i>
                           </a>
                         </li>
-                      </s:fragment>
-                      <s:fragment rendered="#{identity.hasRole('admin')}">
+                      </ui:fragment>
+                      <ui:fragment rendered="#{identity.hasRole('admin')}">
                         <li>
                           <a4j:commandLink id="joinTeam"
                             action="#{languageAction.joinLanguageTeam}"
@@ -129,10 +134,10 @@
                               value="#{languageAction.language}"/>
                           </a4j:commandLink>
                         </li>
-                      </s:fragment>
-                    </s:fragment>
+                      </ui:fragment>
+                    </ui:fragment>
 
-                    <s:fragment rendered="#{languageAction.isUserInTeam()}">
+                    <ui:fragment rendered="#{languageAction.isUserInTeam()}">
                       <li>
                         <a4j:commandLink id="leaveTeam"
                           styleClass="txt--danger i__item--right"
@@ -144,13 +149,13 @@
                             value="#{languageAction.language}"/>
                         </a4j:commandLink>
                       </li>
-                    </s:fragment>
+                    </ui:fragment>
                   </ul>
                 </h:form>
               </li>
-            </s:fragment>
+            </ui:fragment>
 
-            <s:fragment rendered="#{identity.hasRole('admin')}">
+            <ui:fragment rendered="#{identity.hasRole('admin')}">
               <li class="tab__end">
                 <a id="settings_tab" href="#{languageURL}/settings"
                   class="js-url-mod" data-content="#settings">
@@ -160,7 +165,7 @@
                   <i class="i i--settings"></i>
                 </a>
               </li>
-            </s:fragment>
+            </ui:fragment>
           </ul>
 
           <ul class="tabs__content panels__container js-tabs-content l--push-top-1">
@@ -168,20 +173,20 @@
               <ui:include src="/WEB-INF/layout/language/members-tab.xhtml"/>
             </li>
 
-            <s:fragment rendered="#{identity.hasRole('admin')}">
+            <ui:fragment rendered="#{identity.hasRole('admin')}">
               <li id="settings">
                 <ui:include src="/WEB-INF/layout/language/settings-tab.xhtml"/>
               </li>
-            </s:fragment>
+            </ui:fragment>
           </ul>
         </div>
       </div>
     </div>
-    <s:fragment rendered="#{identity.loggedIn}">
+    <ui:fragment rendered="#{identity.loggedIn}">
       <ui:include src="/WEB-INF/layout/language/contact_coordinator_modal.xhtml"/>
-      <s:fragment rendered="#{not languageAction.isUserInTeam()}">
+      <ui:fragment rendered="#{not languageAction.isUserInTeam()}">
         <ui:include src="/WEB-INF/layout/language/request_join_modal.xhtml"/>
-      </s:fragment>
-    </s:fragment>
+      </ui:fragment>
+    </ui:fragment>
   </ui:define>
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/profile/create_user.xhtml b/zanata-war/src/main/webapp/profile/create_user.xhtml
index b7c3d5bad5..1bb0469c40 100644
--- a/zanata-war/src/main/webapp/profile/create_user.xhtml
+++ b/zanata-war/src/main/webapp/profile/create_user.xhtml
@@ -3,7 +3,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:a4j="http://richfaces.org/a4j"
   template="../WEB-INF/template/template.xhtml">
 
@@ -11,21 +11,21 @@
     name="page_title">#{msgs['jsf.Profile']}:#{msgs['jsf.NewUser.Label']}</ui:define>
 
   <ui:define name="center_content">
+    <a4j:jsFunction name="cancelCreateUser" action="#{newProfileAction.cancel}" />
     <div class="g--centered">
       <div class="g__item w--1-2-m w--3-8-l w--1-3 l--push-bottom-1">
 
-        <s:link view="/account/register.xhtml"
-          propagation="none"
+        <h:link outcome="/account/register.xhtml"
           rendered="#{applicationConfiguration.internalAuth}">
           <p class="txt--meta l--push-all-0">#{msgs['jsf.Signup']}</p>
-        </s:link>
+        </h:link>
 
-        <s:fragment
+        <ui:fragment
           rendered="#{not applicationConfiguration.internalAuth and not empty applicationConfiguration.registerPath}">
           <a href="#{applicationConfiguration.registerPath}">
             <p class="txt--meta l--push-all-0">#{msgs['jsf.Signup']}</p>
           </a>
-        </s:fragment>
+        </ui:fragment>
 
         <h1 class="l--push-all-0">#{msgs['jsf.NewUser.Label']}</h1>
 
@@ -38,59 +38,58 @@
         <h:form id="profile-form">
           <div class="l--push-top-half form__item">
             <h:outputLabel for="name">#{msgs['jsf.Name']}
-              <s:span styleClass="txt--required">*</s:span>
+              <span class="txt--required">*</span>
             </h:outputLabel>
-            <s:decorate id="nameField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+            <zanata:decorate id="name" componentId="nameField">
               <h:inputText id="name" value="#{newProfileAction.name}" required="true"
                 maxlength="80">
                 <a4j:ajax event="blur" render="nameField" execute="@this"/>
               </h:inputText>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <ui:remove>
             <!-- User name field is only shown for new users (otherwise they aren't allowed to edit the user name) -->
           </ui:remove>
-          <s:div styleClass="l--push-top-half form__item">
+          <h:panelGroup layout="block"  styleClass="l--push-top-half form__item">
           <h:outputLabel for="username">#{msgs['jsf.Username']}
-              <s:span styleClass="txt--required">*</s:span>
+              <span Class="txt--required">*</span>
             </h:outputLabel>
-            <s:decorate id="usernameField" template="../WEB-INF/layout/field.xhtml" enclose="true">
+            <zanata:decorate id="username" componentId="usernameField">
               <h:inputText id="username" required="true" maxlength="80"
                 value="#{newProfileAction.username}">
                 <a4j:ajax event="blur" render="usernameField" execute="@this"/>
               </h:inputText>
-            </s:decorate>
-          </s:div>
+            </zanata:decorate>
+          </h:panelGroup>
 
           <div class="l--push-top-half form__item">
             <h:outputLabel for="email">
               #{msgs['jsf.Email']}
-              <s:span styleClass="txt--required">*</s:span>
+              <span class="txt--required">*</span>
             </h:outputLabel>
-            <s:decorate id="emailField" template="../WEB-INF/layout/field.xhtml">
+            <zanata:decorate id="email" componentId="emailField">
               <h:inputText id="email" required="false"
                 value="#{newProfileAction.email}">
                 <a4j:ajax event="blur" render="emailField" execute="@this"/>
               </h:inputText>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
-          <s:fragment rendered="#{not empty applicationConfiguration.termsOfUseUrl}">
+          <ui:fragment rendered="#{not empty applicationConfiguration.termsOfUseUrl}">
             <p class="txt--meta l--push-top-half">
               <h:outputText value="#{msgs.format('jsf.register.agreeToTOS',
                 applicationConfiguration.termsOfUseUrl)}" escape="false"/>
             </p>
-          </s:fragment>
+          </ui:fragment>
 
           <div class="l--push-top-1">
             <h:commandButton id="user-create-new"
               value="#{msgs['jsf.Save']}"
               action="#{newProfileAction.createUser}"
               styleClass="l--push-right-half button--primary"/>
-            <s:button id="user-create-cancel" styleClass="button button-link"
-              value="#{msgs['jsf.Cancel']}"
-              action="#{newProfileAction.cancel}"/>
+            <h:button id="user-create-cancel" styleClass="button button-link"
+              value="#{msgs['jsf.Cancel']}" onclick="cancelCreateUser()"/>
           </div>
         </h:form>
       </div>
diff --git a/zanata-war/src/main/webapp/profile/home.xhtml b/zanata-war/src/main/webapp/profile/home.xhtml
index acf2bd5125..0f6de596d6 100644
--- a/zanata-war/src/main/webapp/profile/home.xhtml
+++ b/zanata-war/src/main/webapp/profile/home.xhtml
@@ -34,12 +34,12 @@
         </div>
       </div>
       <!-- user contribution matrix -->
-      <s:fragment rendered="#{identity.loggedIn}">
+      <ui:fragment rendered="#{identity.loggedIn}">
         <div class="g__item w--3-4 w--1-2-m">
           <div id="userMatrixRoot" class="bg--pop-highest l--pad-v-1"
             data-base-url="#{request.contextPath}/rest/stats/user/#{profileHome.username}/"></div>
         </div>
-      </s:fragment>
+      </ui:fragment>
     </div>
 
     <script type="text/javascript"
diff --git a/zanata-war/src/main/webapp/project/add_iteration.xhtml b/zanata-war/src/main/webapp/project/add_iteration.xhtml
index ecba62cce6..4db5ffc93e 100644
--- a/zanata-war/src/main/webapp/project/add_iteration.xhtml
+++ b/zanata-war/src/main/webapp/project/add_iteration.xhtml
@@ -13,13 +13,13 @@
     <div class="g--centered">
       <div class="g__item w--1-2-m w--3-8-l w--1-3 l--push-bottom-1">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/project/home.xhtml" propagation="none">
+          <h:link outcome="/project/home.xhtml">
             #{msgs['jsf.Projects']}
-          </s:link> <i class="i i--arrow-right"></i> <s:link
-          value="#{versionHome.project.name}" propagation="none"
-          view="/project/project.xhtml">
+          </h:link> <i class="i i--arrow-right"></i> <h:link
+          value="#{versionHome.project.name}"
+          outcome="/project/project.xhtml">
           <f:param name="slug" value="#{versionHome.projectSlug}"/>
-        </s:link>
+        </h:link>
         </p>
 
         <h1 class="l--push-all-0">#{msgs['jsf.project.NewVersion']}</h1>
diff --git a/zanata-war/src/main/webapp/project/create_project.xhtml b/zanata-war/src/main/webapp/project/create_project.xhtml
index 63157136d5..0edb429bb6 100644
--- a/zanata-war/src/main/webapp/project/create_project.xhtml
+++ b/zanata-war/src/main/webapp/project/create_project.xhtml
@@ -13,9 +13,9 @@
     <div class="g--centered">
       <div class="g__item w--1-2-m w--3-8-l w--1-3 l--push-bottom-1">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/project/home.xhtml" propagation="none">
+          <h:link outcome="/project/home.xhtml">
             #{msgs['jsf.Projects']}
-          </s:link>
+          </h:link>
         </p>
 
         <h1 class="l--push-all-0">#{msgs['jsf.NewProject.Label']}</h1>
diff --git a/zanata-war/src/main/webapp/project/home.xhtml b/zanata-war/src/main/webapp/project/home.xhtml
index a2be970cef..222b32b75c 100644
--- a/zanata-war/src/main/webapp/project/home.xhtml
+++ b/zanata-war/src/main/webapp/project/home.xhtml
@@ -7,6 +7,7 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   template="../WEB-INF/template/template_2x.xhtml">
 
   <ui:define name="page_title">#{msgs['jsf.Projects']}</ui:define>
@@ -16,11 +17,11 @@
       value="#{identity.loggedIn and (identity.hasPermission(projectHome.instance, 'insert') or identity.hasRole('admin'))}"/>
     <rich:panel id="loggedIn" rendered="#{hasActions}">
       <f:facet name="header">#{msgs['jsf.Actions']}</f:facet>
-      <s:link id="createProjectLink" styleClass="action_link"
+      <h:link id="createProjectLink" styleClass="action_link"
         rendered="#{identity.hasPermission(projectHome.instance, 'insert')}"
         value="#{msgs['jsf.NewProject.Label']}"
-        view="/project/create_project.xhtml"
-        propagation="none"/>
+        outcome="/project/create_project.xhtml"
+        />
       <h:outputLink id="exportTMXAllLink" styleClass="action_link"
         rendered="#{identity.hasRole('admin')}"
         onclick="return confirm('#{msgs['jsf.ConfirmExportTMXAll']}')"
@@ -31,11 +32,11 @@
   </ui:define>
 
   <ui:define name="center_content">
-    <s:decorate id="main_content">
-      <s:fragment rendered="#{projectAction.getEmpty()}">
+    <h:panelGroup id="main_content" layout="block">
+      <ui:fragment rendered="#{projectAction.getEmpty()}">
         <h:outputText value="#{msgs['jsf.NoProjectExists']}"/>
-      </s:fragment>
-      <s:fragment rendered="#{!projectAction.getEmpty()}">
+      </ui:fragment>
+      <ui:fragment rendered="#{!projectAction.getEmpty()}">
         <h:form id="form">
 
           <div style="text-align: center">
@@ -77,7 +78,7 @@
             </rich:dataScroller>
           </div>
 
-          <s:div styleClass="float-right">
+          <h:panelGroup layout="block"  styleClass="float-right">
             <a4j:region>
               <h:selectBooleanCheckbox
                 title="#{msgs['jsf.FilterActiveProjects']}"
@@ -94,7 +95,7 @@
               </h:selectBooleanCheckbox>
               <h:outputText value="#{msgs['jsf.ReadOnly']}"/>
             </a4j:region>
-          </s:div>
+          </h:panelGroup>
           <br/>
           <rich:dataTable id="projectList"
             rows="#{projectAction.projectPagedListDataModel.pageSize}"
@@ -103,18 +104,18 @@
               <f:facet name="header">#{msgs['jsf.ProjectName']}
               </f:facet>
 
-              <s:link id="project" styleClass="table_link"
-                value="#{project.name}" propagation="none"
-                view="/project/project.xhtml"
+              <h:link id="project" styleClass="table_link"
+                value="#{project.name}"
+                outcome="/project/project.xhtml"
                 rendered="#{project.status == 'ACTIVE'}">
                 <f:param name="slug" value="#{project.slug}"/>
-              </s:link>
-              <s:link id="readonlyProject" styleClass="table_link readonly_link"
-                value="#{project.name}" propagation="none"
-                view="/project/project.xhtml"
+              </h:link>
+              <h:link id="readonlyProject" styleClass="table_link readonly_link"
+                value="#{project.name}"
+                outcome="/project/project.xhtml"
                 rendered="#{project.status == 'READONLY'}">
                 <f:param name="slug" value="#{project.slug}"/>
-              </s:link>
+              </h:link>
             </rich:column>
             <rich:column width="270px">
               <f:facet name="header">#{msgs['jsf.Description']}</f:facet>
@@ -167,8 +168,8 @@
             </rich:dataScroller>
           </div>
         </h:form>
-      </s:fragment>
-    </s:decorate>
+      </ui:fragment>
+    </h:panelGroup>
   </ui:define>
 
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index 7bdb00c318..f43c0d00a7 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.xhtml
@@ -54,23 +54,23 @@
 <div class="g">
   <div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">
     <p class="txt--meta l--push-all-0">
-      <s:link view="/project/home.xhtml" propagation="none"
+      <h:link outcome="/project/home.xhtml"
         value="#{msgs['jsf.Projects']}"/>
     </p>
 
-    <s:div styleClass="media l--push-bottom-half" id="project-info">
+    <h:panelGroup layout="block"  styleClass="media l--push-bottom-half" id="project-info">
       <div class="media__body">
         <h1 class="l--push-all-0">#{projectHome.instance.name}</h1>
 
         <p class="txt--understated">
-          <s:fragment
+          <ui:fragment
             rendered="#{not empty projectHome.instance.description}">
             #{projectHome.instance.description}
-          </s:fragment>
+          </ui:fragment>
         </p>
       </div>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty projectHome.instance.sourceCheckoutURL or not empty projectHome.instance.sourceViewURL}">
         <div class="d--top l--push-top-half l--pad-top-half">
           <h2 class="delta headding--secondary l--push-top-0">
@@ -79,7 +79,7 @@
           </h2>
 
           <ul class="list--no-bullets txt--meta l--push-top-quarter">
-            <s:fragment
+            <ui:fragment
               rendered="#{not empty projectHome.instance.sourceViewURL}">
               <li>
                 <span class="list__title">
@@ -90,8 +90,8 @@
                   class="i--small i--right i--external-link txt--neutral"></i>
                 </a>
               </li>
-            </s:fragment>
-            <s:fragment
+            </ui:fragment>
+            <ui:fragment
               rendered="#{not empty projectHome.instance.sourceCheckoutURL}">
               <li>
                 <div class="bx--table">
@@ -109,17 +109,17 @@
                   </div>
                 </div>
               </li>
-            </s:fragment>
+            </ui:fragment>
           </ul>
         </div>
-      </s:fragment>
-    </s:div>
+      </ui:fragment>
+    </h:panelGroup>
 
-    <s:fragment rendered="#{identity.loggedIn}">
+    <ui:fragment rendered="#{identity.loggedIn}">
       <ui:param name="activities"
         value="#{projectHomeAction.getProjectLastActivity()}"/>
 
-      <s:div styleClass="panel l--push-top-half" rendered="#{not empty activities}">
+      <h:panelGroup layout="block"  styleClass="panel l--push-top-half" rendered="#{not empty activities}">
         <div class="panel__header">
           <h2 class="panel__heading--small">
             #{msgs['jsf.YourLastActivity']}
@@ -132,8 +132,8 @@
             </div>
           </ui:repeat>
         </div>
-      </s:div>
-    </s:fragment>
+      </h:panelGroup>
+    </ui:fragment>
 
 </div>
 <div class="g__item w--1-m w--5-8-l w--2-3">
@@ -146,9 +146,9 @@
           <i class="i i--version"></i>
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Versions']}
-                <s:span styleClass="txt--neutral" id="versions-size">
+                <h:panelGroup class="txt--neutral" id="versions-size">
                   #{projectHomeAction.getProjectVersions().size}
-                </s:span>
+                </h:panelGroup>
               </span>
         </a>
       </li>
@@ -159,9 +159,9 @@
           <i class="i i--users"></i>
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Maintainers']}
-                <s:span styleClass="txt--neutral" id="maintainers-size">
+                <h:panelGroup class="txt--neutral" id="maintainers-size">
                   #{projectHome.instance.maintainers.size}
-                </s:span>
+                </h:panelGroup>
               </span>
         </a>
       </li>
@@ -175,7 +175,7 @@
               </span>
         </a>
       </li>
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(projectHome.instance, 'update')}">
         <li class="tab__end">
           <div
@@ -209,7 +209,7 @@
             <i class="i i--settings"></i>
           </a>
         </li>
-      </s:fragment>
+      </ui:fragment>
     </ul>
 
     <ul class="tabs__content panels__container js-tabs-content l--push-top-1">
@@ -227,25 +227,25 @@
       </li>
 
       <li id="about">
-        <s:div id="project-about">
+        <h:panelGroup layout="block"  id="project-about">
           <div id="home-content-rendered" class="prose">
             <h:outputText
               rendered="#{not empty projectHome.instance.homeContent}"
               value="#{projectHome.aboutHtml}" escape="false" />
           </div>
-          <s:fragment rendered="#{empty projectHome.instance.homeContent}">
+          <ui:fragment rendered="#{empty projectHome.instance.homeContent}">
             #{msgs['jsf.project.NoHomeContent']}
-          </s:fragment>
-        </s:div>
+          </ui:fragment>
+        </h:panelGroup>
       </li>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(projectHome.instance, 'update')}">
         <li id="settings">
           <ui:include
             src="../WEB-INF/layout/project/settings-tab.xhtml"/>
         </li>
-      </s:fragment>
+      </ui:fragment>
     </ul>
 
     </div>
diff --git a/zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml b/zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
index 64d137664e..bd0f9116b7 100644
--- a/zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
@@ -40,56 +40,56 @@
     </li>
     <ui:param name="docName"
       value="#{activityEntry.getDocumentName(cc.attrs.value)}"/>
-    <s:fragment rendered="#{docName != null and !docName.isEmpty()}">
+    <ui:fragment rendered="#{docName != null and !docName.isEmpty()}">
       <li class="#{cc.attrs.hideInfo ? 'reveal__target': ''}">
         <i aria-hidden="true" class="i i--document txt--neutral"
           title="#{msgs['jsf.Document']}"></i>
         <span class="is-invisible">#{msgs['jsf.Document']}</span>
-        <s:fragment rendered="#{not isVersionDeleted}">
+        <ui:fragment rendered="#{not isVersionDeleted}">
           <a
             href="#{activityEntry.getDocumentUrl(cc.attrs.value)}">#{docName}</a>
-        </s:fragment>
-        <s:fragment rendered="#{isVersionDeleted}">
+        </ui:fragment>
+        <ui:fragment rendered="#{isVersionDeleted}">
           <span class="txt--neutral">#{docName}</span>
-        </s:fragment>
+        </ui:fragment>
       </li>
-    </s:fragment>
+    </ui:fragment>
     <ui:param name="languageName"
       value="#{activityEntry.getLanguageName(cc.attrs.value)}"/>
-    <s:fragment
+    <ui:fragment
       rendered="#{languageName != null and !languageName.isEmpty()}">
       <li class="#{cc.attrs.hideInfo ? 'reveal__target': ''}">
         <i aria-hidden="true" class="i i--language txt--neutral"
           title="#{msgs['jsf.Language']}"></i>
         <span class="is-invisible">#{msgs['jsf.Language']}</span>
-        <s:fragment rendered="#{not isVersionDeleted}">
+        <ui:fragment rendered="#{not isVersionDeleted}">
           <a
             href="#{activityEntry.getDocumentListUrl(cc.attrs.value)}">#{languageName}</a>
-        </s:fragment>
-        <s:fragment rendered="#{isVersionDeleted}">
+        </ui:fragment>
+        <ui:fragment rendered="#{isVersionDeleted}">
           <span class="txt--neutral">#{languageName}</span>
-        </s:fragment>
+        </ui:fragment>
       </li>
-    </s:fragment>
+    </ui:fragment>
     <ui:param name="versionName"
       value="#{activityEntry.getVersionName(cc.attrs.value)}"/>
-    <s:fragment
+    <ui:fragment
       rendered="#{versionName != null and !versionName.isEmpty()}">
       <li class="#{cc.attrs.hideInfo ? 'reveal__target': ''}">
         <i aria-hidden="true" class="i i--version txt--neutral"
           title="#{msgs['jsf.Version']}">
           <span class="is-invisible">#{msgs['jsf.Version']}</span>
         </i>
-        <s:fragment rendered="#{not isVersionDeleted}">
+        <ui:fragment rendered="#{not isVersionDeleted}">
           <a href="#{activityEntry.getVersionUrl(cc.attrs.value)}">
             <zanata:version-label version="#{activityEntry.getVersion(cc.attrs.value)}"/>
           </a>
-        </s:fragment>
-        <s:fragment rendered="#{isVersionDeleted}">
+        </ui:fragment>
+        <ui:fragment rendered="#{isVersionDeleted}">
           <strong><zanata:version-label version="#{activityEntry.getVersion(cc.attrs.value)}"/></strong>
-        </s:fragment>
+        </ui:fragment>
       </li>
-    </s:fragment>
+    </ui:fragment>
   </ul>
 </composite:implementation>
 </html>
diff --git a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
index d8c1763909..bc125e9220 100644
--- a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
@@ -110,7 +110,7 @@
     });
 
 
-    <s:fragment rendered="#{not empty cc.attrs.activePlaceholder}">
+    <ui:fragment rendered="#{not empty cc.attrs.activePlaceholder}">
       jQuery(function() {
         jQuery('#' + '#{cc.attrs.id}-autocomplete__input').on('focus', function() {
           $(this).attr('placeholder', '#{cc.attrs.activePlaceholder}');
@@ -119,10 +119,10 @@
           $(this).attr('placeholder', '#{cc.attrs.placeholder}');
         });
       });
-    </s:fragment>
+    </ui:fragment>
   </script>
 
-  <s:fragment rendered="#{cc.attrs.onSelectItem == 'null'}">
+  <ui:fragment rendered="#{cc.attrs.onSelectItem == 'null'}">
     <a4j:jsFunction name="#{cc.attrs.id}SubmitSelected"
       action="#{cc.attrs.actionBean.onSelectItemAction()}"
       render="#{cc.attrs.render}"
@@ -130,13 +130,13 @@
       status="#{cc.attrs.onSelectStatus}">
       <a4j:param name="val" assignTo="#{cc.attrs.actionBean.selectedItem}"/>
     </a4j:jsFunction>
-  </s:fragment>
+  </ui:fragment>
 
-  <s:fragment rendered="#{cc.attrs.onSelectItem != 'null'}">
+  <ui:fragment rendered="#{cc.attrs.onSelectItem != 'null'}">
     <a4j:jsFunction name="#{cc.attrs.id}SubmitSelected" limitRender="true">
       <a4j:param name="val" assignTo="#{cc.attrs.actionBean.selectedItem}"/>
     </a4j:jsFunction>
-  </s:fragment>
+  </ui:fragment>
 
   <div class="autocomplete" id="#{cc.attrs.id}"
     onkeydown="onResultKeyPressed(this, event, #{cc.attrs.id}SubmitSelected, #{cc.attrs.onSelectItem})">
@@ -149,12 +149,12 @@
 
     <input type="hidden" value="#{cc.attrs.minlength}"/>
     <input type="hidden" value="#{cc.attrs.searchWhenFocus}"/>
-    <s:div id="#{cc.attrs.id}-result">
+    <h:panelGroup layout="block"  id="#{cc.attrs.id}-result">
       <ui:param value="#{cc.attrs.actionBean.suggest()}" name="resultList"/>
       <div id="#{cc.attrs.id}-loader" class="is-hidden autocomplete__results">
         <zanata:loader/>
       </div>
-      <s:fragment rendered="#{not empty resultList}">
+      <ui:fragment rendered="#{not empty resultList}">
         <ul class="js-autocomplete__results autocomplete__results">
           <ui:repeat value="#{resultList}" var="result">
             <li class="js-autocomplete__result autocomplete__result">
@@ -164,8 +164,8 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
-    </s:div>
+      </ui:fragment>
+    </h:panelGroup>
   </div>
 </composite:implementation>
 </html>
diff --git a/zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml b/zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
index 2e38ab6e6e..98415d673f 100644
--- a/zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:composite="http://java.sun.com/jsf/composite"
   xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html">
 
 <composite:interface>
@@ -33,15 +34,15 @@
 <composite:implementation>
   <div class="form__checkbox js-form__checkbox #{cc.attrs.styleClass}" id="#{cc.clientId}"
     onclick="onCheckboxValueChanged(this, #{cc.attrs.onValueChanged})">
-    <s:fragment rendered="#{cc.attrs.checked}">
+    <ui:fragment rendered="#{cc.attrs.checked}">
       <input type="checkbox" value="#{cc.attrs.value}"
         class="form__checkbox__input js-form__checkbox__input"
         checked="checked"/>
-    </s:fragment>
-    <s:fragment rendered="#{!cc.attrs.checked}">
+    </ui:fragment>
+    <ui:fragment rendered="#{!cc.attrs.checked}">
       <input type="checkbox" value="#{cc.attrs.value}"
         class="form__checkbox__input js-form__checkbox__input"/>
-    </s:fragment>
+    </ui:fragment>
     <label class="form__checkbox__label js-form__checkbox__label #{cc.attrs.labelStyle}">
       <h:outputText value="#{cc.attrs.label}" escape="#{cc.attrs.escapeLabel}"/>
     </label>
diff --git a/zanata-war/src/main/webapp/resources/zanata/decorate.xhtml b/zanata-war/src/main/webapp/resources/zanata/decorate.xhtml
new file mode 100644
index 0000000000..cfa32f24db
--- /dev/null
+++ b/zanata-war/src/main/webapp/resources/zanata/decorate.xhtml
@@ -0,0 +1,32 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:f="http://java.sun.com/jsf/core"
+  xmlns:rich="http://richfaces.org/rich"
+  xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
+  xmlns:cc="http://java.sun.com/jsf/composite">
+
+  <cc:interface>
+    <!-- Based on seam's migration demo project at https://github.com/seam/migration.-->
+    <!-- NOTE if you define an id, componentId must be different from the id otherwise it won't work -->
+    <cc:attribute name="componentId" required="false"
+      shortDescription="a component id for reference in other jsf events. It must be different from the id you defined on the component otherwise it will not work properly. e.g. ajax blur event triggering a validation re-render"/>
+    <cc:attribute name="rendered" required="false"/>
+    <cc:attribute name="styleClass" required="false"/>
+  </cc:interface>
+
+  <cc:implementation>
+    <h:panelGroup
+      id="#{not empty cc.attrs.componentId ? cc.attrs.componentId : 'Panel'}"
+      rendered="#{cc.attrs.rendered}">
+      <zanata:field styleClass="#{cc.attrs.styleClass}" id="input">
+        <cc:insertChildren/>
+      </zanata:field>
+    </h:panelGroup>
+
+
+  </cc:implementation>
+</ui:composition>
diff --git a/zanata-war/src/main/webapp/resources/zanata/field.xhtml b/zanata-war/src/main/webapp/resources/zanata/field.xhtml
new file mode 100644
index 0000000000..cd2dd5ded3
--- /dev/null
+++ b/zanata-war/src/main/webapp/resources/zanata/field.xhtml
@@ -0,0 +1,27 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:f="http://java.sun.com/jsf/core"
+  xmlns:rich="http://richfaces.org/rich"
+  xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:cc="http://java.sun.com/jsf/composite">
+
+  <cc:interface componentType="org.zanata.faces.InputContainer">
+    <cc:attribute name="styleClass" required="false"/>
+  </cc:interface>
+
+  <cc:implementation>
+
+    <div class="#{cc.attrs.invalid ? 'form__item--error' : ''} #{cc.attrs.styleClass}">
+      <f:validateBean >
+        <cc:insertChildren/>
+      </f:validateBean>
+      <h:panelGroup rendered="#{cc.attrs.invalid}" layout="block"
+        styleClass="message--danger app-error">
+        <h:message id="errorMessage" />
+      </h:panelGroup>
+    </div>
+  </cc:implementation>
+</ui:composition>
diff --git a/zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml b/zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
index d25b9029da..6ddd66094c 100644
--- a/zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
@@ -13,7 +13,7 @@
 
 <composite:implementation>
   <ui:repeat value="#{cc.attrs.value}" var="message">
-    <s:fragment
+    <ui:fragment
       rendered="#{message.severity.toString().startsWith('INFO')}">
       <li
         class="message--highlight message--removable js-message-removable">
@@ -22,8 +22,8 @@
           <i class="i i--remove"></i>
         </a>
       </li>
-    </s:fragment>
-    <s:fragment
+    </ui:fragment>
+    <ui:fragment
       rendered="#{message.severity.toString().startsWith('WARN')}">
       <li
         class="message--warning message--removable js-message-removable">
@@ -32,8 +32,8 @@
           <i class="i i--remove"></i>
         </a>
       </li>
-    </s:fragment>
-    <s:fragment
+    </ui:fragment>
+    <ui:fragment
       rendered="#{message.severity.toString().startsWith('ERROR') or message.severity.toString().startsWith('FATAL')}">
       <li class="message--danger message--removable js-message-removable app-error">
         #{message.summary}
@@ -41,7 +41,7 @@
           <i class="i i--remove"></i>
         </a>
       </li>
-    </s:fragment>
+    </ui:fragment>
   </ui:repeat>
 </composite:implementation>
 </html>
diff --git a/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml b/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
index ce680dad42..0602368fd6 100644
--- a/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
@@ -2,8 +2,10 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:composite="http://java.sun.com/jsf/composite"
+  xmlns:h="http://java.sun.com/jsf/html"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:a4j="http://richfaces.org/a4j">
 
 <composite:interface>
@@ -49,7 +51,7 @@
     limitRender="true">
   </a4j:jsFunction>
 
-  <s:fragment rendered="#{!cc.attrs.bottomPanel}">
+  <ui:fragment rendered="#{!cc.attrs.bottomPanel}">
     <a4j:jsFunction name="#{cc.attrs.id}FilterList"
       action="#{cc.attrs.actionBean.firstPage}" status="#{cc.attrs.status}"
       render="#{cc.attrs.id}-pager, #{cc.attrs.id}-page-info, #{cc.attrs.render}"
@@ -71,16 +73,16 @@
         data-target="##{cc.attrs.id}">#{msgs['jsf.Cancel']}
       </button>
     </div>
-  </s:fragment>
+  </ui:fragment>
 
-  <s:div
+  <h:panelGroup layout="block"
     styleClass="panel__results #{cc.attrs.bottomPanel ? 'panel__results--bottom' : ''}">
-    <s:div id="#{cc.attrs.id}-pager">
-      <s:div styleClass="panel__results__type"
+    <h:panelGroup layout="block"  id="#{cc.attrs.id}-pager">
+      <h:panelGroup layout="block"  styleClass="panel__results__type"
         rendered="#{not (cc.attrs.bottomPanel and cc.attrs.actionBean.totalRecords eq 0)}">
         <i class="i txt--neutral #{cc.attrs.iconClass}"></i>
-      </s:div>
-      <s:fragment
+      </h:panelGroup>
+      <ui:fragment
         rendered="#{cc.attrs.actionBean.totalRecords ge cc.attrs.actionBean.pageSize}">
         <ul class="panel__pager">
           <li>
@@ -100,26 +102,26 @@
             </button>
           </li>
         </ul>
-      </s:fragment>
-    </s:div>
+      </ui:fragment>
+    </h:panelGroup>
     <span class="txt--meta">
-      <s:span id="#{cc.attrs.id}-page-info">
-        <s:fragment
+      <h:panelGroup id="#{cc.attrs.id}-page-info">
+        <ui:fragment
           rendered="#{not (cc.attrs.bottomPanel and cc.attrs.actionBean.totalRecords eq 0)}">
-          <s:fragment
+          <ui:fragment
             rendered="#{cc.attrs.actionBean.totalRecords gt cc.attrs.actionBean.pageSize}">
             <strong>#{cc.attrs.actionBean.pageStartIdx+1}-#{cc.attrs.actionBean.pageEndIdx+1}</strong> of
             #{cc.attrs.actionBean.totalRecords}
-          </s:fragment>
-          <s:fragment
+          </ui:fragment>
+          <ui:fragment
             rendered="#{cc.attrs.actionBean.totalRecords le cc.attrs.actionBean.pageSize}">
             <strong>#{cc.attrs.actionBean.totalRecords}</strong>
-          </s:fragment>
-        </s:fragment>
-      </s:span>
+          </ui:fragment>
+        </ui:fragment>
+      </h:panelGroup>
 
 
-      <s:fragment rendered="#{!cc.attrs.bottomPanel}">
+      <ui:fragment rendered="#{!cc.attrs.bottomPanel}">
         <button
           class="button--link panel__search__reset js-reveal__reset is-hidden"
           data-target="##{cc.attrs.id}"
@@ -131,8 +133,8 @@
           data-target="##{cc.attrs.id}">
           #{msgs['jsf.Search']}<i class="i--right i--search"></i>
         </button>
-      </s:fragment>
+      </ui:fragment>
     </span>
-  </s:div>
+  </h:panelGroup>
 </composite:implementation>
 </html>
diff --git a/zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml b/zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
index befde58661..0ee1c1d2e4 100644
--- a/zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
@@ -47,9 +47,9 @@
     </a4j:status>
 
     <h:form id="maintainers-form" styleClass="l--push-bottom-1">
-      <s:div styleClass="l--pad-all-half" rendered="#{cc.attrs.listSize lt 1}">
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half" rendered="#{cc.attrs.listSize lt 1}">
         <p class="txt--meta">#{msgs['jsf.NoMaintainers']}</p>
-        <s:fragment rendered="#{cc.attrs.PermissionToUpdate}">
+        <ui:fragment rendered="#{cc.attrs.PermissionToUpdate}">
           <p>
             <a class="button--primary" href="#{cc.attrs.settingsUrl}"
               onclick="changeBrowserUrl(this.href, true);return false;">
@@ -57,15 +57,15 @@
               <i class="i i--plus i__item__icon"></i>
             </a>
           </p>
-        </s:fragment>
-      </s:div>
+        </ui:fragment>
+      </h:panelGroup>
 
-      <s:div styleClass="l--pad-all-half"
+      <h:panelGroup layout="block"  styleClass="l--pad-all-half"
         rendered="#{cc.attrs.listSize gt 1 and empty cc.attrs.filterActionBean.currentPage}">
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
-      </s:div>
+      </h:panelGroup>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty cc.attrs.filterActionBean.currentPage}">
         <ul class="list--slat">
           <ui:repeat value="#{cc.attrs.filterActionBean.currentPage}"
@@ -81,7 +81,7 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
+      </ui:fragment>
     </h:form>
 
     <zanata:list-filter status="maintainerTab-maintainersLoader"
diff --git a/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml b/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
index a8bb0ae9fc..ca17b80db1 100644
--- a/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
@@ -2,8 +2,9 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:composite="http://java.sun.com/jsf/composite"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
+  xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:rich="http://richfaces.org/rich">
 <composite:interface>
   <composite:attribute name="id" type="java.lang.String"
@@ -63,39 +64,39 @@
     //]]>
   </script>
 
-  <s:div id="#{cc.attrs.id}" title="#{cc.attrs.title}">
-    <s:div id="#{cc.attrs.id}-content"
+  <h:panelGroup layout="block"  id="#{cc.attrs.id}" title="#{cc.attrs.title}">
+    <h:panelGroup layout="block"  id="#{cc.attrs.id}-content"
       styleClass="is-active #{cc.attrs.type eq 'large' ? 'progress-bar--large__expander' : 'progress-bar__expander'}">
 
-      <s:div id="#{cc.attrs.id}-var">
+      <h:panelGroup layout="block"  id="#{cc.attrs.id}-var">
         <input id="#{cc.attrs.id}-inProgress" type="hidden"
           value="#{cc.attrs.actionBean.inProgress}"/>
         <input id="#{cc.attrs.id}-completePercent" type="hidden"
           value="#{cc.attrs.actionBean.completedPercentage}"/>
-      </s:div>
+      </h:panelGroup>
 
-      <s:fragment rendered="#{cc.attrs.type eq 'large'}">
-        <s:div styleClass="progress-bar progress-bar--large">
+      <ui:fragment rendered="#{cc.attrs.type eq 'large'}">
+        <h:panelGroup layout="block"  styleClass="progress-bar progress-bar--large">
           <span class="progress-bar__translated" style="width: 0%;"/>
           <span class="progress-bar__item" style="width: 100%;margin-left: 0%"/>
-        </s:div>
-      </s:fragment>
+        </h:panelGroup>
+      </ui:fragment>
 
-      <s:fragment rendered="#{cc.attrs.type eq 'full'}">
-        <s:div styleClass="progress-bar progress-bar--full">
+      <ui:fragment rendered="#{cc.attrs.type eq 'full'}">
+        <h:panelGroup layout="block"  styleClass="progress-bar progress-bar--full">
           <span class="progress-bar__translated" style="width: 0%;"/>
           <span class="progress-bar__item" style="width: 100%;margin-left: 0%"/>
-        </s:div>
-      </s:fragment>
+        </h:panelGroup>
+      </ui:fragment>
 
-      <s:fragment rendered="#{cc.attrs.type eq ''}">
-        <s:div styleClass="progress-bar">
+      <ui:fragment rendered="#{cc.attrs.type eq ''}">
+        <h:panelGroup layout="block"  styleClass="progress-bar">
           <span class="progress-bar__translated" style="width: 0%;"/>
           <span class="progress-bar__item" style="width: 100%;margin-left: 0%"/>
-        </s:div>
-      </s:fragment>
+        </h:panelGroup>
+      </ui:fragment>
 
-    </s:div>
-  </s:div>
+    </h:panelGroup>
+  </h:panelGroup>
 </composite:implementation>
 </html>
diff --git a/zanata-war/src/main/webapp/resources/zanata/project-label.xhtml b/zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
index f2925fcd93..49d6de3753 100644
--- a/zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
@@ -23,6 +23,7 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:composite="http://java.sun.com/jsf/composite"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:s="http://jboss.org/schema/seam/taglib">
 
 <composite:interface>
@@ -34,23 +35,23 @@
 </composite:interface>
 
 <composite:implementation>
-  <s:fragment rendered="#{cc.attrs.project.status == 'ACTIVE'}">
+  <ui:fragment rendered="#{cc.attrs.project.status == 'ACTIVE'}">
     #{cc.attrs.project.name}
-  </s:fragment>
-  <s:fragment rendered="#{cc.attrs.project.status == 'READONLY'}">
+  </ui:fragment>
+  <ui:fragment rendered="#{cc.attrs.project.status == 'READONLY'}">
     <span class="txt--neutral">#{cc.attrs.project.name}
-      <s:fragment rendered="#{cc.attrs.showIcon}">
+      <ui:fragment rendered="#{cc.attrs.showIcon}">
         <i class="i--small i--right i--lock" title="#{msgs['jsf.project.tooltip.readonly']}"></i>
-      </s:fragment>
+      </ui:fragment>
     </span>
-  </s:fragment>
-  <s:fragment rendered="#{cc.attrs.project.status == 'OBSOLETE'}">
+  </ui:fragment>
+  <ui:fragment rendered="#{cc.attrs.project.status == 'OBSOLETE'}">
     <span class="txt--neutral">#{cc.attrs.project.name}
-      <s:fragment rendered="#{cc.attrs.showIcon}">
+      <ui:fragment rendered="#{cc.attrs.showIcon}">
         <i class="i--small i--right i--archive" title="#{msgs['jsf.project.tooltip.obsolete']}"></i>
-      </s:fragment>
+      </ui:fragment>
     </span>
-  </s:fragment>
+  </ui:fragment>
 </composite:implementation>
 </html>
 
diff --git a/zanata-war/src/main/webapp/resources/zanata/statistic.xhtml b/zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
index 098ecf5e1a..aacfc751e9 100644
--- a/zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
@@ -17,7 +17,7 @@
   <div
     class="#{cc.attrs.type eq 'large' ? 'progress-bar--large' : 'progress-bar'}">
 
-    <s:fragment rendered="#{cc.attrs.value != null}">
+    <ui:fragment rendered="#{cc.attrs.value != null}">
       <ui:param name="translated" value="#{cc.attrs.value.translated}"/>
       <ui:param name="fuzzy" value="#{cc.attrs.value.needReview}"/>
       <ui:param name="rejected" value="#{cc.attrs.value.rejected}"/>
@@ -27,7 +27,7 @@
         value="#{cc.attrs.value.remainingHours}"/>
       <ui:param name="total" value="#{cc.attrs.value.total}"/>
 
-      <s:fragment rendered="#{total gt 0}">
+      <ui:fragment rendered="#{total gt 0}">
         <ui:param name="approved_percentage"
           value="#{statisticBar.formatPercentage(cc.attrs.value.percentApproved)}"/>
         <ui:param name="translated_percentage"
@@ -65,22 +65,22 @@
           <span
             class="is-invisible">#{msgs['jsf.stats.Untranslated']}</span>
         </span>
-      </s:fragment>
+      </ui:fragment>
 
-      <s:fragment rendered="#{total le 0}">
+      <ui:fragment rendered="#{total le 0}">
         <span class="progress-bar__item"
           title="#{msgs['jsf.NoContent']}" style="width: 100%;">
           <span class="is-invisible">#{msgs['jsf.NoContent']}</span>
         </span>
-      </s:fragment>
-    </s:fragment>
+      </ui:fragment>
+    </ui:fragment>
 
-    <s:fragment rendered="#{cc.attrs.value == null}">
+    <ui:fragment rendered="#{cc.attrs.value == null}">
       <span class="progress-bar__item"
         title="#{msgs['jsf.NoContent']}" style="width: 100%;">
           <span class="is-invisible">#{msgs['jsf.NoContent']}</span>
         </span>
-    </s:fragment>
+    </ui:fragment>
   </div>
 
 
diff --git a/zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml b/zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
index 49e915d652..de468d8d9f 100644
--- a/zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
@@ -2,7 +2,6 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:composite="http://java.sun.com/jsf/composite"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:h="http://java.sun.com/jsf/html">
 
@@ -34,20 +33,20 @@
 
 <composite:implementation>
   <div id="#{cc.clientId}">
-    <s:div id="#{cc.clientId}-content" styleClass="panel l--push-top-1 #{cc.attrs.actionBean.inProgress ? '' : 'is-hidden'}">
-      <s:div styleClass="panel__header"
+    <h:panelGroup layout="block"  id="#{cc.clientId}-content" styleClass="panel l--push-top-1 #{cc.attrs.actionBean.inProgress ? '' : 'is-hidden'}">
+      <h:panelGroup layout="block"  styleClass="panel__header"
         rendered="#{cc.attrs.actionBean.inProgress}">
-        <s:div
+        <h:panelGroup layout="block"
           styleClass="panel__header__actions l--push-right-half l--push-bottom-0"
           rendered="#{cc.attrs.canCancelProcess}">
           <a href="javascript:void(0)"
             onclick="if(confirm('#{cc.attrs.cancelConfirmationMessage}')) {#{cc.attrs.onCancel}};"
             title="#{cc.attrs.cancelTooltip}"
             class="button--small button--link">#{msgs['jsf.Cancel']}</a>
-        </s:div>
+        </h:panelGroup>
 
         <h2 class="panel__heading--small">#{cc.attrs.header}</h2>
-      </s:div>
+      </h:panelGroup>
 
       <div class="l--pad-all-half l--push-top-quarter">
         <zanata:progressBar id="#{cc.clientId}ProgressBar"
@@ -55,16 +54,16 @@
           render="#{cc.clientId}-progress-messages"
           oncomplete="#{cc.attrs.oncomplete}"/>
 
-        <s:div id="#{cc.clientId}-progress-messages"
+        <h:panelGroup layout="block"  id="#{cc.clientId}-progress-messages"
           styleClass="txt--meta l--push-top-quarter">
           <zanata:loader layout="inline" type="loader--small"
             rendered="#{cc.attrs.actionBean.inProgress}"/>
         <span>
           <h:outputText value="#{cc.attrs.actionBean.progressMessage}"/>
         </span>
-        </s:div>
+        </h:panelGroup>
       </div>
-    </s:div>
+    </h:panelGroup>
   </div>
 </composite:implementation>
 </html>
diff --git a/zanata-war/src/main/webapp/resources/zanata/version-label.xhtml b/zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
index 2ef5fc3006..c81fedda9b 100644
--- a/zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
@@ -2,6 +2,7 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:composite="http://java.sun.com/jsf/composite"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:s="http://jboss.org/schema/seam/taglib">
 
 <composite:interface>
@@ -13,23 +14,23 @@
 </composite:interface>
 
 <composite:implementation>
-  <s:fragment rendered="#{cc.attrs.version.status == 'ACTIVE'}">
+  <ui:fragment rendered="#{cc.attrs.version.status == 'ACTIVE'}">
     #{cc.attrs.version.slug}
-  </s:fragment>
-  <s:fragment rendered="#{cc.attrs.version.status == 'READONLY'}">
+  </ui:fragment>
+  <ui:fragment rendered="#{cc.attrs.version.status == 'READONLY'}">
     <span class="txt--neutral">#{cc.attrs.version.slug}
-      <s:fragment rendered="#{cc.attrs.showIcon}">
+      <ui:fragment rendered="#{cc.attrs.showIcon}">
         <i class="i--small i--right i--lock" title="#{msgs['jsf.iteration.tooltip.readonly']}"></i>
-      </s:fragment>
+      </ui:fragment>
     </span>
-  </s:fragment>
-  <s:fragment rendered="#{cc.attrs.version.status == 'OBSOLETE'}">
+  </ui:fragment>
+  <ui:fragment rendered="#{cc.attrs.version.status == 'OBSOLETE'}">
     <span class="txt--neutral">#{cc.attrs.version.slug}
-      <s:fragment rendered="#{cc.attrs.showIcon}">
+      <ui:fragment rendered="#{cc.attrs.showIcon}">
         <i class="i--small i--right i--trash" title="#{msgs['jsf.iteration.tooltip.obsolete']}"></i>
-      </s:fragment>
+      </ui:fragment>
     </span>
-  </s:fragment>
+  </ui:fragment>
 </composite:implementation>
 </html>
 
diff --git a/zanata-war/src/main/webapp/search.xhtml b/zanata-war/src/main/webapp/search.xhtml
index cf67ea198a..c5fc11666f 100644
--- a/zanata-war/src/main/webapp/search.xhtml
+++ b/zanata-war/src/main/webapp/search.xhtml
@@ -3,6 +3,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:h="http://java.sun.com/jsf/html"
   template="/WEB-INF/template/template.xhtml">
 
   <ui:define
@@ -25,9 +26,9 @@
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Projects']}
               </span>
-                <s:span styleClass="txt--neutral" id="projects-size">
+                <h:panelGroup class="txt--neutral" id="projects-size">
                   #{zanataSearch.getTotalProjectCount()}
-                </s:span>
+                </h:panelGroup>
               </a>
             </li>
             <li>
@@ -38,9 +39,9 @@
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Users']}
               </span>
-                <s:span styleClass="txt--neutral" id="users-size">
+                <h:panelGroup class="txt--neutral" id="users-size">
                   #{zanataSearch.getTotalUserCount()}
-                </s:span>
+                </h:panelGroup>
               </a>
             </li>
           </ul>
diff --git a/zanata-war/src/main/webapp/tm/create.xhtml b/zanata-war/src/main/webapp/tm/create.xhtml
index 114dee5841..d086441f45 100644
--- a/zanata-war/src/main/webapp/tm/create.xhtml
+++ b/zanata-war/src/main/webapp/tm/create.xhtml
@@ -13,13 +13,13 @@
     <div class="g--centered">
       <div class="g__item w--1-2-m w--3-8-l w--1-3 l--push-bottom-1">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/admin/home.xhtml" propagation="none">
+          <h:link outcome="/admin/home.xhtml">
             #{msgs['jsf.Administration']}
-          </s:link>
+          </h:link>
           <i class="i i--arrow-right"></i>
-          <s:link view="/tm/home.xhtml" propagation="none">
+          <h:link outcome="/tm/home.xhtml">
             #{msgs['jsf.transmemory.Title']}
-          </s:link>
+          </h:link>
         </p>
 
         <h1 class="l--push-all-0">#{msgs['jsf.transmemory.title.New']}</h1>
diff --git a/zanata-war/src/main/webapp/tm/home.xhtml b/zanata-war/src/main/webapp/tm/home.xhtml
index 90b93b5cb1..5a50020667 100644
--- a/zanata-war/src/main/webapp/tm/home.xhtml
+++ b/zanata-war/src/main/webapp/tm/home.xhtml
@@ -104,7 +104,7 @@
   <div class="g--centered">
     <div class="g__item w--1-m w--1-2-l w--1-2 l--push-bottom-half">
       <p class="txt--meta l--push-all-0">
-        <s:link view="/admin/home.xhtml" propagation="none"
+        <h:link outcome="/admin/home.xhtml"
           value="#{msgs['jsf.Administration']}"/>
       </p>
 
@@ -129,11 +129,11 @@
               <ul class="dropdown__content js-dropdown__content"
                 role="content" aria-labelledby="dropdownContent">
                 <li>
-                  <s:link id="createTmLink" styleClass="i__item--right"
+                  <h:link id="createTmLink" styleClass="i__item--right"
                     value="#{msgs['jsf.transmemory.CreateNew']}"
-                    view="/tm/create.xhtml" propagation="none">
+                    outcome="/tm/create.xhtml">
                     <i class="i i--plus i__item__icon"></i>
-                  </s:link>
+                  </h:link>
                 </li>
               </ul>
             </div>
@@ -146,24 +146,24 @@
         </a4j:status>
 
         <h:form styleClass="l--push-bottom-0" id="tmList">
-          <s:div styleClass="l--pad-all-half"
+          <h:panelGroup layout="block"  styleClass="l--pad-all-half"
             rendered="#{empty translationMemoryAction.allTranslationMemories}">
             <p class="txt--meta">#{msgs['jsf.transmemory.NoTransMemories']}</p>
             <p>
-              <s:link styleClass="button--primary" propagation="none"
+              <h:link styleClass="button--primary"
                 value="#{msgs['jsf.transmemory.CreateNew']}"
-                view="/tm/create.xhtml">
+                outcome="/tm/create.xhtml">
                 <i class="i i--plus i__item__icon"></i>
-              </s:link>
+              </h:link>
             </p>
-          </s:div>
+          </h:panelGroup>
 
-          <s:div rendered="#{not empty translationMemoryAction.allTranslationMemories}">
-            <s:div id="processResult">
-              <s:span styleClass="message--warning" rendered="#{not empty translationMemoryAction.processError}">
+          <h:panelGroup layout="block"  rendered="#{not empty translationMemoryAction.allTranslationMemories}">
+            <h:panelGroup layout="block"  id="processResult">
+              <h:panelGroup layout="span" styleClass="message--warning" rendered="#{not empty translationMemoryAction.processError}">
                 #{translationMemoryAction.processError}
-              </s:span>
-            </s:div>
+              </h:panelGroup>
+            </h:panelGroup>
 
             <ul class="list--stats">
               <ui:repeat value="#{translationMemoryAction.allTranslationMemories}"
@@ -171,7 +171,7 @@
                 <li class="list__item--actionable">
 
                   <div class="list__item__action">
-                    <s:div
+                    <h:panelGroup layout="block"
                       styleClass="dropdown dropdown--small dropdown--inline dropdown--single list__item__dropdown js-dropdown" id="options">
                       <a href="#" title="Options"
                         class="dropdown__toggle js-dropdown__toggle txt--meta">
@@ -197,13 +197,13 @@
                         </li>
 
                         <li>
-                          <s:fragment rendered="#{translationMemoryAction.isTranslationMemoryEmpty(tm.slug) or translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}">
+                          <ui:fragment rendered="#{translationMemoryAction.isTranslationMemoryEmpty(tm.slug) or translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}">
                             <a href="#" title="#{msgs['jsf.transmemory.Clear.Title']}"
                               class="i__item--right txt--danger" disabled="true">
                               #{msgs['jsf.Clear']}
                               <i class="i i--remove i__item__icon"></i>
                             </a>
-                          </s:fragment>
+                          </ui:fragment>
 
                           <a4j:commandLink value="#{msgs['jsf.Clear']}"
                             rendered="#{not translationMemoryAction.isTransMemoryBeingCleared(tm.slug) and not translationMemoryAction.isTranslationMemoryEmpty(tm.slug)}"
@@ -216,13 +216,13 @@
                         </li>
 
                         <li>
-                          <s:fragment rendered="#{translationMemoryAction.deleteTransMemoryDisabled(tm.slug)}">
+                          <ui:fragment rendered="#{translationMemoryAction.deleteTransMemoryDisabled(tm.slug)}">
                             <a href="#" title="#{msgs['jsf.transmemory.Delete.Title']}"
                               class="i__item--right txt--danger" disabled="true">
                               #{msgs['jsf.Delete']}
                               <i class="i i--remove i__item__icon"></i>
                             </a>
-                          </s:fragment>
+                          </ui:fragment>
 
                           <h:commandLink value="#{msgs['jsf.Delete']}" rendered="#{not translationMemoryAction.deleteTransMemoryDisabled(tm.slug)}"
                             action="#{translationMemoryAction.deleteTransMemory(tm.slug)}"
@@ -232,46 +232,46 @@
                           </h:commandLink>
                         </li>
                       </ul>
-                    </s:div>
+                    </h:panelGroup>
                   </div>
                   <div>
                     <div class="list__item__content">
                       <div class="list__item__info">
                         <h3 class="list__title">
                           #{tm.slug}
-                          <s:span styleClass="badge l--push-left-quarter" id="tm-size"
+                          <h:panelGroup class="badge l--push-left-quarter" id="tm-size"
                             title="#{msgs['jsf.transmemory.NoOfEntries']}">
                             #{translationMemoryAction.getTranslationMemorySize(tm.slug)}
-                          </s:span>
+                          </h:panelGroup>
                         </h3>
                         <span class="list__item__meta">#{tm.description}</span>
                       </div>
-                      <s:div styleClass="list__item__stats txt--mini" id="tm-status">
+                      <h:panelGroup layout="block"  styleClass="list__item__stats txt--mini" id="tm-status">
                         <a4j:poll interval="3000" limitRender="true"
                           render="processResultPoll, tm-size, tm-status, options"
                           enabled="#{translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}"/>
 
-                        <s:fragment rendered="#{translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}">
+                        <ui:fragment rendered="#{translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}">
                           <span>#{msgs['jsf.transmemory.Clearing.Message']}</span>
                           <zanata:loader type="loader--small" layout="inline"/>
-                        </s:fragment>
-                        <s:fragment rendered="#{not translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}">
-                          <s:span styleClass="txt--understated">
+                        </ui:fragment>
+                        <ui:fragment rendered="#{not translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}">
+                          <span class="txt--understated">
                             #{msgs['jsf.transmemory.createdOn']}
                               <span class="stats__unit">
                                  <h:outputText value="#{tm.creationDate}">
                                    <f:convertDateTime type="date" dateStyle="default"/>
                                  </h:outputText>
                               </span>
-                          </s:span>
-                        </s:fragment>
-                      </s:div>
+                          </span>
+                        </ui:fragment>
+                      </h:panelGroup>
                     </div>
                   </div>
                 </li>
               </ui:repeat>
             </ul>
-          </s:div>
+          </h:panelGroup>
         </h:form>
       </div>
     </div>
diff --git a/zanata-war/src/main/webapp/version-group/create_version_group.xhtml b/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
index b7f4e1bffb..470d9ca297 100644
--- a/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/create_version_group.xhtml
@@ -12,9 +12,9 @@
     <div class="g--centered">
       <div class="g__item w--1-2-m w--3-8-l w--1-3 l--push-bottom-1">
         <p class="txt--meta l--push-all-0">
-          <s:link view="/version-group/home.xhtml" propagation="none">
+          <h:link outcome="/version-group/home.xhtml">
             #{msgs['jsf.Groups']}
-          </s:link>
+          </h:link>
         </p>
 
         <h1 class="l--push-all-0">#{msgs['jsf.NewGroup.Label']}</h1>
diff --git a/zanata-war/src/main/webapp/version-group/home.xhtml b/zanata-war/src/main/webapp/version-group/home.xhtml
index ebd63002cc..e79b3589db 100644
--- a/zanata-war/src/main/webapp/version-group/home.xhtml
+++ b/zanata-war/src/main/webapp/version-group/home.xhtml
@@ -16,8 +16,8 @@
     <rich:panel
         rendered="#{identity.loggedIn and identity.hasPermission(versionGroupHome.instance, 'insert')}">
       <f:facet name="header">#{msgs['jsf.Actions']}</f:facet>
-      <s:link styleClass="action_link" id="group-create"
-        view="/version-group/create_version_group.xhtml"
+      <h:link styleClass="action_link" id="group-create"
+        outcome="/version-group/create_version_group.xhtml"
         rendered="#{identity.hasPermission(versionGroupHome.instance, 'insert')}"
         value="#{msgs['jsf.NewGroup.Label']}"/>
     </rich:panel>
@@ -28,9 +28,9 @@
     <f:facet name="header">#{msgs['jsf.Groups']}</f:facet>
 
     <h:form id="groupForm">
-      <s:div styleClass="float-right">
+      <h:panelGroup layout="block"  styleClass="float-right">
         <a4j:region>
-          <s:fragment
+          <ui:fragment
             rendered="#{identity.hasPermission('HIterationGroup','view-obsolete')}">
             <h:selectBooleanCheckbox id="showObsolete"
               title="#{msgs['jsf.groups.ShowObsoleteGroups']}"
@@ -38,9 +38,9 @@
               <a4j:ajax event="change" render="groupTable"/>
             </h:selectBooleanCheckbox>
             <h:outputText value="#{msgs['jsf.Obsolete']}"/>
-          </s:fragment>
+          </ui:fragment>
         </a4j:region>
-      </s:div>
+      </h:panelGroup>
       <br/>
       <rich:dataTable id="groupTable"
         value="#{versionGroupAction.allVersionGroups}" var="group">
@@ -59,19 +59,18 @@
               </h:inputText>
             </h:panelGroup>
           </f:facet>
-          <s:link id="versionGroup" styleClass="table_link"
-            value="#{group.name}" propagation="none"
-            view="/version-group/version_group.xhtml"
+          <h:link id="versionGroup" styleClass="table_link"
+            value="#{group.name}"
+            outcome="/version-group/version_group.xhtml"
             rendered="#{group.status == 'ACTIVE'}">
             <f:param name="versionGroupSlug" value="#{group.slug}"/>
-          </s:link>
-          <s:link id="versionGroup_obsolete"
+          </h:link>
+          <h:link id="versionGroup_obsolete"
             styleClass="table_link obsolete_link" value="#{group.name}"
-            propagation="none"
-            view="/version-group/version_group.xhtml"
+            outcome="/version-group/version_group.xhtml"
             rendered="#{group.status == 'OBSOLETE'}">
             <f:param name="versionGroupSlug" value="#{group.slug}"/>
-          </s:link>
+          </h:link>
 
         </rich:column>
         <rich:column>
diff --git a/zanata-war/src/main/webapp/version-group/version_group.xhtml b/zanata-war/src/main/webapp/version-group/version_group.xhtml
index 4ab2c65d85..428dd52426 100644
--- a/zanata-war/src/main/webapp/version-group/version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -99,12 +99,12 @@
 <div class="g">
   <div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">
     <p class="txt--meta l--push-all-0">
-      <s:link view="/version-group/home.xhtml" propagation="none">
+      <h:link outcome="/version-group/home.xhtml">
         #{msgs['jsf.Groups']}
-      </s:link>
+      </h:link>
     </p>
 
-    <s:div styleClass="media l--push-bottom-half" id="group-info">
+    <h:panelGroup layout="block"  styleClass="media l--push-bottom-half" id="group-info">
       <div class="media__body">
         <h1 class="l--push-all-0">
           #{versionGroupHome.instance.name}
@@ -114,9 +114,9 @@
           #{versionGroupHome.instance.description}
         </p>
       </div>
-    </s:div>
-    <s:div id="overall_statistic" styleClass="progress-bar__expander">
-      <s:fragment rendered="#{versionGroupHomeAction.pageRendered}">
+    </h:panelGroup>
+    <h:panelGroup layout="block"  id="overall_statistic" styleClass="progress-bar__expander">
+      <ui:fragment rendered="#{versionGroupHomeAction.pageRendered}">
         <p class="d--top l--pad-top-half txt--mini">
           #{msgs['jsf.TotalSourceContains']}
           <strong>#{versionGroupHomeAction.overallStatistic.total}
@@ -149,14 +149,14 @@
             value="#{versionGroupHomeAction.overallStatistic}"
             type="large"/>
         </div>
-      </s:fragment>
+      </ui:fragment>
 
       <a4j:status name="statistic-loader">
         <f:facet name="start">
           <zanata:loader type="loader--large"/>
         </f:facet>
       </a4j:status>
-    </s:div>
+    </h:panelGroup>
   </div>
 
 
@@ -171,9 +171,9 @@
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Languages']}
               </span>
-            <s:span styleClass="txt--neutral" id="languages-size">
+            <h:panelGroup class="txt--neutral" id="languages-size">
               #{versionGroupHomeAction.activeLocales.size}
-            </s:span>
+            </h:panelGroup>
           </a>
         </li>
         <li>
@@ -197,13 +197,13 @@
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Maintainers']}
               </span>
-            <s:span styleClass="txt--neutral" id="maintainers-size">
+            <h:panelGroup class="txt--neutral" id="maintainers-size">
               #{versionGroupHome.instance.maintainers.size}
-            </s:span>
+            </h:panelGroup>
           </a>
         </li>
 
-        <s:fragment
+        <ui:fragment
           rendered="#{versionGroupHomeAction.isUserProjectMaintainer()}">
           <li class="tab__end">
             <div
@@ -225,9 +225,9 @@
               </ul>
             </div>
           </li>
-        </s:fragment>
+        </ui:fragment>
 
-        <s:fragment
+        <ui:fragment
           rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
           <li class="tab__end">
             <a id="settings_tab"
@@ -239,7 +239,7 @@
               <i class="i i--settings"></i>
             </a>
           </li>
-        </s:fragment>
+        </ui:fragment>
       </ul>
 
       <ul class="tabs__content panels__container js-tabs-content l--push-top-1">
@@ -262,21 +262,21 @@
             PermissionToUpdate="#{identity.hasPermission(versionGroupHome.instance, 'update')}"/>
         </li>
 
-        <s:fragment
+        <ui:fragment
           rendered="#{identity.hasPermission(versionGroupHome.instance, 'update')}">
           <li id="settings">
             <ui:include
               src="/WEB-INF/layout/version-group/settings-tab.xhtml"/>
           </li>
-        </s:fragment>
+        </ui:fragment>
       </ul>
     </div>
   </div>
 </div>
-  <s:fragment
+  <ui:fragment
     rendered="#{versionGroupHomeAction.isUserProjectMaintainer()}">
     <ui:include src="/WEB-INF/layout/version-group/request_join_modal.xhtml"/>
-  </s:fragment>
+  </ui:fragment>
 
 </ui:define>
 </ui:composition>