From d8b88e60f8efdcd9648ea16268ee3dd627fd5225 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Thu, 6 Aug 2015 15:57:26 +1000
Subject: [PATCH 01/15] replace all s:link with h:link

---
 .../WEB-INF/layout/dashboard/projects.xhtml   | 12 ++--
 .../WEB-INF/layout/dashboard/settings.xhtml   |  8 +--
 .../WEB-INF/layout/project/versions-tab.xhtml | 22 ++++----
 .../layout/version-group/settings-tab.xhtml   |  4 +-
 .../WEB-INF/layout/version/groups-tab.xhtml   | 14 ++---
 .../main/webapp/WEB-INF/template/banner.xhtml | 56 +++++++++----------
 .../webapp/WEB-INF/template/breadcrumbs.xhtml |  8 +--
 .../google_password_reset_request.xhtml       |  4 +-
 .../webapp/account/inactive_account.xhtml     |  4 +-
 .../src/main/webapp/account/login.xhtml       | 20 +++----
 .../main/webapp/account/password_reset.xhtml  |  4 +-
 .../account/password_reset_request.xhtml      |  4 +-
 .../src/main/webapp/account/register.xhtml    |  8 +--
 zanata-war/src/main/webapp/admin/home.xhtml   | 54 +++++++++---------
 .../main/webapp/admin/processmanager.xhtml    |  2 +-
 .../src/main/webapp/admin/roledetail.xhtml    |  8 +--
 .../src/main/webapp/admin/rolemanager.xhtml   | 10 +++-
 .../main/webapp/admin/roleruledetails.xhtml   |  4 +-
 .../src/main/webapp/admin/rolerules.xhtml     | 15 +++--
 zanata-war/src/main/webapp/admin/search.xhtml |  2 +-
 .../webapp/admin/server_configuration.xhtml   |  2 +-
 zanata-war/src/main/webapp/admin/stats.xhtml  |  4 +-
 .../src/main/webapp/admin/userdetail.xhtml    |  8 +--
 .../src/main/webapp/admin/usermanager.xhtml   |  2 +-
 .../src/main/webapp/glossary/view.xhtml       |  4 +-
 zanata-war/src/main/webapp/home.xhtml         |  7 +--
 .../src/main/webapp/iteration/view.xhtml      | 16 +++---
 .../src/main/webapp/language/home.xhtml       |  4 +-
 .../src/main/webapp/language/language.xhtml   |  2 +-
 .../src/main/webapp/profile/create_user.xhtml |  5 +-
 .../main/webapp/project/add_iteration.xhtml   | 10 ++--
 .../main/webapp/project/create_project.xhtml  |  4 +-
 zanata-war/src/main/webapp/project/home.xhtml | 22 ++++----
 .../src/main/webapp/project/project.xhtml     |  2 +-
 zanata-war/src/main/webapp/tm/create.xhtml    |  8 +--
 zanata-war/src/main/webapp/tm/home.xhtml      | 14 ++---
 .../version-group/create_version_group.xhtml  |  4 +-
 .../src/main/webapp/version-group/home.xhtml  | 19 +++----
 .../webapp/version-group/version_group.xhtml  |  4 +-
 39 files changed, 202 insertions(+), 202 deletions(-)

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..2edbd6a010 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
@@ -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..3e4be1f769 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
@@ -182,9 +182,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'] }
@@ -254,9 +254,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">
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..f03366ce00 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
@@ -56,12 +56,12 @@
         <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>
@@ -92,12 +92,12 @@
     <s: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>
@@ -142,15 +142,15 @@
                   <s: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:repeat
@@ -188,7 +188,7 @@
               </div>
             </s:div>
 
-            <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}"/>
@@ -250,7 +250,7 @@
               <zanata:statistic
                 value="#{projectHomeAction.getStatisticForVersion(version.slug)}"
                 rendered="#{projectHomeAction.pageRendered}"/>
-            </s:link>
+            </h:link>
           </s:div>
         </li>
       </ui:repeat>
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..dbeba1d7e7 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
@@ -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'}">
                 <span class="txt--danger l--push-left-half">#{msgs['jsf.group.ArchivedVersionNotIncluded']}</span>
               </s:fragment>
-            </s:link>
+            </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/groups-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
index 81d58aa7dc..dc140c3a11 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
@@ -32,12 +32,12 @@
         <s: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>
@@ -51,10 +51,10 @@
         <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/template/banner.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
index 82d805535d..30e2d5ab4b 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
@@ -13,10 +13,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,53 +40,53 @@
           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}">
           <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>
 
@@ -115,11 +115,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">
@@ -129,11 +129,11 @@
         </li>
         <s: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>
         <li>
@@ -149,9 +149,9 @@
 
   <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"
+      <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
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..fd55926a89 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
@@ -8,21 +8,21 @@
   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>
+      </h:link>
       <s:span styleClass="breadcrumbs_display"
         rendered="#{empty breadcrumb.location}">#{breadcrumb.display}</s:span>
     </c:forEach>
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..53859196da 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
@@ -8,9 +8,9 @@
   <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">
diff --git a/zanata-war/src/main/webapp/account/inactive_account.xhtml b/zanata-war/src/main/webapp/account/inactive_account.xhtml
index dfb6fff0d9..7b0f5da84c 100644
--- a/zanata-war/src/main/webapp/account/inactive_account.xhtml
+++ b/zanata-war/src/main/webapp/account/inactive_account.xhtml
@@ -14,9 +14,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">
diff --git a/zanata-war/src/main/webapp/account/login.xhtml b/zanata-war/src/main/webapp/account/login.xhtml
index 8191ed6a92..8ca8978472 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">
@@ -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}"
@@ -81,8 +81,8 @@
                     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>
@@ -112,9 +112,9 @@
                       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')}"
diff --git a/zanata-war/src/main/webapp/account/password_reset.xhtml b/zanata-war/src/main/webapp/account/password_reset.xhtml
index 089b25f431..e046bf0797 100644
--- a/zanata-war/src/main/webapp/account/password_reset.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset.xhtml
@@ -10,9 +10,9 @@
   <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">
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..af737f28d2 100644
--- a/zanata-war/src/main/webapp/account/password_reset_request.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset_request.xhtml
@@ -8,10 +8,10 @@
   <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">
diff --git a/zanata-war/src/main/webapp/account/register.xhtml b/zanata-war/src/main/webapp/account/register.xhtml
index 40f35a6b0c..c5aa5176e9 100644
--- a/zanata-war/src/main/webapp/account/register.xhtml
+++ b/zanata-war/src/main/webapp/account/register.xhtml
@@ -11,9 +11,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">
@@ -98,8 +98,8 @@
 
                   <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>
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..be0cff2c06 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>
 
diff --git a/zanata-war/src/main/webapp/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
index b59183bc15..b1c7c0c4c0 100644
--- a/zanata-war/src/main/webapp/admin/roledetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/roledetail.xhtml
@@ -22,13 +22,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>
diff --git a/zanata-war/src/main/webapp/admin/rolemanager.xhtml b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
index 71b55e8dbb..b65ca62099 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>
diff --git a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
index f13ce3d006..658be205f1 100644
--- a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
+++ b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
@@ -13,10 +13,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>
 
diff --git a/zanata-war/src/main/webapp/admin/rolerules.xhtml b/zanata-war/src/main/webapp/admin/rolerules.xhtml
index 7073283965..3a299aa290 100644
--- a/zanata-war/src/main/webapp/admin/rolerules.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolerules.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>
@@ -57,11 +57,10 @@
             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>
 
diff --git a/zanata-war/src/main/webapp/admin/search.xhtml b/zanata-war/src/main/webapp/admin/search.xhtml
index 435abdeb25..1fe3635fee 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>
 
diff --git a/zanata-war/src/main/webapp/admin/server_configuration.xhtml b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
index 8646892920..71dc86f4f5 100644
--- a/zanata-war/src/main/webapp/admin/server_configuration.xhtml
+++ b/zanata-war/src/main/webapp/admin/server_configuration.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>
 
diff --git a/zanata-war/src/main/webapp/admin/stats.xhtml b/zanata-war/src/main/webapp/admin/stats.xhtml
index 7cbcb2392d..e052a2f8ad 100644
--- a/zanata-war/src/main/webapp/admin/stats.xhtml
+++ b/zanata-war/src/main/webapp/admin/stats.xhtml
@@ -39,9 +39,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="/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>
diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
index 343a36c4f7..19a60f5ddd 100644
--- a/zanata-war/src/main/webapp/admin/userdetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -21,13 +21,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>
diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
index 695c046ea0..040b756a31 100644
--- a/zanata-war/src/main/webapp/admin/usermanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -24,7 +24,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>
 
diff --git a/zanata-war/src/main/webapp/glossary/view.xhtml b/zanata-war/src/main/webapp/glossary/view.xhtml
index 425db1b8c7..3d35fdbda7 100644
--- a/zanata-war/src/main/webapp/glossary/view.xhtml
+++ b/zanata-war/src/main/webapp/glossary/view.xhtml
@@ -137,7 +137,7 @@
                   </div>
                 </s:div>
 
-                <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,7 +159,7 @@
                       </span>
                     </div>
                   </div>
-                </s:link>
+                </h:link>
               </li>
             </ui:repeat>
           </ul>
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 4faa590d6c..448433922e 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -185,14 +185,14 @@
 <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">
@@ -359,15 +359,15 @@
                   <s: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>
diff --git a/zanata-war/src/main/webapp/language/home.xhtml b/zanata-war/src/main/webapp/language/home.xhtml
index 486d8d0e9c..8fc19833d1 100644
--- a/zanata-war/src/main/webapp/language/home.xhtml
+++ b/zanata-war/src/main/webapp/language/home.xhtml
@@ -68,7 +68,7 @@
             <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">
@@ -99,7 +99,7 @@
                         </span>
                       </div>
                     </div>
-                  </s:link>
+                  </h:link>
                 </li>
               </ui:repeat>
             </ul>
diff --git a/zanata-war/src/main/webapp/language/language.xhtml b/zanata-war/src/main/webapp/language/language.xhtml
index ee5882081a..9e3c33e948 100644
--- a/zanata-war/src/main/webapp/language/language.xhtml
+++ b/zanata-war/src/main/webapp/language/language.xhtml
@@ -34,7 +34,7 @@
     <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>
 
diff --git a/zanata-war/src/main/webapp/profile/create_user.xhtml b/zanata-war/src/main/webapp/profile/create_user.xhtml
index b7c3d5bad5..43be69e2af 100644
--- a/zanata-war/src/main/webapp/profile/create_user.xhtml
+++ b/zanata-war/src/main/webapp/profile/create_user.xhtml
@@ -14,11 +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">
 
-        <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
           rendered="#{not applicationConfiguration.internalAuth and not empty applicationConfiguration.registerPath}">
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..2b908bca70 100644
--- a/zanata-war/src/main/webapp/project/home.xhtml
+++ b/zanata-war/src/main/webapp/project/home.xhtml
@@ -16,11 +16,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']}')"
@@ -103,18 +103,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>
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index 46d8d85d9f..fd1aad84f2 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.xhtml
@@ -60,7 +60,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="/project/home.xhtml" propagation="none"
+      <h:link outcome="/project/home.xhtml"
         value="#{msgs['jsf.Projects']}"/>
     </p>
 
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 1c123198d4..5a5aafeaba 100644
--- a/zanata-war/src/main/webapp/tm/home.xhtml
+++ b/zanata-war/src/main/webapp/tm/home.xhtml
@@ -103,7 +103,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>
 
@@ -128,11 +128,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>
@@ -149,11 +149,11 @@
             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>
 
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..35e1b0a2fb 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>
@@ -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..4b57034595 100644
--- a/zanata-war/src/main/webapp/version-group/version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -99,9 +99,9 @@
 <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">

From 8afcd2d307dfab7bb6697bc2689e42fa3a8da49d Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Fri, 7 Aug 2015 13:17:09 +1000
Subject: [PATCH 02/15] replace s:selectItem with c:selectItem

---
 .../layout/glossary/upload_glossary_modal.xhtml     | 13 +++++++------
 zanata-war/src/main/webapp/admin/roledetail.xhtml   |  5 +++--
 .../src/main/webapp/admin/roleruledetails.xhtml     | 12 +++++++-----
 zanata-war/src/main/webapp/admin/userdetail.xhtml   |  5 +++--
 zanata-war/src/main/webapp/iteration/view.xhtml     |  8 ++++----
 5 files changed, 24 insertions(+), 19 deletions(-)

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..6c33e5f8ea 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,5 +1,6 @@
 <div xmlns="http://www.w3.org/1999/xhtml"
   xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:c="http://java.sun.com/jsf/core"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
@@ -128,10 +129,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 +144,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/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
index b1c7c0c4c0..f9bc8b471a 100644
--- a/zanata-war/src/main/webapp/admin/roledetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/roledetail.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:c="http://java.sun.com/jsf/core"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:s="http://jboss.org/schema/seam/taglib">
 
@@ -52,8 +53,8 @@
             <s:decorate id="groupsField" template="../WEB-INF/layout/field.xhtml" enclose="true">
               <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>
           </div>
diff --git a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
index 658be205f1..4db5190d48 100644
--- a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
+++ b/zanata-war/src/main/webapp/admin/roleruledetails.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:c="http://java.sun.com/jsf/core"
   template="../WEB-INF/template/template.xhtml"
   xmlns:h="http://java.sun.com/jsf/html">
 
@@ -32,9 +33,10 @@
               enclose="true">
               <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>
           </div>
@@ -63,8 +65,8 @@
               enclose="true">
               <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>
           </div>
diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
index 19a60f5ddd..e138de5251 100644
--- a/zanata-war/src/main/webapp/admin/userdetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/userdetail.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:c="http://java.sun.com/jsf/core"
   xmlns:s="http://jboss.org/schema/seam/taglib">
 
 <ui:composition template="../WEB-INF/template/template.xhtml">
@@ -84,8 +85,8 @@
             <s:decorate id="rolesField" template="../WEB-INF/layout/field.xhtml" enclose="true">
               <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>
           </div>
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index 448433922e..2ae0824d7a 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -466,13 +466,13 @@
     <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>
 

From dab39105f80c53f574a190834464467ac08b2589 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Fri, 7 Aug 2015 22:53:46 +1000
Subject: [PATCH 03/15] replace s:button with h:button

---
 zanata-war/src/main/java/org/zanata/action/RoleAction.java | 7 +++++++
 zanata-war/src/main/java/org/zanata/action/UserAction.java | 6 ++++++
 zanata-war/src/main/webapp/admin/roledetail.xhtml          | 5 +++--
 zanata-war/src/main/webapp/admin/rolemanager.xhtml         | 1 +
 zanata-war/src/main/webapp/admin/roleruledetails.xhtml     | 5 ++---
 .../src/main/webapp/admin/server_configuration.xhtml       | 4 ++--
 zanata-war/src/main/webapp/admin/userdetail.xhtml          | 4 ++--
 zanata-war/src/main/webapp/admin/usermanager.xhtml         | 1 +
 zanata-war/src/main/webapp/edit_home_content.xhtml         | 7 ++++---
 zanata-war/src/main/webapp/profile/create_user.xhtml       | 6 +++---
 10 files changed, 31 insertions(+), 15 deletions(-)

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/UserAction.java b/zanata-war/src/main/java/org/zanata/action/UserAction.java
index d6e19de50e..44547890a3 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;
@@ -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/webapp/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
index f9bc8b471a..2d76099bcb 100644
--- a/zanata-war/src/main/webapp/admin/roledetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/roledetail.xhtml
@@ -61,8 +61,9 @@
 
           <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 b65ca62099..5ebe9ad6b6 100644
--- a/zanata-war/src/main/webapp/admin/rolemanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -78,6 +78,7 @@
                       </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'}">
diff --git a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
index 4db5190d48..16f9f0cb83 100644
--- a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
+++ b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
@@ -81,10 +81,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/server_configuration.xhtml b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
index 71dc86f4f5..37a9f237ed 100644
--- a/zanata-war/src/main/webapp/admin/server_configuration.xhtml
+++ b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
@@ -238,8 +238,8 @@
 
         <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/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
index e138de5251..f1b93d407c 100644
--- a/zanata-war/src/main/webapp/admin/userdetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -100,8 +100,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 040b756a31..d26023870c 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>
diff --git a/zanata-war/src/main/webapp/edit_home_content.xhtml b/zanata-war/src/main/webapp/edit_home_content.xhtml
index 2b0cee141b..07df23e7d0 100644
--- a/zanata-war/src/main/webapp/edit_home_content.xhtml
+++ b/zanata-war/src/main/webapp/edit_home_content.xhtml
@@ -11,6 +11,8 @@
 
   <ui:define name="page_title">#{msgs['jsf.EditHomePage']}</ui:define>
   <ui:define name="center_content">
+    <!-- TODO pahuang do we need this? -->
+    <a4j:jsFunction name="cancelEditHomeContent" action="#{serverConfigurationBean.cancel()}" />
     <h1>#{msgs['jsf.HomepageContent']}</h1>
 
     <h:form id="homeContentForm">
@@ -29,10 +31,9 @@
           <h:commandButton id="update"
             value="#{msgs['jsf.Update']}"
             action="#{serverConfigurationBean.updateHomeContent}"/>
-          <s:button id="cancel" view="/home.xhtml"
+          <h:button id="cancel" outcome="/home.xhtml"
             value="#{msgs['jsf.Cancel']}"
-            propagation="none"
-            action="#{serverConfigurationBean.cancel}"/>
+            onclick="cancelEditHomeContent()"/>
         </div>
 
         <hr/>
diff --git a/zanata-war/src/main/webapp/profile/create_user.xhtml b/zanata-war/src/main/webapp/profile/create_user.xhtml
index 43be69e2af..086b762a73 100644
--- a/zanata-war/src/main/webapp/profile/create_user.xhtml
+++ b/zanata-war/src/main/webapp/profile/create_user.xhtml
@@ -11,6 +11,7 @@
     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">
 
@@ -87,9 +88,8 @@
               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>

From 288bcb22c6d9de3e24d88a0a32a7b699827808c2 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Mon, 10 Aug 2015 13:16:53 +1000
Subject: [PATCH 04/15] replace s:span with either span or h:panelGroup

---
 .../src/main/webapp/WEB-INF/layout/edit.xhtml |  4 +--
 .../WEB-INF/layout/language/members-tab.xhtml |  2 +-
 .../WEB-INF/layout/project/settings-tab.xhtml |  2 +-
 .../WEB-INF/layout/project/versions-tab.xhtml |  8 +++---
 .../layout/version-group/edit_form.xhtml      |  4 +--
 .../layout/version-group/languages-tab.xhtml  | 15 +++++-----
 .../layout/version-group/projects-tab.xhtml   |  8 +++---
 .../layout/version-group/settings-tab.xhtml   |  4 +--
 .../layout/version/documents-tab.xhtml        | 28 +++++++++++--------
 .../layout/version/languages-tab.xhtml        | 25 +++++++++--------
 .../webapp/WEB-INF/template/breadcrumbs.xhtml |  4 +--
 .../main/webapp/admin/processmanager.xhtml    |  4 +--
 .../src/main/webapp/admin/rolemanager.xhtml   |  4 +--
 zanata-war/src/main/webapp/admin/search.xhtml | 12 ++++----
 .../src/main/webapp/admin/usermanager.xhtml   |  4 +--
 .../src/main/webapp/iteration/view.xhtml      | 13 ++++-----
 .../src/main/webapp/language/home.xhtml       | 14 ++++++----
 .../src/main/webapp/language/language.xhtml   | 23 +++++++++------
 .../src/main/webapp/profile/create_user.xhtml |  6 ++--
 .../src/main/webapp/project/project.xhtml     |  8 +++---
 .../webapp/resources/zanata/list-filter.xhtml |  5 ++--
 zanata-war/src/main/webapp/search.xhtml       |  9 +++---
 zanata-war/src/main/webapp/tm/home.xhtml      | 12 ++++----
 .../webapp/version-group/version_group.xhtml  |  8 +++---
 24 files changed, 121 insertions(+), 105 deletions(-)

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
index f80951c7b4..0372a3cd82 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
@@ -8,7 +8,7 @@
 
     <s:label styleClass="name #{invalid?'errors':''}">
       <ui:insert name="label"/>
-      <s:span styleClass="required" rendered="#{required}">*</s:span>
+      <h:panelGroup layout="span" styleClass="required" rendered="#{required}">*</h:panelGroup>
     </s:label>
 
         <span class="value #{invalid?'errors':''}">
@@ -18,7 +18,7 @@
         </span>
 
         <span class="value #{invalid?'errors':''} errorsMessage">
-        <s:span styleClass="icon-cancel-circle-2 errors" rendered="#{invalid}"/>
+        <h:panelGroup layout="span" styleClass="icon-cancel-circle-2 errors" rendered="#{invalid}"/>
           <s:message styleClass="errors"/>
         </span>
   </div>
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..82c103f32d 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
@@ -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">
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..f418e23d73 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
@@ -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/versions-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
index f03366ce00..91ab9921ae 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
@@ -121,12 +121,12 @@
             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"
@@ -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,7 +208,7 @@
                       <f:param
                         value="#{projectHomeAction.getCopyVersionCompletePercent(version.project.slug, version.slug)}"/>
                     </h:outputFormat>
-                  </s:span>
+                  </h:panelGroup>
                   <s: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"
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..f3f8e93b93 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
@@ -7,7 +7,7 @@
 
   <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">
       <h:inputText id="name" required="true" maxlength="80"
@@ -18,7 +18,7 @@
   </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}"
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..82670f956f 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
@@ -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>
@@ -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>
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..051795fb51 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
@@ -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>
@@ -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>
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 dbeba1d7e7..55189fb3c0 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,7 +63,7 @@
             styleClass="l--push-right-half button--primary"/>
         </div>
         <hr/>
-        <s:span id="status">
+        <h:panelGroup id="status">
           <s:fragment
             rendered="#{versionGroupHome.instance.status == 'ACTIVE'}">
             <p>
@@ -91,7 +91,7 @@
                 class="i--left i--archive"></i> #{msgs['jsf.ActivateGroupMessage']}
             </p>
           </s:fragment>
-        </s:span>
+        </h:panelGroup>
       </div>
     </h:form>
   </li>
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..9bf1ef661c 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
@@ -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>
@@ -345,11 +345,13 @@
                           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>
+                        <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>
@@ -380,11 +382,13 @@
                         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>
+                      <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>
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..33bec61014 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
@@ -111,10 +111,12 @@
                       <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>
+                    <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>
@@ -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>
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 fd55926a89..d855cb4849 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
@@ -23,8 +23,8 @@
           <f:param name="#{param}" value="#{breadcrumb.params.get(param)}"/>
         </c:forEach>
       </h:link>
-      <s:span styleClass="breadcrumbs_display"
-        rendered="#{empty breadcrumb.location}">#{breadcrumb.display}</s:span>
+      <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/admin/processmanager.xhtml b/zanata-war/src/main/webapp/admin/processmanager.xhtml
index be0cff2c06..787e9746b5 100644
--- a/zanata-war/src/main/webapp/admin/processmanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/processmanager.xhtml
@@ -84,13 +84,13 @@
                           <zanata:loader type="loader--small" layout="inline"/>
                         </s: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>
diff --git a/zanata-war/src/main/webapp/admin/rolemanager.xhtml b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
index 5ebe9ad6b6..e737bdf841 100644
--- a/zanata-war/src/main/webapp/admin/rolemanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -85,8 +85,8 @@
                     <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/search.xhtml b/zanata-war/src/main/webapp/admin/search.xhtml
index 1fe3635fee..57051b73ac 100644
--- a/zanata-war/src/main/webapp/admin/search.xhtml
+++ b/zanata-war/src/main/webapp/admin/search.xhtml
@@ -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>
diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
index d26023870c..dd4dd0bdd9 100644
--- a/zanata-war/src/main/webapp/admin/usermanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -98,10 +98,10 @@
                             </s: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/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index 2ae0824d7a..2c9faccd0d 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -287,9 +287,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,10 +300,9 @@
           <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>
@@ -315,9 +314,9 @@
             <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>
diff --git a/zanata-war/src/main/webapp/language/home.xhtml b/zanata-war/src/main/webapp/language/home.xhtml
index 8fc19833d1..4bc0d2731d 100644
--- a/zanata-war/src/main/webapp/language/home.xhtml
+++ b/zanata-war/src/main/webapp/language/home.xhtml
@@ -75,15 +75,17 @@
                       <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)}">
                             <i class="i i--translate txt--neutral" title="#{msgs['jsf.language.member.joined']}"></i>
diff --git a/zanata-war/src/main/webapp/language/language.xhtml b/zanata-war/src/main/webapp/language/language.xhtml
index 9e3c33e948..9eacbc3d12 100644
--- a/zanata-war/src/main/webapp/language/language.xhtml
+++ b/zanata-war/src/main/webapp/language/language.xhtml
@@ -57,14 +57,19 @@
             </s:div>
           </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="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>
+              <!-- 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>
           </s:div>
 
         </s:div>
@@ -80,9 +85,9 @@
                 <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>
diff --git a/zanata-war/src/main/webapp/profile/create_user.xhtml b/zanata-war/src/main/webapp/profile/create_user.xhtml
index 086b762a73..d5fabb5cad 100644
--- a/zanata-war/src/main/webapp/profile/create_user.xhtml
+++ b/zanata-war/src/main/webapp/profile/create_user.xhtml
@@ -38,7 +38,7 @@
         <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">
               <h:inputText id="name" value="#{newProfileAction.name}" required="true"
@@ -53,7 +53,7 @@
           </ui:remove>
           <s:div 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">
               <h:inputText id="username" required="true" maxlength="80"
@@ -66,7 +66,7 @@
           <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">
               <h:inputText id="email" required="false"
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index fd1aad84f2..c8d5a0002d 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.xhtml
@@ -152,9 +152,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>
@@ -165,9 +165,9 @@
           <i class="i i--users"></i>
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.People']}
-                <s:span styleClass="txt--neutral" id="people-size">
+                <h:panelGroup styleClass="txt--neutral" id="people-size">
                   #{projectHomeAction.allMembers.size}
-                </s:span>
+                </h:panelGroup>
               </span>
         </a>
       </li>
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..8c20136055 100644
--- a/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/list-filter.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:h="http://java.sun.com/jsf/html"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j">
@@ -103,7 +104,7 @@
       </s:fragment>
     </s:div>
     <span class="txt--meta">
-      <s:span id="#{cc.attrs.id}-page-info">
+      <h:panelGroup id="#{cc.attrs.id}-page-info">
         <s:fragment
           rendered="#{not (cc.attrs.bottomPanel and cc.attrs.actionBean.totalRecords eq 0)}">
           <s:fragment
@@ -116,7 +117,7 @@
             <strong>#{cc.attrs.actionBean.totalRecords}</strong>
           </s:fragment>
         </s:fragment>
-      </s:span>
+      </h:panelGroup>
 
 
       <s:fragment rendered="#{!cc.attrs.bottomPanel}">
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/home.xhtml b/zanata-war/src/main/webapp/tm/home.xhtml
index 5a5aafeaba..d1997a8874 100644
--- a/zanata-war/src/main/webapp/tm/home.xhtml
+++ b/zanata-war/src/main/webapp/tm/home.xhtml
@@ -159,9 +159,9 @@
 
           <s:div rendered="#{not empty translationMemoryAction.allTranslationMemories}">
             <s:div id="processResult">
-              <s:span styleClass="message--warning" rendered="#{not empty translationMemoryAction.processError}">
+              <h:panelGroup layout="span" styleClass="message--warning" rendered="#{not empty translationMemoryAction.processError}">
                 #{translationMemoryAction.processError}
-              </s:span>
+              </h:panelGroup>
             </s:div>
 
             <ul class="list--stats">
@@ -240,10 +240,10 @@
                       <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>
@@ -257,14 +257,14 @@
                           <zanata:loader type="loader--small" layout="inline"/>
                         </s:fragment>
                         <s:fragment rendered="#{not translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}">
-                          <s:span styleClass="txt--understated">
+                          <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>
+                          </span>
                         </s:fragment>
                       </s:div>
                     </div>
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 4b57034595..3a27cce25a 100644
--- a/zanata-war/src/main/webapp/version-group/version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -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,9 +197,9 @@
               <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>
 

From 92ebe1d0717a70c5bb07a617254c0265684c6e1d Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Mon, 10 Aug 2015 14:38:43 +1000
Subject: [PATCH 05/15] replace s:fragment with ui:fragment

---
 .../WEB-INF/layout/copy_trans_inline.xhtml    | 24 +++---
 .../WEB-INF/layout/dashboard/activity.xhtml   | 12 +--
 .../WEB-INF/layout/dashboard/projects.xhtml   |  4 +-
 .../WEB-INF/layout/dashboard/settings.xhtml   | 20 ++---
 .../WEB-INF/layout/dashboard/stats.xhtml      | 17 ++--
 .../WEB-INF/layout/language/members-tab.xhtml | 52 ++++++------
 .../layout/language/request_join_modal.xhtml  | 13 +--
 .../layout/language/search_user_modal.xhtml   |  4 +-
 .../WEB-INF/layout/project/edit_form.xhtml    | 16 ++--
 .../layout/project/languages-list.xhtml       |  4 +-
 .../layout/project/settings-tab-general.xhtml |  8 +-
 .../project/settings-tab-languages.xhtml      | 12 +--
 .../project/validation-settings-block.xhtml   |  8 +-
 .../WEB-INF/layout/project/versions-tab.xhtml | 28 +++----
 .../WEB-INF/layout/search/projects-tab.xhtml  |  4 +-
 .../WEB-INF/layout/search/users-tab.xhtml     |  4 +-
 .../layout/version-group/edit_form.xhtml      |  5 +-
 .../layout/version-group/languages-tab.xhtml  | 32 ++++----
 .../layout/version-group/projects-tab.xhtml   | 36 ++++----
 .../version-group/request_join_modal.xhtml    |  8 +-
 .../layout/version-group/settings-tab.xhtml   | 12 +--
 .../layout/version/documents-tab.xhtml        | 82 +++++++++----------
 .../WEB-INF/layout/version/edit_form.xhtml    | 32 ++++----
 .../WEB-INF/layout/version/groups-tab.xhtml   |  4 +-
 .../layout/version/languages-tab.xhtml        | 80 +++++++++---------
 .../layout/version/merge_trans_modal.xhtml    | 21 ++---
 .../version/settings-tab-languages.xhtml      | 12 +--
 .../WEB-INF/layout/version/settings-tab.xhtml | 24 +++---
 .../version/zip_download_progress_modal.xhtml |  9 +-
 .../main/webapp/WEB-INF/template/banner.xhtml | 21 ++---
 .../main/webapp/WEB-INF/template/footer.xhtml |  4 +-
 .../webapp/WEB-INF/template/scripts.xhtml     |  4 +-
 .../webapp/WEB-INF/template/template.xhtml    |  4 +-
 .../src/main/webapp/account/login.xhtml       | 20 ++---
 .../account/password_reset_request.xhtml      |  4 +-
 .../src/main/webapp/account/register.xhtml    | 12 +--
 .../main/webapp/admin/processmanager.xhtml    | 16 ++--
 .../src/main/webapp/admin/rolemanager.xhtml   |  4 +-
 zanata-war/src/main/webapp/admin/search.xhtml | 28 +++----
 zanata-war/src/main/webapp/admin/stats.xhtml  | 48 +++++------
 .../src/main/webapp/admin/usermanager.xhtml   |  8 +-
 .../src/main/webapp/dashboard/home.xhtml      |  4 +-
 zanata-war/src/main/webapp/error.xhtml        |  8 +-
 .../src/main/webapp/glossary/view.xhtml       | 20 ++---
 .../src/main/webapp/iteration/view.xhtml      | 48 +++++------
 .../src/main/webapp/language/home.xhtml       |  8 +-
 .../src/main/webapp/language/language.xhtml   | 36 ++++----
 .../src/main/webapp/profile/create_user.xhtml |  8 +-
 zanata-war/src/main/webapp/profile/home.xhtml |  4 +-
 zanata-war/src/main/webapp/project/home.xhtml |  8 +-
 .../src/main/webapp/project/project.xhtml     | 32 ++++----
 .../resources/zanata/activity-entry.xhtml     | 36 ++++----
 .../resources/zanata/autocomplete.xhtml       | 16 ++--
 .../webapp/resources/zanata/checkbox.xhtml    |  9 +-
 .../resources/zanata/global-messages.xhtml    | 12 +--
 .../webapp/resources/zanata/list-filter.xhtml | 25 +++---
 .../resources/zanata/maintainers-tab.xhtml    |  8 +-
 .../webapp/resources/zanata/progressBar.xhtml | 13 +--
 .../resources/zanata/project-label.xhtml      | 21 ++---
 .../webapp/resources/zanata/statistic.xhtml   | 16 ++--
 .../resources/zanata/version-label.xhtml      | 21 ++---
 zanata-war/src/main/webapp/tm/home.xhtml      | 16 ++--
 .../src/main/webapp/version-group/home.xhtml  |  4 +-
 .../webapp/version-group/version_group.xhtml  | 20 ++---
 64 files changed, 582 insertions(+), 571 deletions(-)

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/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 2edbd6a010..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">
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 3e4be1f769..914f42cee7 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
@@ -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,7 +83,7 @@
               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">
@@ -91,7 +91,7 @@
                     maxlength="255"/>
                 </s: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"
@@ -116,9 +116,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>
@@ -193,7 +193,7 @@
               </span>
             </small>
           </h:form>
-        </s:fragment>
+        </ui:fragment>
       </li>
       <li id="profile-content">
         <h2 class="l--push-top-0 gamma d--bottom">
@@ -284,18 +284,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/language/members-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
index 82c103f32d..a27e89cca8 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>
@@ -42,7 +42,7 @@
       <s:div 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,7 +52,7 @@
               <i class="i i--plus i__item__icon"></i>
             </a>
           </p>
-        </s:fragment>
+        </ui:fragment>
       </s:div>
 
       <s:div styleClass="l--pad-all-half"
@@ -61,7 +61,7 @@
       </s:div>
 
 
-      <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
@@ -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/request_join_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
index 1317e57977..7eb89892e6 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,21 +48,21 @@
       <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">
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/project/edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
index 8eb777d904..011e244e9c 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,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"
@@ -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 83b664a02f..3d52833908 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
@@ -96,11 +96,11 @@
     </s:div>
     <s:div 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'}"
@@ -111,7 +111,7 @@
       <p class="txt--meta">#{msgs['jsf.project.writable.Message']}</p>
     </s:div>
 
-    <s:fragment
+    <ui:fragment
         rendered="#{identity.hasPermission(projectHome.instance, 'mark-obsolete')}">
       <s:div styleClass="g__item w--1-2"
           rendered="#{projectHome.instance.status ne 'OBSOLETE'}">
@@ -124,7 +124,7 @@
 
         <p class="txt--meta">#{msgs['jsf.DeleteProject.Message']}</p>
       </s:div>
-    </s:fragment>
+    </ui:fragment>
   </s:div>
 </h:form>
 
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..509674c6a4 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
@@ -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>
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..e428edbd13 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
@@ -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>
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 91ab9921ae..b6b6d13754 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"
@@ -65,7 +65,7 @@
           </li>
         </ul>
       </div>
-    </s:fragment>
+    </ui:fragment>
   </div>
   <h2 class="panel__heading">#{msgs['jsf.Versions']}</h2>
 </div>
@@ -89,7 +89,7 @@
   <s:div 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>
         <h:link styleClass="button--primary"
@@ -99,7 +99,7 @@
           <i class="i i--plus i__item__icon"></i>
         </h:link>
       </p>
-    </s:fragment>
+    </ui:fragment>
   </s:div>
 
   <s:div styleClass="l--pad-all-half"
@@ -107,7 +107,7 @@
     <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
   </s:div>
 
-  <s:fragment
+  <ui:fragment
     rendered="#{!projectHomeAction.versionFilter.currentPage.isEmpty()}">
     <ul class="list--stats">
       <ui:repeat
@@ -139,7 +139,7 @@
                     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>
                       <h:link outcome="/project/add_iteration.xhtml"
@@ -152,7 +152,7 @@
                         <i class="i i--plus i__item__icon"></i>
                       </h:link>
                     </li>
-                  </s:fragment>
+                  </ui:fragment>
                   <ui:repeat
                     value="#{projectHomeAction.getUserJoinedLocales(version)}"
                     var="hLocale">
@@ -209,14 +209,14 @@
                         value="#{projectHomeAction.getCopyVersionCompletePercent(version.project.slug, version.slug)}"/>
                     </h:outputFormat>
                   </h:panelGroup>
-                  <s:fragment
+                  <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,12 +239,12 @@
                             #{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
@@ -255,7 +255,7 @@
         </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..3e7af54972 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
@@ -45,7 +45,7 @@
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
       </s:div>
 
-      <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..d91c62dcfd 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
@@ -45,7 +45,7 @@
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
       </s:div>
 
-      <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/version-group/edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
index f3f8e93b93..c9303239d9 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,8 +1,9 @@
-<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:a4j="http://richfaces.org/a4j">
 
   <div class="l--push-top-half form__item">
@@ -46,4 +47,4 @@
       </h:inputTextarea>
     </s: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 82670f956f..e5180bc350 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>
@@ -63,7 +63,7 @@
     <s:div 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,7 +72,7 @@
             #{msgs['jsf.AddLanguages']}
           </a>
         </p>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
 
     <s:div styleClass="l--pad-all-half"
@@ -80,7 +80,7 @@
       <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
     </s:div>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{not empty versionGroupHomeAction.languageTabLanguageFilter.currentPage}">
       <ul class="list--stats" id="languages-language_list">
         <ui:repeat
@@ -111,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}"
@@ -119,7 +119,7 @@
                         <span class="stats__figure">#{displayUnit.figure}</span>
                         <span class="stats__unit">#{displayUnit.unit}</span>
                      </span>
-                  </s:fragment>
+                  </ui:fragment>
                 </div>
               </div>
 
@@ -130,7 +130,7 @@
           </li>
         </ui:repeat>
       </ul>
-    </s:fragment>
+    </ui:fragment>
   </h:form>
 
   <zanata:list-filter status="languageTab-languagesLoader"
@@ -191,11 +191,11 @@
       <p class="txt--meta">#{msgs['jsf.SelectALanguageFromList']}</p>
     </s:div>
 
-    <s:fragment rendered="#{versionGroupHomeAction.selectedLocale != null}">
+    <ui:fragment rendered="#{versionGroupHomeAction.selectedLocale != null}">
       <s:div 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"
@@ -204,7 +204,7 @@
               #{msgs['jsf.AddProjectVersions']}
             </a>
           </p>
-        </s:fragment>
+        </ui:fragment>
       </s:div>
 
       <s:div styleClass="l--pad-all-half"
@@ -212,7 +212,7 @@
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
       </s:div>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty versionGroupHomeAction.languageTabVersionFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat
@@ -228,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">
@@ -254,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 051795fb51..4d9c385626 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>
@@ -61,7 +61,7 @@
     <s:div 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,7 +69,7 @@
             #{msgs['jsf.AddProjectVersions']}
           </a>
         </p>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
 
     <s:div styleClass="l--pad-all-half"
@@ -77,7 +77,7 @@
       <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
     </s:div>
 
-    <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"
@@ -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}">
+    <ui:fragment rendered="#{versionGroupHomeAction.selectedVersion != null}">
       <s:div 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,7 +203,7 @@
               #{msgs['jsf.AddLanguages']}
             </a>
           </p>
-        </s:fragment>
+        </ui:fragment>
       </s:div>
 
       <s:div styleClass="l--pad-all-half"
@@ -211,7 +211,7 @@
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
       </s:div>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty versionGroupHomeAction.projectTabLanguageFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat
@@ -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..299d642970 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
@@ -77,10 +77,10 @@
           </zanata:autocomplete>
 
           <s:div id="versions">
-            <s:fragment rendered="#{empty versionGroupJoinAction.versions and versionGroupJoinAction.projectSlug != null}">
+            <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,7 +90,7 @@
                   </li>
                 </ui:repeat>
               </ul>
-            </s:fragment>
+            </ui:fragment>
           </s:div>
         </div>
 
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 55189fb3c0..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
@@ -64,7 +64,7 @@
         </div>
         <hr/>
         <h:panelGroup id="status">
-          <s:fragment
+          <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,7 +90,7 @@
               <i
                 class="i--left i--archive"></i> #{msgs['jsf.ActivateGroupMessage']}
             </p>
-          </s:fragment>
+          </ui:fragment>
         </h:panelGroup>
       </div>
     </h:form>
@@ -158,9 +158,9 @@
               <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>
+              </ui:fragment>
             </h:link>
             <a4j:commandLink
               styleClass="button--link l--float-right reveal__target"
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 9bf1ef661c..b73682b0a0 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>
@@ -78,7 +78,7 @@
     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,7 +86,7 @@
           #{msgs['jsf.iteration.files.UploadNewSourceDocument']}
         </a>
       </p>
-    </s:fragment>
+    </ui:fragment>
   </s:div>
 
   <s:div styleClass="l--pad-all-half"
@@ -94,7 +94,7 @@
     <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
   </s:div>
 
-  <s:fragment
+  <ui:fragment
     rendered="#{not empty versionHomeAction.documentsTabDocumentFilter.currentPage}">
     <ul class="list--stats" id="documents-document_list">
       <ui:repeat
@@ -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,7 +187,7 @@
                       <i class="i i--remove i__item__icon"></i>
                     </a4j:commandLink>
                   </li>
-                </s:fragment>
+                </ui:fragment>
               </ul>
             </div>
           </s:div>
@@ -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"
@@ -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}">
+    <ui:fragment rendered="#{versionHomeAction.selectedDocument != null}">
       <s:div 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,7 +318,7 @@
               class="i i--settings i__item__icon"></i>
             </a>
           </p>
-        </s:fragment>
+        </ui:fragment>
       </s:div>
 
       <s:div styleClass="l--pad-all-half"
@@ -326,7 +326,7 @@
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
       </s:div>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{not empty versionHomeAction.documentsTabLanguageFilter.currentPage}">
         <ul class="list--stats">
           <ui:repeat
@@ -334,17 +334,17 @@
             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>
+                        </ui:fragment>
                         <h:panelGroup layout="span" rendered="#{not hLocale.active}"
                           styleClass="label">
                           <!-- TODO check whether title is necessary -->
@@ -372,16 +372,16 @@
                     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>
+                      </ui:fragment>
                       <h:panelGroup layout="span" rendered="#{not hLocale.active}"
                         styleClass="label--danger">
                         <!-- TODO check whether title is necessary -->
@@ -407,12 +407,12 @@
                   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..5bd47202d4 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"
@@ -82,7 +82,7 @@
       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>
 
@@ -108,20 +108,20 @@
             <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>
+    </ui:fragment>
   </s:div>
 
   <s:div 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>
+    </ui:fragment>
   </s:div>
 
 
-</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 dc140c3a11..6e1e4e1cf3 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
@@ -29,7 +29,7 @@
       <s:div 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>
             <h:link styleClass="button--primary"
@@ -39,7 +39,7 @@
               <i class="i i--plus i__item__icon"></i>
             </h:link>
           </p>
-        </s:fragment>
+        </ui:fragment>
       </s:div>
 
       <s:div styleClass="l--pad-all-half"
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 33bec61014..b963976a55 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>
@@ -77,7 +77,7 @@
     <s:div 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,7 +85,7 @@
             #{msgs['jsf.AddLanguages']}
           </a>
         </p>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
 
     <s:div styleClass="l--pad-all-half"
@@ -93,7 +93,7 @@
       <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
     </s:div>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{not empty versionHomeAction.languageTabLanguageFilter.currentPage}">
       <ul class="list--stats" id="languages-language_list">
         <ui:repeat
@@ -106,10 +106,10 @@
                 <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>
+                    </ui:fragment>
 
                     <h:panelGroup layout="span" rendered="#{not hLocale.active}" styleClass="label">
                       <!-- TODO check whether title is necessary -->
@@ -127,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}"
@@ -135,7 +135,7 @@
                         <span class="stats__figure">#{displayUnit.figure}</span>
                         <span class="stats__unit">#{displayUnit.unit}</span>
                      </span>
-                  </s:fragment>
+                  </ui:fragment>
                 </div>
               </div>
 
@@ -146,7 +146,7 @@
           </li>
         </ui:repeat>
       </ul>
-    </s:fragment>
+    </ui:fragment>
   </h:form>
 
   <zanata:list-filter status="languageTab-languagesLoader"
@@ -180,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"
@@ -188,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"
@@ -262,11 +262,11 @@
     <p class="txt--meta">#{msgs['jsf.SelectALanguageFromList']}</p>
   </s:div>
 
-  <s:fragment rendered="#{versionHomeAction.selectedLocale != null}">
+  <ui:fragment rendered="#{versionHomeAction.selectedLocale != null}">
     <s:div 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"
@@ -274,7 +274,7 @@
             #{msgs['jsf.ManageDocuments']}
           </a>
         </p>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
 
     <s:div styleClass="l--pad-all-half"
@@ -282,7 +282,7 @@
       <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
     </s:div>
 
-    <s:fragment
+    <ui:fragment
       rendered="#{not empty versionHomeAction.languageTabDocumentFilter.currentPage}">
       <ul class="list--stats">
         <ui:repeat varStatus="status"
@@ -303,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"
@@ -334,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"
@@ -350,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"
@@ -365,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"
@@ -376,12 +376,12 @@
                         <i class="i i--import i__item__icon"></i>
                       </a>
                     </li>
-                  </s:fragment>
+                  </ui:fragment>
                 </ul>
               </div>
             </s:div>
 
-            <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">
@@ -407,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">
@@ -432,12 +432,12 @@
                 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..e100846308 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">
 
@@ -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)">
@@ -109,19 +110,19 @@
             </h:selectOneMenu>
           </div>
           <s:div id="sourceVersions">
-            <s:fragment rendered="#{empty mergeTransAction.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,7 +130,7 @@
                   var="version" itemLabel="#{version.slug}"
                   itemValue="#{version.slug}" itemLabelEscaped="true"/>
               </h:selectOneMenu>
-            </s:fragment>
+            </ui:fragment>
           </s:div>
 
           <div class="l--push-top-half">
@@ -157,10 +158,10 @@
               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>
+            </ui:fragment>
           </s:div>
         </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..d4c1304b40 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
@@ -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>
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 421005c435..f6874a4a52 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
@@ -51,12 +51,12 @@
 <h1>#{msgs['jsf.iteration.VersionSettings']}</h1>
 
 <s:div styleClass="tabs--vertical js-tabs" id="version-settings">
-<s:fragment rendered="#{versionHomeAction.copyVersionHandler.inProgress}">
+<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"
@@ -123,13 +123,13 @@
       </s:div>
       <s:div 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'}"
@@ -141,7 +141,7 @@
         <p class="txt--meta">#{msgs['jsf.iteration.writable.Message']}</p>
       </s:div>
 
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionHome.instance, 'mark-obsolete')}">
         <s:div styleClass="g__item w--1-2"
           rendered="#{versionHome.instance.status ne 'OBSOLETE'}">
@@ -153,7 +153,7 @@
           <p
             class="txt--meta">#{msgs['jsf.iteration.delete.Message']}</p>
         </s:div>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
   </h:form>
 </li>
@@ -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,7 +367,7 @@
   </h:form>
 </li>
 </ul>
-</s:fragment>
+</ui:fragment>
 </s:div>
 
   <ui:include src="/WEB-INF/layout/delete_confirmation_modal.xhtml">
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..4f8e454062 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">
 
@@ -47,7 +48,7 @@
             id="downloadDialogMsg"></div>
 
           <s:div styleClass="l--pad-top-half form__item" id="download-progress">
-            <s:fragment
+            <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,7 +83,7 @@
                 enableDownload(true);
                 zanata.modal.hide('#zipDownloadProgressDialog');
               </script>
-            </s:fragment>
+            </ui:fragment>
           </s:div>
         </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 30e2d5ab4b..8b473dd7a3 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">
@@ -80,7 +81,7 @@
             <i class="is-hidden--m-up l--float-right i--inline i--language"></i>
           </h:link>
         </li>
-        <s:fragment rendered="#{identity.loggedIn}">
+        <ui:fragment rendered="#{identity.loggedIn}">
           <li>
             <h:link id="glossary_link" outcome="/glossary/view.xhtml"
               >#{msgs['jsf.Glossary']}
@@ -88,7 +89,7 @@
                 class="is-hidden--m-up l--float-right i--inline i--glossary"></i>
             </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"
@@ -127,7 +128,7 @@
             class="l--float-right i--inline i--settings"></i>
           </a>
         </li>
-        <s:fragment rendered="#{identity.hasRole('admin')}">
+        <ui:fragment rendered="#{identity.hasRole('admin')}">
           <li>
             <h:link id="administration" outcome="/admin/home.xhtml"
               >
@@ -135,7 +136,7 @@
               class="l--float-right i--inline i--admin"></i>
             </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}">
+  <ui:fragment rendered="#{not identity.loggedIn}">
     <s:div styleClass="header__login l--float-right">
       <h:link id="register_link_internal_auth" outcome="/account/register.xhtml"
         value="#{msgs['jsf.Signup']}"
          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)}"
@@ -182,6 +183,6 @@
         #{msgs['jsf.Login']}
       </h:outputLink>
     </s:div>
-  </s:fragment>
+  </ui:fragment>
 
 </header>
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/login.xhtml b/zanata-war/src/main/webapp/account/login.xhtml
index 8ca8978472..13c4bb0dec 100644
--- a/zanata-war/src/main/webapp/account/login.xhtml
+++ b/zanata-war/src/main/webapp/account/login.xhtml
@@ -36,17 +36,17 @@
             <s:div
               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">
@@ -77,7 +77,7 @@
                     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">
@@ -85,13 +85,13 @@
                       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>
@@ -102,10 +102,10 @@
               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')}"
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 af737f28d2..61d16027f4 100644
--- a/zanata-war/src/main/webapp/account/password_reset_request.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset_request.xhtml
@@ -37,14 +37,14 @@
               </a4j:jsFunction>
 
               <s:div id="actions">
-                <s:fragment rendered="#{passwordResetRequest.accountWaitingForActivation}">
+                <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>
+                </ui:fragment>
               </s:div>
 
               <s:decorate id="usernameEmailField" template="/WEB-INF/layout/field.xhtml"
diff --git a/zanata-war/src/main/webapp/account/register.xhtml b/zanata-war/src/main/webapp/account/register.xhtml
index c5aa5176e9..7d8c8c668a 100644
--- a/zanata-war/src/main/webapp/account/register.xhtml
+++ b/zanata-war/src/main/webapp/account/register.xhtml
@@ -32,10 +32,10 @@
             <s:div
               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">
@@ -85,12 +85,12 @@
                 <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}"
@@ -109,10 +109,10 @@
               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')}"
diff --git a/zanata-war/src/main/webapp/admin/processmanager.xhtml b/zanata-war/src/main/webapp/admin/processmanager.xhtml
index 787e9746b5..fa399bc1bd 100644
--- a/zanata-war/src/main/webapp/admin/processmanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/processmanager.xhtml
@@ -56,7 +56,7 @@
               <p class="txt--meta">#{msgs['jsf.processmanager.process.empty']}</p>
             </s:div>
 
-            <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,18 +71,18 @@
                           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>
 
                         <h:panelGroup layout="span" styleClass="txt--understated" rendered="#{handle.done}">
                           <span
@@ -96,7 +96,7 @@
                   </li>
                 </ui:repeat>
               </ul>
-            </s:fragment>
+            </ui:fragment>
           </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 e737bdf841..7976f43f1b 100644
--- a/zanata-war/src/main/webapp/admin/rolemanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -64,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
@@ -74,7 +74,7 @@
                               <i class="i i--remove i__item__icon"></i>
                             </h:commandLink>
                           </li>
-                        </s:fragment>
+                        </ui:fragment>
                       </ul>
                     </div>
                   </div>
diff --git a/zanata-war/src/main/webapp/admin/search.xhtml b/zanata-war/src/main/webapp/admin/search.xhtml
index 57051b73ac..4440b4c441 100644
--- a/zanata-war/src/main/webapp/admin/search.xhtml
+++ b/zanata-war/src/main/webapp/admin/search.xhtml
@@ -46,25 +46,25 @@
           </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,7 +105,7 @@
                     </div>
                   </li>
                 </ul>
-              </s:fragment>
+              </ui:fragment>
             </a4j:outputPanel>
           </div>
         </s:div>
@@ -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,7 +242,7 @@
                     class="button button--primary ">
                     #{msgs['jsf.ManageSearch.PerformSelectedActions']}
                   </button>
-                </s:fragment>
+                </ui:fragment>
 
               </s:div>
         </h:form>
diff --git a/zanata-war/src/main/webapp/admin/stats.xhtml b/zanata-war/src/main/webapp/admin/stats.xhtml
index e052a2f8ad..f0e0376817 100644
--- a/zanata-war/src/main/webapp/admin/stats.xhtml
+++ b/zanata-war/src/main/webapp/admin/stats.xhtml
@@ -47,27 +47,27 @@
         <h1 class="l--push-all-0">#{msgs['jsf.Statistics']}</h1>
         <s:div 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>
+          </ui:fragment>
         </s:div>
 
         <s:div 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>
+          </ui:fragment>
         </s:div>
 
 
         <s:div 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>
+          </ui:fragment>
         </s:div>
 
         <s:div 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>
+          </ui:fragment>
         </s:div>
 
         <s:div 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>
+          </ui:fragment>
         </s:div>
 
         <s:div 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,7 +187,7 @@
                 #{msgs['jsf.Untranslated']} <span class="badge">#{adminStatsAction.totalUntranslatedTextFlowTargets}</span>
               </div>
             </div>
-          </s:fragment>
+          </ui:fragment>
         </s:div>
       </div>
     </div>
diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
index dd4dd0bdd9..a566564621 100644
--- a/zanata-war/src/main/webapp/admin/usermanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -71,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;"
@@ -80,7 +80,7 @@
                               <i class="i i--remove i__item__icon"></i>
                             </a>
                           </li>
-                        </s:fragment>
+                        </ui:fragment>
                       </ul>
                     </div>
                   </div>
@@ -92,10 +92,10 @@
                         <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>
                           <h:panelGroup layout="span" styleClass="txt--meta l--push-h-quarter"
diff --git a/zanata-war/src/main/webapp/dashboard/home.xhtml b/zanata-war/src/main/webapp/dashboard/home.xhtml
index e8073f3c86..4ad46a0b71 100644
--- a/zanata-war/src/main/webapp/dashboard/home.xhtml
+++ b/zanata-war/src/main/webapp/dashboard/home.xhtml
@@ -29,7 +29,7 @@
       })
     </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>
@@ -125,6 +125,6 @@
           </div>
         </div>
       </div>
-    </s:fragment>
+    </ui:fragment>
   </ui:define>
 </ui:composition>
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 3d35fdbda7..8190bef677 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>
@@ -85,7 +85,7 @@
         <s:div 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,7 +94,7 @@
                 <i class="i i--plus i__item__icon"></i>
               </a>
             </p>
-          </s:fragment>
+          </ui:fragment>
         </s:div>
 
         <s:div styleClass="l--pad-all-half"
@@ -102,7 +102,7 @@
           <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
         </s:div>
 
-        <s:fragment
+        <ui:fragment
           rendered="#{!glossaryAction.glossaryFilter.currentPage.isEmpty()}">
           <ul class="list--stats">
             <ui:repeat
@@ -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,7 +132,7 @@
                             class="i i--remove i__item__icon"></i>
                           </a>
                         </li>
-                      </s:fragment>
+                      </ui:fragment>
                     </ul>
                   </div>
                 </s:div>
@@ -163,7 +163,7 @@
               </li>
             </ui:repeat>
           </ul>
-        </s:fragment>
+        </ui:fragment>
       </h:form>
 
       <zanata:list-filter listId="glossary_form"
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index 2c9faccd0d..c760f20ce6 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -201,14 +201,14 @@
 
   <s:div 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 +218,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,7 +244,7 @@
       <zanata:statistic
         value="#{versionHomeAction.overallStatistic}"
         type="large"/>
-    </s:fragment>
+    </ui:fragment>
 
     <zanata:loader type="loader--large"
       rendered="#{!versionHomeAction.pageRendered}"/>
@@ -306,7 +306,7 @@
           </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"
@@ -320,13 +320,13 @@
             </span>
           </a>
         </li>
-      </s:fragment>
+      </ui:fragment>
       <li class="tab__end">
         <h:form>
           <s:div
             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="#">
@@ -334,8 +334,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,8 +354,8 @@
                         <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>
                       <h:link outcome="/project/add_iteration.xhtml"
@@ -368,8 +368,8 @@
                         <i class="i i--plus i__item__icon"></i>
                       </h:link>
                     </li>
-                  </s:fragment>
-                </s:fragment>
+                  </ui:fragment>
+                </ui:fragment>
                 <li>
                   <h:commandLink title="#{msgs['jsf.GenerateProjectConfig']}"
                     styleClass="i__item--right"
@@ -392,11 +392,11 @@
                   </h:outputLink>
                 </li>
               </ul>
-            </s:fragment>
+            </ui:fragment>
           </s:div>
         </h:form>
       </li>
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(versionHomeAction.version, 'update')}">
         <li class="tab__end">
           <a id="settings_tab"
@@ -409,7 +409,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 +423,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}"
@@ -476,7 +476,7 @@
     </h:selectOneMenu>
 
     <s:div id="source-documentType-selection">
-      <s:fragment rendered="#{versionHomeAction.needDocumentTypeSelection(selectedSourceDocName)}">
+      <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,7 +487,7 @@
             itemLabel="#{documentType.name()}"
             itemValue="#{documentType.name()}"/>
         </h:selectOneMenu>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
 
     <rich:collapsiblePanel
diff --git a/zanata-war/src/main/webapp/language/home.xhtml b/zanata-war/src/main/webapp/language/home.xhtml
index 4bc0d2731d..de9a18eda5 100644
--- a/zanata-war/src/main/webapp/language/home.xhtml
+++ b/zanata-war/src/main/webapp/language/home.xhtml
@@ -87,9 +87,9 @@
                             </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>
@@ -116,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 9eacbc3d12..e34268cc6d 100644
--- a/zanata-war/src/main/webapp/language/language.xhtml
+++ b/zanata-war/src/main/webapp/language/language.xhtml
@@ -92,7 +92,7 @@
               </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">
@@ -111,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"
@@ -121,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}"
@@ -134,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"
@@ -149,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">
@@ -165,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">
@@ -173,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 d5fabb5cad..30980379c9 100644
--- a/zanata-war/src/main/webapp/profile/create_user.xhtml
+++ b/zanata-war/src/main/webapp/profile/create_user.xhtml
@@ -20,12 +20,12 @@
           <p class="txt--meta l--push-all-0">#{msgs['jsf.Signup']}</p>
         </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>
 
@@ -76,12 +76,12 @@
             </s: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"
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/home.xhtml b/zanata-war/src/main/webapp/project/home.xhtml
index 2b908bca70..46da2df828 100644
--- a/zanata-war/src/main/webapp/project/home.xhtml
+++ b/zanata-war/src/main/webapp/project/home.xhtml
@@ -32,10 +32,10 @@
 
   <ui:define name="center_content">
     <s:decorate id="main_content">
-      <s:fragment rendered="#{projectAction.getEmpty()}">
+      <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">
@@ -167,7 +167,7 @@
             </rich:dataScroller>
           </div>
         </h:form>
-      </s:fragment>
+      </ui:fragment>
     </s:decorate>
   </ui:define>
 
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index c8d5a0002d..054732e4ae 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.xhtml
@@ -69,14 +69,14 @@
         <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">
@@ -85,7 +85,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">
@@ -96,8 +96,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">
@@ -115,13 +115,13 @@
                   </div>
                 </div>
               </li>
-            </s:fragment>
+            </ui:fragment>
           </ul>
         </div>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
 
-    <s:fragment rendered="#{identity.loggedIn}">
+    <ui:fragment rendered="#{identity.loggedIn}">
       <ui:param name="activities"
         value="#{projectHomeAction.getProjectLastActivity()}"/>
 
@@ -139,7 +139,7 @@
           </ui:repeat>
         </div>
       </s:div>
-    </s:fragment>
+    </ui:fragment>
 
 </div>
 <div class="g__item w--1-m w--5-8-l w--2-3">
@@ -181,7 +181,7 @@
               </span>
         </a>
       </li>
-      <s:fragment
+      <ui:fragment
         rendered="#{identity.hasPermission(projectHome.instance, 'update')}">
         <li class="tab__end">
           <div
@@ -215,7 +215,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">
@@ -235,19 +235,19 @@
               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>
+          </ui:fragment>
         </s:div>
       </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 b0f719f94a..f4fb9299bb 100644
--- a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
@@ -109,7 +109,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}');
@@ -118,10 +118,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}"
@@ -129,13 +129,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})">
@@ -153,7 +153,7 @@
       <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">
@@ -163,7 +163,7 @@
             </li>
           </ui:repeat>
         </ul>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
   </div>
 </composite:implementation>
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/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 8c20136055..a5e95e133b 100644
--- a/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
@@ -5,6 +5,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">
 
 <composite:interface>
@@ -50,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}"
@@ -72,7 +73,7 @@
         data-target="##{cc.attrs.id}">#{msgs['jsf.Cancel']}
       </button>
     </div>
-  </s:fragment>
+  </ui:fragment>
 
   <s:div
     styleClass="panel__results #{cc.attrs.bottomPanel ? 'panel__results--bottom' : ''}">
@@ -81,7 +82,7 @@
         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
+      <ui:fragment
         rendered="#{cc.attrs.actionBean.totalRecords ge cc.attrs.actionBean.pageSize}">
         <ul class="panel__pager">
           <li>
@@ -101,26 +102,26 @@
             </button>
           </li>
         </ul>
-      </s:fragment>
+      </ui:fragment>
     </s:div>
     <span class="txt--meta">
       <h:panelGroup id="#{cc.attrs.id}-page-info">
-        <s:fragment
+        <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>
+          </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}"
@@ -132,7 +133,7 @@
           data-target="##{cc.attrs.id}">
           #{msgs['jsf.Search']}<i class="i--right i--search"></i>
         </button>
-      </s:fragment>
+      </ui:fragment>
     </span>
   </s:div>
 </composite:implementation>
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..74f414b479 100644
--- a/zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
@@ -49,7 +49,7 @@
     <h:form id="maintainers-form" styleClass="l--push-bottom-1">
       <s:div 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,7 +57,7 @@
               <i class="i i--plus i__item__icon"></i>
             </a>
           </p>
-        </s:fragment>
+        </ui:fragment>
       </s:div>
 
       <s:div styleClass="l--pad-all-half"
@@ -65,7 +65,7 @@
         <p class="txt--meta">#{msgs['jsf.search.NoResult']}</p>
       </s:div>
 
-      <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..529e2ac61d 100644
--- a/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
@@ -4,6 +4,7 @@
   xmlns:composite="http://java.sun.com/jsf/composite"
   xmlns:s="http://jboss.org/schema/seam/taglib"
   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"
@@ -74,26 +75,26 @@
           value="#{cc.attrs.actionBean.completedPercentage}"/>
       </s:div>
 
-      <s:fragment rendered="#{cc.attrs.type eq 'large'}">
+      <ui:fragment rendered="#{cc.attrs.type eq 'large'}">
         <s:div 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>
+      </ui:fragment>
 
-      <s:fragment rendered="#{cc.attrs.type eq 'full'}">
+      <ui:fragment rendered="#{cc.attrs.type eq 'full'}">
         <s:div 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>
+      </ui:fragment>
 
-      <s:fragment rendered="#{cc.attrs.type eq ''}">
+      <ui:fragment rendered="#{cc.attrs.type eq ''}">
         <s:div 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>
+      </ui:fragment>
 
     </s:div>
   </s:div>
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-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/tm/home.xhtml b/zanata-war/src/main/webapp/tm/home.xhtml
index d1997a8874..02163df912 100644
--- a/zanata-war/src/main/webapp/tm/home.xhtml
+++ b/zanata-war/src/main/webapp/tm/home.xhtml
@@ -198,13 +198,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)}"
@@ -217,13 +217,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)}"
@@ -252,11 +252,11 @@
                           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)}">
+                        </ui:fragment>
+                        <ui:fragment rendered="#{not translationMemoryAction.isTransMemoryBeingCleared(tm.slug)}">
                           <span class="txt--understated">
                             #{msgs['jsf.transmemory.createdOn']}
                               <span class="stats__unit">
@@ -265,7 +265,7 @@
                                  </h:outputText>
                               </span>
                           </span>
-                        </s:fragment>
+                        </ui:fragment>
                       </s:div>
                     </div>
                   </div>
diff --git a/zanata-war/src/main/webapp/version-group/home.xhtml b/zanata-war/src/main/webapp/version-group/home.xhtml
index 35e1b0a2fb..b4e4b989b2 100644
--- a/zanata-war/src/main/webapp/version-group/home.xhtml
+++ b/zanata-war/src/main/webapp/version-group/home.xhtml
@@ -30,7 +30,7 @@
     <h:form id="groupForm">
       <s:div 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,7 +38,7 @@
               <a4j:ajax event="change" render="groupTable"/>
             </h:selectBooleanCheckbox>
             <h:outputText value="#{msgs['jsf.Obsolete']}"/>
-          </s:fragment>
+          </ui:fragment>
         </a4j:region>
       </s:div>
       <br/>
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 3a27cce25a..c15399544b 100644
--- a/zanata-war/src/main/webapp/version-group/version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -116,7 +116,7 @@
       </div>
     </s:div>
     <s:div id="overall_statistic" styleClass="progress-bar__expander">
-      <s:fragment rendered="#{versionGroupHomeAction.pageRendered}">
+      <ui:fragment rendered="#{versionGroupHomeAction.pageRendered}">
         <p class="d--top l--pad-top-half txt--mini">
           #{msgs['jsf.TotalSourceContains']}
           <strong>#{versionGroupHomeAction.overallStatistic.total}
@@ -149,7 +149,7 @@
             value="#{versionGroupHomeAction.overallStatistic}"
             type="large"/>
         </div>
-      </s:fragment>
+      </ui:fragment>
 
       <a4j:status name="statistic-loader">
         <f:facet name="start">
@@ -203,7 +203,7 @@
           </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>

From 6972e760d293f1789f6bf1549708b9de73b15503 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Mon, 10 Aug 2015 15:36:35 +1000
Subject: [PATCH 06/15] remove unused jsf page

---
 .../src/main/webapp/WEB-INF/layout/edit.xhtml | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml

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 0372a3cd82..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"/>
-      <h:panelGroup layout="span" styleClass="required" rendered="#{required}">*</h:panelGroup>
-    </s:label>
-
-        <span class="value #{invalid?'errors':''}">
-            <s:validateAll>
-              <ui:insert/>
-            </s:validateAll>
-        </span>
-
-        <span class="value #{invalid?'errors':''} errorsMessage">
-        <h:panelGroup layout="span" styleClass="icon-cancel-circle-2 errors" rendered="#{invalid}"/>
-          <s:message styleClass="errors"/>
-        </span>
-  </div>
-
-</ui:composition>

From 92f842f180e6d675b643166561d2d30dbf758ee8 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Thu, 13 Aug 2015 17:07:51 +1000
Subject: [PATCH 07/15] replace s:div with h:panelGroup

---
 .../layout/copy_trans_inline_modal.xhtml      |  4 +--
 .../layout/delete_confirmation_modal.xhtml    |  4 +--
 .../main/webapp/WEB-INF/layout/field.xhtml    |  4 +--
 .../WEB-INF/layout/language/members-tab.xhtml | 12 +++----
 .../layout/language/new_language_modal.xhtml  |  8 ++---
 .../layout/language/request_join_modal.xhtml  |  4 +--
 .../layout/project/settings-tab-general.xhtml | 16 ++++-----
 .../project/settings-tab-languages.xhtml      |  4 +--
 .../WEB-INF/layout/project/settings-tab.xhtml |  8 ++---
 .../project/validation-settings-block.xhtml   |  4 +--
 .../WEB-INF/layout/project/versions-tab.xhtml | 16 ++++-----
 .../WEB-INF/layout/search/projects-tab.xhtml  |  4 +--
 .../WEB-INF/layout/search/users-tab.xhtml     |  4 +--
 .../layout/version-group/languages-tab.xhtml  | 20 +++++------
 .../layout/version-group/projects-tab.xhtml   | 16 ++++-----
 .../version-group/request_join_modal.xhtml    |  4 +--
 .../layout/version/documents-tab.xhtml        | 28 +++++++--------
 .../WEB-INF/layout/version/edit_form.xhtml    | 12 +++----
 .../WEB-INF/layout/version/groups-tab.xhtml   |  8 ++---
 .../layout/version/languages-tab.xhtml        | 36 +++++++++----------
 .../layout/version/merge_trans_modal.xhtml    | 12 +++----
 .../version/settings-tab-languages.xhtml      |  4 +--
 .../WEB-INF/layout/version/settings-tab.xhtml | 20 +++++------
 .../version/upload_translation_modal.xhtml    |  8 ++---
 .../version/zip_download_progress_modal.xhtml |  8 ++---
 .../main/webapp/WEB-INF/template/banner.xhtml |  4 +--
 .../src/main/webapp/account/login.xhtml       |  8 ++---
 .../account/password_reset_request.xhtml      |  4 +--
 .../src/main/webapp/account/register.xhtml    |  8 ++---
 .../main/webapp/admin/processmanager.xhtml    |  8 ++---
 .../src/main/webapp/admin/rolerules.xhtml     |  4 +--
 zanata-war/src/main/webapp/admin/search.xhtml | 12 +++----
 .../webapp/admin/server_configuration.xhtml   | 12 +++----
 zanata-war/src/main/webapp/admin/stats.xhtml  | 24 ++++++-------
 .../src/main/webapp/admin/userdetail.xhtml    |  8 ++---
 .../src/main/webapp/dashboard/home.xhtml      |  6 ++--
 .../src/main/webapp/glossary/view.xhtml       | 12 +++----
 .../src/main/webapp/iteration/view.xhtml      | 16 ++++-----
 .../src/main/webapp/language/home.xhtml       |  4 +--
 .../src/main/webapp/language/language.xhtml   | 16 ++++-----
 .../src/main/webapp/profile/create_user.xhtml |  4 +--
 zanata-war/src/main/webapp/project/home.xhtml |  4 +--
 .../src/main/webapp/project/project.xhtml     | 12 +++----
 .../resources/zanata/autocomplete.xhtml       |  4 +--
 .../webapp/resources/zanata/list-filter.xhtml | 12 +++----
 .../resources/zanata/maintainers-tab.xhtml    |  8 ++---
 .../webapp/resources/zanata/progressBar.xhtml | 26 +++++++-------
 .../zanata/version-copy-action-loader.xhtml   | 18 +++++-----
 zanata-war/src/main/webapp/tm/home.xhtml      | 20 +++++------
 .../src/main/webapp/version-group/home.xhtml  |  4 +--
 .../webapp/version-group/version_group.xhtml  |  8 ++---
 51 files changed, 266 insertions(+), 268 deletions(-)

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/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/field.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
index d7717e024e..c2b1d22cf5 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
@@ -7,9 +7,9 @@
   <s:validateAll>
     <div class="#{invalid ? 'form__item--error' : ''}">
       <ui:insert/>
-      <s:div styleClass="message--danger app-error" rendered="#{invalid}">
+      <h:panelGroup layout="block"  styleClass="message--danger app-error" rendered="#{invalid}">
         <s:message/>
-      </s:div>
+      </h:panelGroup>
     </div>
   </s:validateAll>
 
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 a27e89cca8..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
@@ -39,7 +39,7 @@
     </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>
         <ui:fragment
@@ -53,12 +53,12 @@
             </a>
           </p>
         </ui:fragment>
-      </s:div>
+      </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>
 
 
       <ui:fragment rendered="#{not empty languageAction.membersFilter.currentPage}">
@@ -66,7 +66,7 @@
           <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">
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 7eb89892e6..9611a2ec3f 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
@@ -76,7 +76,7 @@
       </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);
@@ -93,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/project/settings-tab-general.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
index 3d52833908..0a893fb1a1 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
@@ -83,8 +83,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,8 +93,8 @@
       </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'}">
       <ui:fragment rendered="#{projectHome.instance.status eq 'OBSOLETE'}">
         <button class="button--success l--push-bottom-half" disabled="disabled">
@@ -109,11 +109,11 @@
       </a4j:commandLink>
 
       <p class="txt--meta">#{msgs['jsf.project.writable.Message']}</p>
-    </s:div>
+    </h:panelGroup>
 
     <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"
@@ -123,9 +123,9 @@
         </a>
 
         <p class="txt--meta">#{msgs['jsf.DeleteProject.Message']}</p>
-      </s:div>
+      </h:panelGroup>
     </ui:fragment>
-  </s:div>
+  </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 509674c6a4..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']}"
@@ -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 f418e23d73..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">
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 e428edbd13..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">
@@ -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 b6b6d13754..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
@@ -86,7 +86,7 @@
 </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>
     <ui:fragment
@@ -100,12 +100,12 @@
         </h:link>
       </p>
     </ui:fragment>
-  </s:div>
+  </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>
 
   <ui:fragment
     rendered="#{!projectHomeAction.versionFilter.currentPage.isEmpty()}">
@@ -128,8 +128,8 @@
             </h:outputScript>
           </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">
@@ -186,7 +186,7 @@
                   </li>
                 </ul>
               </div>
-            </s:div>
+            </h:panelGroup>
 
             <h:link outcome="/iteration/view.xhtml"
               disabled="#{projectHomeAction.isVersionCopying(version.project.slug, version.slug)}">
@@ -251,7 +251,7 @@
                 value="#{projectHomeAction.getStatisticForVersion(version.slug)}"
                 rendered="#{projectHomeAction.pageRendered}"/>
             </h:link>
-          </s:div>
+          </h:panelGroup>
         </li>
       </ui:repeat>
     </ul>
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 3e7af54972..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,10 +40,10 @@
     </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>
 
       <ui:fragment
         rendered="#{not empty zanataSearch.projectTabProjectFilter.currentPage}">
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 d91c62dcfd..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,10 +40,10 @@
     </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>
 
       <ui:fragment
         rendered="#{not empty zanataSearch.userTabUserFilter.currentPage}">
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 e5180bc350..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
@@ -60,7 +60,7 @@
   </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>
       <ui:fragment
@@ -73,12 +73,12 @@
           </a>
         </p>
       </ui:fragment>
-    </s:div>
+    </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>
 
     <ui:fragment
       rendered="#{not empty versionGroupHomeAction.languageTabLanguageFilter.currentPage}">
@@ -186,13 +186,13 @@
   </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>
 
     <ui:fragment rendered="#{versionGroupHomeAction.selectedLocale != null}">
-      <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>
         <ui:fragment
@@ -205,12 +205,12 @@
             </a>
           </p>
         </ui:fragment>
-      </s:div>
+      </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>
 
       <ui:fragment
         rendered="#{not empty versionGroupHomeAction.languageTabVersionFilter.currentPage}">
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 4d9c385626..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
@@ -58,7 +58,7 @@
   </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>
       <ui:fragment
@@ -70,12 +70,12 @@
           </a>
         </p>
       </ui:fragment>
-    </s:div>
+    </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>
 
     <ui:fragment
       rendered="#{not empty versionGroupHomeAction.projectTabVersionFilter.currentPage}">
@@ -192,7 +192,7 @@
     </ui:fragment>
 
     <ui:fragment rendered="#{versionGroupHomeAction.selectedVersion != null}">
-      <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>
         <ui:fragment
@@ -204,12 +204,12 @@
             </a>
           </p>
         </ui:fragment>
-      </s:div>
+      </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>
 
       <ui:fragment
         rendered="#{not empty versionGroupHomeAction.projectTabLanguageFilter.currentPage}">
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 299d642970..efc5c85004 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,7 +76,7 @@
             <span class="txt--meta"> [#{result.slug}]</span>
           </zanata:autocomplete>
 
-          <s:div id="versions">
+          <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>
             </ui:fragment>
@@ -91,7 +91,7 @@
                 </ui:repeat>
               </ul>
             </ui:fragment>
-          </s:div>
+          </h:panelGroup>
         </div>
 
         <s:decorate id="messageField" template="/WEB-INF/layout/field.xhtml">
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 b73682b0a0..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
@@ -74,7 +74,7 @@
 </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>
@@ -87,12 +87,12 @@
         </a>
       </p>
     </ui:fragment>
-  </s:div>
+  </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>
 
   <ui:fragment
     rendered="#{not empty versionHomeAction.documentsTabDocumentFilter.currentPage}">
@@ -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"
@@ -190,7 +190,7 @@
                 </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">
@@ -305,7 +305,7 @@
     </ui:fragment>
 
     <ui:fragment rendered="#{versionHomeAction.selectedDocument != null}">
-      <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.iteration.NoLanguagesInVersion']}</p>
@@ -319,12 +319,12 @@
             </a>
           </p>
         </ui:fragment>
-      </s:div>
+      </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>
 
       <ui:fragment
         rendered="#{not empty versionHomeAction.documentsTabLanguageFilter.currentPage}">
@@ -355,7 +355,7 @@
                       </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)}"/>
@@ -365,7 +365,7 @@
                             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)}"
@@ -392,7 +392,7 @@
                     </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)}"/>
@@ -401,7 +401,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(versionHomeAction.selectedDocument.id, hLocale.localeId)}"
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 5bd47202d4..88b1c85678 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
@@ -77,7 +77,7 @@
 
   <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}"/>
@@ -101,7 +101,7 @@
         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">
@@ -148,11 +148,11 @@
             </li>
           </ui:fragment>
         </ul>
-      </s:div>
+      </h:panelGroup>
     </ui:fragment>
-  </s:div>
+  </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}"/>
 
@@ -188,7 +188,7 @@
         </ui:repeat>
       </ul>
     </ui:fragment>
-  </s:div>
+  </h:panelGroup>
 
 
 </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 6e1e4e1cf3..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,7 +26,7 @@
     </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>
         <ui:fragment
@@ -40,12 +40,12 @@
             </h:link>
           </p>
         </ui:fragment>
-      </s:div>
+      </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}"
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 b963976a55..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
@@ -74,7 +74,7 @@
   </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>
       <ui:fragment
@@ -86,12 +86,12 @@
           </a>
         </p>
       </ui:fragment>
-    </s:div>
+    </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>
 
     <ui:fragment
       rendered="#{not empty versionHomeAction.languageTabLanguageFilter.currentPage}">
@@ -172,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="#"
@@ -214,7 +214,7 @@
             </h:outputLink>
           </li>
         </ul>
-      </s:div>
+      </h:panelGroup>
     </h:form>
   </div>
 
@@ -257,13 +257,13 @@
 </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>
 
   <ui:fragment rendered="#{versionHomeAction.selectedLocale != null}">
-    <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>
       <ui:fragment
@@ -275,12 +275,12 @@
           </a>
         </p>
       </ui:fragment>
-    </s:div>
+    </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>
 
     <ui:fragment
       rendered="#{not empty versionHomeAction.languageTabDocumentFilter.currentPage}">
@@ -292,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"
@@ -379,7 +379,7 @@
                   </ui:fragment>
                 </ul>
               </div>
-            </s:div>
+            </h:panelGroup>
 
             <ui:fragment rendered="#{versionHomeAction.selectedLocale.active}">
               <a
@@ -390,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)}"/>
@@ -399,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)}"
@@ -416,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)}"/>
@@ -425,7 +425,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)}"
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 e100846308..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
@@ -85,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']}"
@@ -109,7 +109,7 @@
                 itemValue="#{project.slug}" itemLabelEscaped="true"/>
             </h:selectOneMenu>
           </div>
-          <s:div id="sourceVersions">
+          <h:panelGroup layout="block"  id="sourceVersions">
             <ui:fragment rendered="#{empty mergeTransAction.sourceVersions}">
               <div class="bg--neutral l--pad-all-half">
                 <h3 class="epsilon">
@@ -131,7 +131,7 @@
                   itemValue="#{version.slug}" itemLabelEscaped="true"/>
               </h:selectOneMenu>
             </ui:fragment>
-          </s:div>
+          </h:panelGroup>
 
           <div class="l--push-top-half">
             <zanata:checkbox
@@ -145,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)}"
@@ -162,7 +162,7 @@
               <zanata:loader type="loader--small" layout="inline" jsHandle="true"
                 id="merge-trans-loader"/>
             </ui:fragment>
-          </s:div>
+          </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 d4c1304b40..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']}"
@@ -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 f6874a4a52..e0ef78022f 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,7 +50,7 @@
 
 <h1>#{msgs['jsf.iteration.VersionSettings']}</h1>
 
-<s:div styleClass="tabs--vertical js-tabs" id="version-settings">
+<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']}
@@ -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,8 +120,8 @@
 
         <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'}">
         <ui:fragment
           rendered="#{versionHome.instance.status eq 'OBSOLETE'}">
@@ -139,11 +139,11 @@
         </a4j:commandLink>
 
         <p class="txt--meta">#{msgs['jsf.iteration.writable.Message']}</p>
-      </s:div>
+      </h:panelGroup>
 
       <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>
+        </h:panelGroup>
       </ui:fragment>
-    </s:div>
+    </h:panelGroup>
   </h:form>
 </li>
 <li id="settings-documents">
@@ -368,7 +368,7 @@
 </li>
 </ul>
 </ui:fragment>
-</s:div>
+</h:panelGroup>
 
   <ui:include src="/WEB-INF/layout/delete_confirmation_modal.xhtml">
     <ui:param name="copiedEntityType" value="#{msgs['jsf.Version']}" />
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..8dbc7f586c 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
@@ -118,8 +118,8 @@
             fileName="#{versionHomeAction.translationFileUpload.fileName}"/>
         </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 +131,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 4f8e454062..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
@@ -24,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"/>
@@ -47,7 +47,7 @@
           <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">
+          <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"
@@ -84,7 +84,7 @@
                 zanata.modal.hide('#zipDownloadProgressDialog');
               </script>
             </ui:fragment>
-          </s:div>
+          </h:panelGroup>
         </div>
 
         <footer class="modal__footer l--pad-h-1 l--pad-v-half bg--highest">
@@ -109,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 8b473dd7a3..d619de8eef 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
@@ -149,7 +149,7 @@
   </ui:fragment>
 
   <ui:fragment rendered="#{not identity.loggedIn}">
-    <s:div styleClass="header__login l--float-right">
+    <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']}"
          styleClass="is-hidden--s button"
@@ -182,7 +182,7 @@
         rendered="#{applicationConfiguration.kerberosAuth}">
         #{msgs['jsf.Login']}
       </h:outputLink>
-    </s:div>
+    </h:panelGroup>
   </ui:fragment>
 
 </header>
diff --git a/zanata-war/src/main/webapp/account/login.xhtml b/zanata-war/src/main/webapp/account/login.xhtml
index 13c4bb0dec..0680f4aa78 100644
--- a/zanata-war/src/main/webapp/account/login.xhtml
+++ b/zanata-war/src/main/webapp/account/login.xhtml
@@ -33,7 +33,7 @@
             <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}">
               <ui:fragment rendered="#{applicationConfiguration.multiAuth}">
@@ -94,11 +94,11 @@
                   </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>
@@ -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_request.xhtml b/zanata-war/src/main/webapp/account/password_reset_request.xhtml
index 61d16027f4..b329bfda06 100644
--- a/zanata-war/src/main/webapp/account/password_reset_request.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset_request.xhtml
@@ -36,7 +36,7 @@
                 <a4j:param name="val1" assignTo="#{usernameOrEmail}"/>
               </a4j:jsFunction>
 
-              <s:div id="actions">
+              <h:panelGroup layout="block"  id="actions">
                 <ui:fragment rendered="#{passwordResetRequest.accountWaitingForActivation}">
                   <div class="l--push-top-half">
                     <a href="#" onclick="sendActivationEmail('#{passwordResetRequest.usernameOrEmail}')"
@@ -45,7 +45,7 @@
                     </a>
                   </div>
                 </ui:fragment>
-              </s:div>
+              </h:panelGroup>
 
               <s:decorate id="usernameEmailField" template="/WEB-INF/layout/field.xhtml"
                 enclose="true">
diff --git a/zanata-war/src/main/webapp/account/register.xhtml b/zanata-war/src/main/webapp/account/register.xhtml
index 7d8c8c668a..16aaa8f249 100644
--- a/zanata-war/src/main/webapp/account/register.xhtml
+++ b/zanata-war/src/main/webapp/account/register.xhtml
@@ -29,7 +29,7 @@
               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}">
               <ui:fragment rendered="#{applicationConfiguration.multiAuth}">
@@ -104,8 +104,8 @@
                   </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>
@@ -139,7 +139,7 @@
                   </li>
                 </ul>
               </h:form>
-            </s:div>
+            </h:panelGroup>
           </div>
         </div>
       </div>
diff --git a/zanata-war/src/main/webapp/admin/processmanager.xhtml b/zanata-war/src/main/webapp/admin/processmanager.xhtml
index fa399bc1bd..dffb9c74a4 100644
--- a/zanata-war/src/main/webapp/admin/processmanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/processmanager.xhtml
@@ -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,17 +44,17 @@
               #{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>
 
             <ui:fragment rendered="#{not empty processManagerAction.runningProcesses}">
               <ul class="list--stats">
diff --git a/zanata-war/src/main/webapp/admin/rolerules.xhtml b/zanata-war/src/main/webapp/admin/rolerules.xhtml
index 3a299aa290..5b970cc60c 100644
--- a/zanata-war/src/main/webapp/admin/rolerules.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolerules.xhtml
@@ -53,7 +53,7 @@
             <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>
@@ -62,7 +62,7 @@
                 <i class="i i--plus i__item__icon"></i>
               </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 4440b4c441..3b90c6c2d3 100644
--- a/zanata-war/src/main/webapp/admin/search.xhtml
+++ b/zanata-war/src/main/webapp/admin/search.xhtml
@@ -32,16 +32,16 @@
           </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>
 
@@ -108,13 +108,13 @@
               </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>
@@ -244,7 +244,7 @@
                   </button>
                 </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 37a9f237ed..8159a8ad4e 100644
--- a/zanata-war/src/main/webapp/admin/server_configuration.xhtml
+++ b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
@@ -140,8 +140,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,8 +154,8 @@
                 <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>
@@ -168,8 +168,8 @@
                     styleClass="txt--neutral" />
                 </h:inputText>
               </s:decorate>
-            </s:div>
-          </s:div>
+            </h:panelGroup>
+          </h:panelGroup>
         </div>
 
         <div class="form__item l--push-top-1">
diff --git a/zanata-war/src/main/webapp/admin/stats.xhtml b/zanata-war/src/main/webapp/admin/stats.xhtml
index f0e0376817..18b7c9b419 100644
--- a/zanata-war/src/main/webapp/admin/stats.xhtml
+++ b/zanata-war/src/main/webapp/admin/stats.xhtml
@@ -45,7 +45,7 @@
         </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>
           <ui:fragment rendered="#{not adminStatsAction.documentReady}">
               <zanata:loader layout="inline"/>
@@ -58,9 +58,9 @@
               #{msgs['jsf.TotalReviewers']} <span class="badge">#{adminStatsAction.totalReviewer}</span>
             </span>
           </ui:fragment>
-        </s:div>
+        </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']}
           <ui:fragment rendered="#{not adminStatsAction.documentReady}">
@@ -84,10 +84,10 @@
               </span>
             </div>
           </ui:fragment>
-        </s:div>
+        </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']}
           <ui:fragment rendered="#{not adminStatsAction.documentReady}">
@@ -110,9 +110,9 @@
               </span>
             </div>
           </ui:fragment>
-        </s:div>
+        </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']}
           <ui:fragment rendered="#{not adminStatsAction.documentReady}">
@@ -131,9 +131,9 @@
               </span>
             </div>
           </ui:fragment>
-        </s:div>
+        </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']}
 
@@ -153,9 +153,9 @@
               </span>
             </div>
           </ui:fragment>
-        </s:div>
+        </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']}
           <ui:fragment rendered="#{not adminStatsAction.documentReady}">
@@ -188,7 +188,7 @@
               </div>
             </div>
           </ui:fragment>
-        </s:div>
+        </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 f1b93d407c..9befa7a45a 100644
--- a/zanata-war/src/main/webapp/admin/userdetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -49,7 +49,7 @@
               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"
@@ -62,9 +62,9 @@
                 <a href="#" class="form__toggle js-form-password-toggle">Show</a>
               </div>
             </s:decorate>
-          </s:div>
+          </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"
@@ -77,7 +77,7 @@
                 <a href="#" class="form__toggle js-form-password-toggle">Show</a>
               </div>
             </s:decorate>
-          </s:div>
+          </h:panelGroup>
 
 
           <div class="form__item l--push-top-1">
diff --git a/zanata-war/src/main/webapp/dashboard/home.xhtml b/zanata-war/src/main/webapp/dashboard/home.xhtml
index 4ad46a0b71..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">
 
@@ -35,7 +35,7 @@
           <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">
diff --git a/zanata-war/src/main/webapp/glossary/view.xhtml b/zanata-war/src/main/webapp/glossary/view.xhtml
index 8190bef677..5934507443 100644
--- a/zanata-war/src/main/webapp/glossary/view.xhtml
+++ b/zanata-war/src/main/webapp/glossary/view.xhtml
@@ -82,7 +82,7 @@
       </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>
           <ui:fragment
@@ -95,12 +95,12 @@
               </a>
             </p>
           </ui:fragment>
-        </s:div>
+        </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>
 
         <ui:fragment
           rendered="#{!glossaryAction.glossaryFilter.currentPage.isEmpty()}">
@@ -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="#"
@@ -135,7 +135,7 @@
                       </ui:fragment>
                     </ul>
                   </div>
-                </s:div>
+                </h:panelGroup>
 
                 <h:link outcome="/language/language.xhtml">
                   <f:param name="id" value="#{glossary.localeId}"/>
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index c760f20ce6..44644dc677 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -195,11 +195,11 @@
     </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">
     <ui:fragment rendered="#{versionHomeAction.pageRendered}">
       <p class="d--top l--pad-top-half txt--mini">
@@ -248,7 +248,7 @@
 
     <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')}"
@@ -323,7 +323,7 @@
       </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">
             <ui:fragment
@@ -393,7 +393,7 @@
                 </li>
               </ul>
             </ui:fragment>
-          </s:div>
+          </h:panelGroup>
         </h:form>
       </li>
       <ui:fragment
@@ -475,7 +475,7 @@
       <h:outputLabel value="#{msgs['jsf.SourceLanguage']}"/>
     </h:selectOneMenu>
 
-    <s:div id="source-documentType-selection">
+    <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())"
@@ -488,7 +488,7 @@
             itemValue="#{documentType.name()}"/>
         </h:selectOneMenu>
       </ui:fragment>
-    </s:div>
+    </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 de9a18eda5..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>
diff --git a/zanata-war/src/main/webapp/language/language.xhtml b/zanata-war/src/main/webapp/language/language.xhtml
index e34268cc6d..076ad93e12 100644
--- a/zanata-war/src/main/webapp/language/language.xhtml
+++ b/zanata-war/src/main/webapp/language/language.xhtml
@@ -38,7 +38,7 @@
             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,14 +49,14 @@
             <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}">
+          <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']}">
@@ -70,9 +70,9 @@
                 #{msgs['jsf.language.disableByDefault']}
               </span>
             </h:panelGroup>
-          </s:div>
+          </h:panelGroup>
 
-        </s:div>
+        </h:panelGroup>
       </div>
 
       <div class="g__item w--1-m w--5-8-l w--2-3">
diff --git a/zanata-war/src/main/webapp/profile/create_user.xhtml b/zanata-war/src/main/webapp/profile/create_user.xhtml
index 30980379c9..2e77287f01 100644
--- a/zanata-war/src/main/webapp/profile/create_user.xhtml
+++ b/zanata-war/src/main/webapp/profile/create_user.xhtml
@@ -51,7 +51,7 @@
           <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']}
               <span Class="txt--required">*</span>
             </h:outputLabel>
@@ -61,7 +61,7 @@
                 <a4j:ajax event="blur" render="usernameField" execute="@this"/>
               </h:inputText>
             </s:decorate>
-          </s:div>
+          </h:panelGroup>
 
           <div class="l--push-top-half form__item">
             <h:outputLabel for="email">
diff --git a/zanata-war/src/main/webapp/project/home.xhtml b/zanata-war/src/main/webapp/project/home.xhtml
index 46da2df828..d865765259 100644
--- a/zanata-war/src/main/webapp/project/home.xhtml
+++ b/zanata-war/src/main/webapp/project/home.xhtml
@@ -77,7 +77,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 +94,7 @@
               </h:selectBooleanCheckbox>
               <h:outputText value="#{msgs['jsf.ReadOnly']}"/>
             </a4j:region>
-          </s:div>
+          </h:panelGroup>
           <br/>
           <rich:dataTable id="projectList"
             rows="#{projectAction.projectPagedListDataModel.pageSize}"
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index 054732e4ae..a65558e95b 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.xhtml
@@ -64,7 +64,7 @@
         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>
 
@@ -119,13 +119,13 @@
           </ul>
         </div>
       </ui:fragment>
-    </s:div>
+    </h:panelGroup>
 
     <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']}
@@ -138,7 +138,7 @@
             </div>
           </ui:repeat>
         </div>
-      </s:div>
+      </h:panelGroup>
     </ui:fragment>
 
 </div>
@@ -229,7 +229,7 @@
       </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}"
@@ -238,7 +238,7 @@
           <ui:fragment rendered="#{empty projectHome.instance.homeContent}">
             #{msgs['jsf.project.NoHomeContent']}
           </ui:fragment>
-        </s:div>
+        </h:panelGroup>
       </li>
 
       <ui:fragment
diff --git a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
index f4fb9299bb..1e858374cd 100644
--- a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
@@ -148,7 +148,7 @@
 
     <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/>
@@ -164,7 +164,7 @@
           </ui:repeat>
         </ul>
       </ui:fragment>
-    </s:div>
+    </h:panelGroup>
   </div>
 </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 a5e95e133b..0602368fd6 100644
--- a/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
@@ -75,13 +75,13 @@
     </div>
   </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>
+      </h:panelGroup>
       <ui:fragment
         rendered="#{cc.attrs.actionBean.totalRecords ge cc.attrs.actionBean.pageSize}">
         <ul class="panel__pager">
@@ -103,7 +103,7 @@
           </li>
         </ul>
       </ui:fragment>
-    </s:div>
+    </h:panelGroup>
     <span class="txt--meta">
       <h:panelGroup id="#{cc.attrs.id}-page-info">
         <ui:fragment
@@ -135,6 +135,6 @@
         </button>
       </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 74f414b479..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,7 +47,7 @@
     </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>
         <ui:fragment rendered="#{cc.attrs.PermissionToUpdate}">
           <p>
@@ -58,12 +58,12 @@
             </a>
           </p>
         </ui:fragment>
-      </s:div>
+      </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>
 
       <ui:fragment
         rendered="#{not empty cc.attrs.filterActionBean.currentPage}">
diff --git a/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml b/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
index 529e2ac61d..ca17b80db1 100644
--- a/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
@@ -2,7 +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: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">
@@ -64,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>
 
       <ui:fragment rendered="#{cc.attrs.type eq 'large'}">
-        <s:div styleClass="progress-bar progress-bar--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>
+        </h:panelGroup>
       </ui:fragment>
 
       <ui:fragment rendered="#{cc.attrs.type eq 'full'}">
-        <s:div styleClass="progress-bar progress-bar--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>
+        </h:panelGroup>
       </ui:fragment>
 
       <ui:fragment rendered="#{cc.attrs.type eq ''}">
-        <s:div styleClass="progress-bar">
+        <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>
+        </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/version-copy-action-loader.xhtml b/zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
index 8cc768473e..b887ad4729 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
@@ -5,8 +5,6 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:composite="http://java.sun.com/jsf/composite"
-  xmlns:rich="http://richfaces.org/rich"
-  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">
 
@@ -38,20 +36,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"
@@ -59,16 +57,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/tm/home.xhtml b/zanata-war/src/main/webapp/tm/home.xhtml
index 02163df912..36decc9744 100644
--- a/zanata-war/src/main/webapp/tm/home.xhtml
+++ b/zanata-war/src/main/webapp/tm/home.xhtml
@@ -145,7 +145,7 @@
         </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>
@@ -155,14 +155,14 @@
                 <i class="i i--plus i__item__icon"></i>
               </h:link>
             </p>
-          </s:div>
+          </h:panelGroup>
 
-          <s:div rendered="#{not empty translationMemoryAction.allTranslationMemories}">
-            <s:div id="processResult">
+          <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}
               </h:panelGroup>
-            </s:div>
+            </h:panelGroup>
 
             <ul class="list--stats">
               <ui:repeat value="#{translationMemoryAction.allTranslationMemories}"
@@ -170,7 +170,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">
@@ -233,7 +233,7 @@
                           </h:commandLink>
                         </li>
                       </ul>
-                    </s:div>
+                    </h:panelGroup>
                   </div>
                   <div>
                     <div class="list__item__content">
@@ -247,7 +247,7 @@
                         </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)}"/>
@@ -266,13 +266,13 @@
                               </span>
                           </span>
                         </ui:fragment>
-                      </s:div>
+                      </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/home.xhtml b/zanata-war/src/main/webapp/version-group/home.xhtml
index b4e4b989b2..e79b3589db 100644
--- a/zanata-war/src/main/webapp/version-group/home.xhtml
+++ b/zanata-war/src/main/webapp/version-group/home.xhtml
@@ -28,7 +28,7 @@
     <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>
           <ui:fragment
             rendered="#{identity.hasPermission('HIterationGroup','view-obsolete')}">
@@ -40,7 +40,7 @@
             <h:outputText value="#{msgs['jsf.Obsolete']}"/>
           </ui:fragment>
         </a4j:region>
-      </s:div>
+      </h:panelGroup>
       <br/>
       <rich:dataTable id="groupTable"
         value="#{versionGroupAction.allVersionGroups}" var="group">
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 c15399544b..428dd52426 100644
--- a/zanata-war/src/main/webapp/version-group/version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -104,7 +104,7 @@
       </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,8 +114,8 @@
           #{versionGroupHome.instance.description}
         </p>
       </div>
-    </s:div>
-    <s:div id="overall_statistic" styleClass="progress-bar__expander">
+    </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']}
@@ -156,7 +156,7 @@
           <zanata:loader type="loader--large"/>
         </f:facet>
       </a4j:status>
-    </s:div>
+    </h:panelGroup>
   </div>
 
 

From bcb2174f2ed0b37311af0c580a0502151b2f6107 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Tue, 18 Aug 2015 14:46:33 +1000
Subject: [PATCH 08/15] replace s:fileUpload with rich:fileUpload

---
 .../org/zanata/action/GlossaryAction.java     |  9 ++++
 .../org/zanata/action/VersionHomeAction.java  | 50 ++++++++++++++-----
 .../WEB-INF/classes/META-INF/components.xml   |  3 +-
 .../glossary/upload_glossary_modal.xhtml      | 33 ++++++------
 .../version/upload_translation_modal.xhtml    | 35 ++++++-------
 .../src/main/webapp/iteration/view.xhtml      | 14 +++---
 6 files changed, 85 insertions(+), 59 deletions(-)

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/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/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/WEB-INF/layout/glossary/upload_glossary_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
index 6c33e5f8ea..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,7 +1,6 @@
 <div xmlns="http://www.w3.org/1999/xhtml"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:c="http://java.sun.com/jsf/core"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   class="modal" id="glossaryUploadDialog" tabindex="-1" role="dialog"
@@ -12,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);
@@ -53,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');
     }
 
@@ -107,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">
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 8dbc7f586c..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,9 +105,14 @@
         <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>
 
         <h:panelGroup layout="block"  id="documentType-selection">
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index 44644dc677..01d51d2d58 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"
@@ -454,12 +453,13 @@
   <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/>

From 9fed6b86fa7fd4d32d2e5b1fca68e6dde14a05da Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Wed, 19 Aug 2015 17:11:40 +1000
Subject: [PATCH 09/15] replace s:decorate with zanata:decorate

---
 functional-test/pom.xml                       |   1 +
 .../page/account/InactiveAccountPage.java     |   5 +-
 .../org/zanata/page/account/RegisterPage.java |   8 +-
 .../page/account/ResetPasswordPage.java       |   2 +-
 .../EditRoleAssignmentPage.java               |   6 +-
 .../administration/ManageUserAccountPage.java |   6 +-
 .../ServerConfigurationPage.java              |  20 +-
 .../TranslationMemoryEditPage.java            |   4 +-
 .../DashboardAccountTab.java                  |   6 +-
 .../DashboardProfileTab.java                  |   2 +-
 .../page/groups/CreateVersionGroupPage.java   |   6 +-
 .../page/languages/ContactTeamPage.java       |   2 +-
 .../page/projects/CreateProjectPage.java      |   6 +-
 .../zanata/page/projects/ProjectsPage.java    |   2 +-
 .../projectsettings/ProjectGeneralTab.java    |  10 +-
 .../projectversion/CreateVersionPage.java     |   2 +-
 .../page/utility/ContactAdminFormPage.java    |   2 +-
 .../versionGroup/VersionGroupTest.java        |   3 -
 zanata-war/pom.xml                            |   1 -
 .../java/org/zanata/action/UserAction.java    |   4 +-
 .../java/org/zanata/ui/UIInputContainer.java  | 469 ++++++++++++++++++
 .../zanata/ui/ValueExpressionAnalyzer.java    | 177 +++++++
 .../org/zanata/ui/faces/FacesMessages.java    |  48 +-
 .../layout/admin/contact_admin_modal.xhtml    |   7 +-
 .../admin/contact_admin_modal_anonymous.xhtml |   5 +-
 .../WEB-INF/layout/dashboard/settings.xhtml   |  17 +-
 .../main/webapp/WEB-INF/layout/field.xhtml    |  16 -
 .../language/contact_coordinator_modal.xhtml  |   8 +-
 .../layout/language/request_join_modal.xhtml  |   4 +-
 .../layout/language/settings-tab.xhtml        |  13 +-
 .../WEB-INF/layout/project/edit_form.xhtml    |  14 +-
 .../layout/project/settings-tab-general.xhtml |  11 +-
 .../layout/transmemory_edit_form.xhtml        |  10 +-
 .../layout/version-group/edit_form.xhtml      |  21 +-
 .../version-group/request_join_modal.xhtml    |   4 +-
 .../WEB-INF/layout/version/edit_form.xhtml    |   4 +-
 .../google_password_reset_request.xhtml       |   6 +-
 .../webapp/account/inactive_account.xhtml     |   6 +-
 .../main/webapp/account/password_reset.xhtml  |  11 +-
 .../account/password_reset_request.xhtml      |   6 +-
 .../src/main/webapp/account/register.xhtml    |  27 +-
 .../src/main/webapp/admin/roledetail.xhtml    |  11 +-
 .../main/webapp/admin/roleruledetails.xhtml   |  17 +-
 .../src/main/webapp/admin/rolerules.xhtml     |   2 +-
 .../webapp/admin/server_configuration.xhtml   |  51 +-
 .../src/main/webapp/admin/userdetail.xhtml    |  17 +-
 .../src/main/webapp/profile/create_user.xhtml |  14 +-
 zanata-war/src/main/webapp/project/home.xhtml |   5 +-
 .../webapp/resources/zanata/decorate.xhtml    |  32 ++
 .../main/webapp/resources/zanata/field.xhtml  |  27 +
 50 files changed, 932 insertions(+), 226 deletions(-)
 create mode 100644 zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
 create mode 100644 zanata-war/src/main/java/org/zanata/ui/ValueExpressionAnalyzer.java
 delete mode 100644 zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
 create mode 100644 zanata-war/src/main/webapp/resources/zanata/decorate.xhtml
 create mode 100644 zanata-war/src/main/webapp/resources/zanata/field.xhtml

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..765f63f251 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..93520b9377 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) {
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 229bfd102b..193283b929 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -160,7 +160,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/UserAction.java b/zanata-war/src/main/java/org/zanata/action/UserAction.java
index 44547890a3..cefecd934d 100644
--- a/zanata-war/src/main/java/org/zanata/action/UserAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/UserAction.java
@@ -188,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";
         }
 
@@ -211,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);
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..fb535bd934
--- /dev/null
+++ b/zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
@@ -0,0 +1,469 @@
+/*
+ * 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. This class is copied from seam's migration demo project at https://github.com/seam/migration. Modified to suit us.
+ *
+ * <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.zanata.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");
+    }
+
+    Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
+
+    public Validator getValidator() {
+        return validator;
+    }
+
+    public void setValidator(Validator validator) {
+        this.validator = 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;
+        }
+
+        getAttributes().put(getInvalidAttributeName(), false);
+        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);
+        }
+        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);
+            }
+        }
+
+        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/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/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/dashboard/settings.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
index 914f42cee7..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"
@@ -86,16 +86,15 @@
             <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>
             </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"
@@ -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}"
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 c2b1d22cf5..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/>
-      <h:panelGroup layout="block"  styleClass="message--danger app-error" rendered="#{invalid}">
-        <s:message/>
-      </h:panelGroup>
-    </div>
-  </s:validateAll>
-
-</ui:composition>
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/request_join_modal.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
index 9611a2ec3f..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
@@ -65,14 +65,14 @@
           </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">
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 011e244e9c..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 @@
 <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
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 0a893fb1a1..a2848774c4 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
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 c9303239d9..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
@@ -4,28 +4,29 @@
   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']}
       <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']}
       <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}"
@@ -33,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>
 </ui:fragment>
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 efc5c85004..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
@@ -94,14 +94,14 @@
           </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/edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
index 88b1c85678..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
@@ -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"
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 53859196da..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,6 +3,7 @@
   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>
@@ -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 7b0f5da84c..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>
@@ -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/password_reset.xhtml b/zanata-war/src/main/webapp/account/password_reset.xhtml
index e046bf0797..e19814ffb7 100644
--- a/zanata-war/src/main/webapp/account/password_reset.xhtml
+++ b/zanata-war/src/main/webapp/account/password_reset.xhtml
@@ -5,6 +5,7 @@
   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>
@@ -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 b329bfda06..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,6 +3,7 @@
   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>
@@ -47,14 +48,13 @@
                 </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 16aaa8f249..3b618267cc 100644
--- a/zanata-war/src/main/webapp/account/register.xhtml
+++ b/zanata-war/src/main/webapp/account/register.xhtml
@@ -5,6 +5,7 @@
   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>
@@ -41,34 +42,34 @@
                 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,7 +79,7 @@
                     <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>
diff --git a/zanata-war/src/main/webapp/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
index 2d76099bcb..379abc108d 100644
--- a/zanata-war/src/main/webapp/admin/roledetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/roledetail.xhtml
@@ -4,6 +4,7 @@
   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">
 
@@ -39,24 +40,24 @@
 
           <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">
                 <c:selectItems value="#{identityManager.listRoles()}" var="role"
                   itemLabel="#{role}"/>
               </h:selectManyCheckbox>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <h:commandButton value="#{msgs['jsf.Save']}"
diff --git a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
index 16f9f0cb83..c5f72d5bc4 100644
--- a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
+++ b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
@@ -1,10 +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
@@ -29,8 +29,7 @@
               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}">
                 <c:selectItem noSelectionOption="true" itemLabel="" />
@@ -38,7 +37,7 @@
                   var="policy" itemLabel="#{policy}"
                   />
               </h:selectOneMenu>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <div class="form__item l--push-top-1">
@@ -48,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">
@@ -61,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}">
                 <c:selectItems value="#{identityManager.listGrantableRoles()}"
                   var="role" itemLabel="#{role}"/>
               </h:selectOneMenu>
-            </s:decorate>
+            </zanata:decorate>
           </div>
 
           <h:commandButton id="save" styleClass="button button--primary"
diff --git a/zanata-war/src/main/webapp/admin/rolerules.xhtml b/zanata-war/src/main/webapp/admin/rolerules.xhtml
index 5b970cc60c..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">
 
diff --git a/zanata-war/src/main/webapp/admin/server_configuration.xhtml b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
index 8159a8ad4e..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">
 
@@ -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">
@@ -161,13 +160,13 @@
                 <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>
+              </zanata:decorate>
             </h:panelGroup>
           </h:panelGroup>
         </div>
@@ -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,37 +202,37 @@
               <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"
diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
index 9befa7a45a..f9fce15364 100644
--- a/zanata-war/src/main/webapp/admin/userdetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -4,6 +4,7 @@
   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">
@@ -52,8 +53,8 @@
           <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"
@@ -61,14 +62,14 @@
                 </h:inputSecret>
                 <a href="#" class="form__toggle js-form-password-toggle">Show</a>
               </div>
-            </s:decorate>
+            </zanata:decorate>
           </h:panelGroup>
 
           <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"
@@ -76,19 +77,19 @@
                 </h:inputSecret>
                 <a href="#" class="form__toggle js-form-password-toggle">Show</a>
               </div>
-            </s:decorate>
+            </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">
                 <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">
diff --git a/zanata-war/src/main/webapp/profile/create_user.xhtml b/zanata-war/src/main/webapp/profile/create_user.xhtml
index 2e77287f01..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">
 
@@ -40,12 +40,12 @@
             <h:outputLabel for="name">#{msgs['jsf.Name']}
               <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>
@@ -55,12 +55,12 @@
           <h:outputLabel for="username">#{msgs['jsf.Username']}
               <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>
+            </zanata:decorate>
           </h:panelGroup>
 
           <div class="l--push-top-half form__item">
@@ -68,12 +68,12 @@
               #{msgs['jsf.Email']}
               <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>
 
           <ui:fragment rendered="#{not empty applicationConfiguration.termsOfUseUrl}">
diff --git a/zanata-war/src/main/webapp/project/home.xhtml b/zanata-war/src/main/webapp/project/home.xhtml
index d865765259..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>
@@ -31,7 +32,7 @@
   </ui:define>
 
   <ui:define name="center_content">
-    <s:decorate id="main_content">
+    <h:panelGroup id="main_content" layout="block">
       <ui:fragment rendered="#{projectAction.getEmpty()}">
         <h:outputText value="#{msgs['jsf.NoProjectExists']}"/>
       </ui:fragment>
@@ -168,7 +169,7 @@
           </div>
         </h:form>
       </ui:fragment>
-    </s:decorate>
+    </h:panelGroup>
   </ui:define>
 
 </ui:composition>
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>

From d6cb52b7b4edb82c9330cdda711fe38a9af8ebb0 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Mon, 31 Aug 2015 17:09:13 +1000
Subject: [PATCH 10/15] fix according to review

---
 .../page/account/InactiveAccountPage.java     |   2 +-
 .../ServerConfigurationPage.java              |   2 +-
 .../action/ServerConfigurationBean.java       |   4 -
 .../java/org/zanata/ui/UIInputContainer.java  | 218 ++++++++++--------
 .../org/zanata/ui/ZanataUIInputContainer.java |  60 +++++
 .../src/main/webapp-jboss/WEB-INF/web.xml     |   6 +
 .../src/main/webapp/edit_home_content.xhtml   |   5 +-
 7 files changed, 196 insertions(+), 101 deletions(-)
 create mode 100644 zanata-war/src/main/java/org/zanata/ui/ZanataUIInputContainer.java

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 765f63f251..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
@@ -44,7 +44,7 @@ public HomePage clickResendActivationEmail() {
 
     public InactiveAccountPage enterNewEmail(String email) {
         enterText(readyElement(By.id("inactiveAccountForm:email:input:email"))
-                ,email);
+                , email);
         return new InactiveAccountPage(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 93520b9377..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
@@ -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/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/ui/UIInputContainer.java b/zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
index fb535bd934..a009f3ce28 100644
--- a/zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
+++ b/zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
@@ -40,22 +40,27 @@
 import javax.validation.ValidatorFactory;
 
 /**
- * N.B. This class is copied from seam's migration demo project at https://github.com/seam/migration. Modified to suit us.
+ * 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.
+ * <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>
@@ -72,6 +77,7 @@
  * </p>
  * <p/>
  * <p/>
+ *
  * <pre>
  * &lt;example:inputContainer id="name">
  *   &lt;h:inputText id="input" value="#{person.name}"/>
@@ -86,21 +92,25 @@
  * </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
- * (_).
+ * 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>
+ * @author <a href="http://community.jboss.org/people/spinner)">Jose Rodolfo
+ *         freitas</a>
  */
 @FacesComponent(UIInputContainer.COMPONENT_TYPE)
-public class UIInputContainer extends UIComponentBase implements NamingContainer {
+public class UIInputContainer extends UIComponentBase implements
+        NamingContainer {
     /**
      * The standard component type for this component.
      */
-    public static final String COMPONENT_TYPE = "org.zanata.faces.InputContainer";
+    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";
@@ -112,57 +122,50 @@ public UIInputContainer() {
         beanValidationPresent = isClassPresent("javax.validation.Validator");
     }
 
-    Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
-
-    public Validator getValidator() {
-        return validator;
-    }
-
-    public void setValidator(Validator validator) {
-        this.validator = 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.
+     * 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.
+     * 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.
+     * 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.
+     * 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.
+     * 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";
@@ -190,10 +193,10 @@ public void encodeBegin(final FacesContext context) throws IOException {
             return;
         }
 
-        getAttributes().put(getInvalidAttributeName(), false);
         super.encodeBegin(context);
 
-        InputContainerElements elements = scan(getFacet(UIComponent.COMPOSITE_FACET_NAME), null, context);
+        InputContainerElements elements =
+                scan(getFacet(UIComponent.COMPOSITE_FACET_NAME), null, context);
         // assignIds(elements, context);
         wire(elements, context);
 
@@ -202,29 +205,19 @@ public void encodeBegin(final FacesContext context) throws IOException {
         if (elements.hasValidationError()) {
             getAttributes().put(getInvalidAttributeName(), true);
         }
-        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);
-            }
-        }
 
-        getAttributes().put(getRequiredAttributeName(), elements.hasRequiredInput());
+        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.
+         * 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));
+            getAttributes().put(getLabelAttributeName(),
+                    generateLabel(elements, context));
         }
 
         if (Boolean.TRUE.equals(getAttributes().get(getEncloseAttributeName()))) {
@@ -245,46 +238,64 @@ public void encodeEnd(final FacesContext context) throws IOException {
         }
     }
 
-    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);
+    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);
+            context.getResponseWriter().writeAttribute(HTML_STYLE_ATTR_NAME,
+                    style, HTML_STYLE_ATTR_NAME);
         }
-        String styleClass = (getAttributes().get("styleClass") != null ? getAttributes().get("styleClass").toString().trim()
-                : null);
+        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_CLASS_ATTR_NAME,
+                    styleClass, HTML_CLASS_ATTR_NAME);
         }
-        context.getResponseWriter().writeAttribute(HTML_ID_ATTR_NAME, getClientId(context), HTML_ID_ATTR_NAME);
+        context.getResponseWriter().writeAttribute(HTML_ID_ATTR_NAME,
+                getClientId(context), HTML_ID_ATTR_NAME);
     }
 
-    protected void endContainerElement(final FacesContext context) throws IOException {
+    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();
+    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.
+     * 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,
+    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
+        // 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)) {
+        if ((elements.getLabel() == null)
+                && (component instanceof HtmlOutputLabel)) {
             elements.setLabel((HtmlOutputLabel) component);
         } else if (component instanceof EditableValueHolder) {
-            elements.registerInput((EditableValueHolder) component, getDefaultValidator(context), context);
+            elements.registerInput((EditableValueHolder) component,
+                    getDefaultValidator(context), context);
         } else if (component instanceof UIMessage) {
             elements.registerMessage((UIMessage) component);
         }
@@ -297,7 +308,8 @@ protected InputContainerElements scan(final UIComponent component, InputContaine
     }
 
     // assigning ids seems to break form submissions, but I don't know why
-    public void assignIds(final InputContainerElements elements, final FacesContext context) {
+    public void assignIds(final InputContainerElements elements,
+            final FacesContext context) {
         boolean refreshIds = false;
         if (getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) {
             setId(elements.getPropertyName(context));
@@ -332,29 +344,36 @@ public void assignIds(final InputContainerElements elements, final FacesContext
     /**
      * Wire the label and messages to the input(s)
      */
-    protected void wire(final InputContainerElements elements, final FacesContext context) {
+    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.
+     * Get the default Bean Validation Validator to read the contraints for a
+     * property.
      */
-    private Validator getDefaultValidator(final FacesContext context) throws FacesException {
+    private Validator getDefaultValidator(final FacesContext context)
+            throws FacesException {
         if (!beanValidationPresent) {
             return null;
         }
 
         ValidatorFactory validatorFactory;
-        Object cachedObject = context.getExternalContext().getApplicationMap().get(BeanValidator.VALIDATOR_FACTORY_KEY);
+        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);
+                throw new FacesException(
+                        "Could not build a default Bean Validator factory", e);
             }
-            context.getExternalContext().getApplicationMap().put(BeanValidator.VALIDATOR_FACTORY_KEY, validatorFactory);
+            context.getExternalContext().getApplicationMap()
+                    .put(BeanValidator.VALIDATOR_FACTORY_KEY, validatorFactory);
         }
         return validatorFactory.getValidator();
     }
@@ -362,7 +381,8 @@ private Validator getDefaultValidator(final FacesContext context) throws FacesEx
     private boolean isClassPresent(final String fqcn) {
         try {
             if (Thread.currentThread().getContextClassLoader() != null) {
-                return Thread.currentThread().getContextClassLoader().loadClass(fqcn) != null;
+                return Thread.currentThread().getContextClassLoader()
+                        .loadClass(fqcn) != null;
             } else {
                 return Class.forName(fqcn) != null;
             }
@@ -374,16 +394,20 @@ private boolean isClassPresent(final String fqcn) {
     }
 
     private boolean labelHasEmptyValue(InputContainerElements elements) {
-        if (elements.getLabel() == null || elements.getLabel().getValue() == null)
+        if (elements.getLabel() == null
+                || elements.getLabel().getValue() == null) {
             return false;
-        return (elements.getLabel().getValue().toString().trim().equals(":") || elements.getLabel().getValue().toString()
+        }
+        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<EditableValueHolder> inputs =
+                new ArrayList<EditableValueHolder>();
         private final List<UIMessage> messages = new ArrayList<UIMessage>();
         private boolean validationError = false;
 
@@ -399,16 +423,20 @@ public List<EditableValueHolder> getInputs() {
             return inputs;
         }
 
-        public void registerInput(final EditableValueHolder input, final Validator validator, final FacesContext context) {
+        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));
+                Iterator<FacesMessage> it =
+                        context.getMessages(((UIComponent) input)
+                                .getClientId(context));
                 while (it.hasNext()) {
-                    if (it.next().getSeverity().compareTo(FacesMessage.SEVERITY_WARN) >= 0) {
+                    if (it.next().getSeverity()
+                            .compareTo(FacesMessage.SEVERITY_WARN) >= 0) {
                         validationError = true;
                         break;
                     }
@@ -429,7 +457,8 @@ public boolean hasValidationError() {
         }
 
         public boolean hasRequiredInput() {
-            //We have to scan these each time as the value could change in an AJAX request
+            // 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;
@@ -447,8 +476,12 @@ public String getPropertyName(final FacesContext context) {
                 return null;
             }
 
-            propertyName = (String) new ValueExpressionAnalyzer(((UIComponent) inputs.get(0)).getValueExpression("value"))
-                    .getValueReference(context.getELContext()).getProperty();
+            propertyName =
+                    (String) new ValueExpressionAnalyzer(
+                            ((UIComponent) inputs.get(0))
+                                    .getValueExpression("value"))
+                            .getValueReference(context.getELContext())
+                            .getProperty();
             return propertyName;
         }
 
@@ -456,11 +489,14 @@ public void wire(final FacesContext context) {
             int numInputs = inputs.size();
             if (numInputs > 0) {
                 if (label != null) {
-                    label.setFor(((UIComponent) inputs.get(0)).getClientId(context));
+                    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));
+                        messages.get(i).setFor(
+                                ((UIComponent) inputs.get(i))
+                                        .getClientId(context));
                     }
                 }
             }
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/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/edit_home_content.xhtml b/zanata-war/src/main/webapp/edit_home_content.xhtml
index 07df23e7d0..02d26857b5 100644
--- a/zanata-war/src/main/webapp/edit_home_content.xhtml
+++ b/zanata-war/src/main/webapp/edit_home_content.xhtml
@@ -11,8 +11,6 @@
 
   <ui:define name="page_title">#{msgs['jsf.EditHomePage']}</ui:define>
   <ui:define name="center_content">
-    <!-- TODO pahuang do we need this? -->
-    <a4j:jsFunction name="cancelEditHomeContent" action="#{serverConfigurationBean.cancel()}" />
     <h1>#{msgs['jsf.HomepageContent']}</h1>
 
     <h:form id="homeContentForm">
@@ -32,8 +30,7 @@
             value="#{msgs['jsf.Update']}"
             action="#{serverConfigurationBean.updateHomeContent}"/>
           <h:button id="cancel" outcome="/home.xhtml"
-            value="#{msgs['jsf.Cancel']}"
-            onclick="cancelEditHomeContent()"/>
+            value="#{msgs['jsf.Cancel']}"/>
         </div>
 
         <hr/>

From 07633a381606bb1990b0d7ab1ac33cd824c5a636 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Fri, 18 Sep 2015 15:44:47 +1000
Subject: [PATCH 11/15] remove unused refs to seam taglib

---
 .../resources/org/zanata/webtrans/public/Application.xhtml     | 1 -
 .../main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml | 1 -
 .../WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml   | 1 -
 .../src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml     | 1 -
 .../main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml   | 3 +--
 .../src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml    | 1 -
 .../src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml    | 1 -
 .../src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml       | 1 -
 .../main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml | 3 +--
 zanata-war/src/main/webapp/WEB-INF/layout/display.xhtml        | 3 +--
 .../src/main/webapp/WEB-INF/layout/language/members-tab.xhtml  | 1 -
 .../webapp/WEB-INF/layout/language/new_language_modal.xhtml    | 1 -
 .../webapp/WEB-INF/layout/language/request_join_modal.xhtml    | 1 -
 .../webapp/WEB-INF/layout/language/search_user_modal.xhtml     | 1 -
 .../main/webapp/WEB-INF/layout/project/languages-list.xhtml    | 1 -
 .../webapp/WEB-INF/layout/project/settings-tab-languages.xhtml | 1 -
 .../src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml  | 1 -
 .../WEB-INF/layout/project/validation-settings-block.xhtml     | 3 +--
 .../src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml  | 1 -
 .../src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml   | 1 -
 .../src/main/webapp/WEB-INF/layout/search/users-tab.xhtml      | 1 -
 .../main/webapp/WEB-INF/layout/version-group/edit_form.xhtml   | 1 -
 .../webapp/WEB-INF/layout/version-group/languages-tab.xhtml    | 1 -
 .../webapp/WEB-INF/layout/version-group/projects-tab.xhtml     | 1 -
 .../WEB-INF/layout/version-group/request_join_modal.xhtml      | 1 -
 .../webapp/WEB-INF/layout/version-group/settings-tab.xhtml     | 1 -
 .../src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml | 1 -
 .../src/main/webapp/WEB-INF/layout/version/edit_form.xhtml     | 1 -
 .../src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml    | 1 -
 .../src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml | 1 -
 .../webapp/WEB-INF/layout/version/settings-tab-languages.xhtml | 1 -
 .../src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml  | 1 -
 .../WEB-INF/layout/version/zip_download_progress_modal.xhtml   | 1 -
 zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml  | 1 -
 zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml       | 1 -
 zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml      | 3 +--
 zanata-war/src/main/webapp/WEB-INF/template/template.xhtml     | 3 +--
 .../src/main/webapp/WEB-INF/template/template_nobanner.xhtml   | 1 -
 .../main/webapp/account/google_password_reset_request.xhtml    | 1 -
 zanata-war/src/main/webapp/account/inactive_account.xhtml      | 1 -
 zanata-war/src/main/webapp/account/login.xhtml                 | 1 -
 zanata-war/src/main/webapp/account/register.xhtml              | 1 -
 zanata-war/src/main/webapp/admin/home.xhtml                    | 1 -
 zanata-war/src/main/webapp/admin/processmanager.xhtml          | 1 -
 zanata-war/src/main/webapp/admin/rolemanager.xhtml             | 3 +--
 zanata-war/src/main/webapp/admin/stats.xhtml                   | 1 -
 zanata-war/src/main/webapp/admin/usermanager.xhtml             | 1 -
 zanata-war/src/main/webapp/error.xhtml                         | 1 -
 zanata-war/src/main/webapp/glossary/view.xhtml                 | 3 +--
 zanata-war/src/main/webapp/language/home.xhtml                 | 1 -
 zanata-war/src/main/webapp/profile/home.xhtml                  | 1 -
 zanata-war/src/main/webapp/project/add_iteration.xhtml         | 1 -
 zanata-war/src/main/webapp/project/create_project.xhtml        | 1 -
 zanata-war/src/main/webapp/project/home.xhtml                  | 1 -
 zanata-war/src/main/webapp/project/project.xhtml               | 1 -
 .../src/main/webapp/resources/zanata/activity-entry.xhtml      | 1 -
 zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml | 1 -
 zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml     | 1 -
 .../src/main/webapp/resources/zanata/global-messages.xhtml     | 1 -
 zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml  | 1 -
 zanata-war/src/main/webapp/resources/zanata/loader.xhtml       | 1 -
 .../src/main/webapp/resources/zanata/maintainers-tab.xhtml     | 1 -
 .../src/main/webapp/resources/zanata/multi-file-upload.xhtml   | 3 +--
 .../src/main/webapp/resources/zanata/project-label.xhtml       | 3 +--
 .../src/main/webapp/resources/zanata/select-all-checkbox.xhtml | 1 -
 zanata-war/src/main/webapp/resources/zanata/statistic.xhtml    | 3 +--
 .../src/main/webapp/resources/zanata/version-label.xhtml       | 3 +--
 zanata-war/src/main/webapp/search.xhtml                        | 1 -
 zanata-war/src/main/webapp/tm/home.xhtml                       | 1 -
 .../src/main/webapp/version-group/create_version_group.xhtml   | 1 -
 zanata-war/src/main/webapp/version-group/home.xhtml            | 1 -
 zanata-war/src/main/webapp/version-group/version_group.xhtml   | 1 -
 72 files changed, 12 insertions(+), 84 deletions(-)

diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
index 34fd9cebae..64bfc0dac9 100644
--- a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
+++ b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
@@ -6,7 +6,6 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:a="http://richfaces.org/a4j"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j">
   <html class="new-zanata-html">
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 713c55e8bc..05229c0619 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
@@ -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:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
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 90e9212005..1749701304 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
@@ -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:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
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 22e8257273..4e77d0cdc7 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
@@ -1,6 +1,5 @@
 <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:h="http://java.sun.com/jsf/html">
 
   <script type="text/javascript">
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 e49e23abe0..6a8e14d457 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
@@ -1,8 +1,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:a4j="http://richfaces.org/a4j"
-  xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
+  xmlns:h="http://java.sun.com/jsf/html">
 
 
   <div class="modal" id="copy-trans-modal" tabindex="-1"
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 7feb7f9633..b08e4f4d6f 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
@@ -1,5 +1,4 @@
 <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:a4j="http://richfaces.org/a4j"
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 679c46cd7d..3e510261f4 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
@@ -1,5 +1,4 @@
 <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"
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 b9a4602d9e..0dedf24177 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,6 +1,5 @@
 <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"
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 6780b666b5..836f178724 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
@@ -1,8 +1,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:a4j="http://richfaces.org/a4j"
-  xmlns:h="http://java.sun.com/jsf/html"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
+  xmlns:h="http://java.sun.com/jsf/html">
 
 
 
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/display.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/display.xhtml
index a212c988e7..af37edf38f 100644
--- a/zanata-war/src/main/webapp/WEB-INF/layout/display.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/layout/display.xhtml
@@ -1,8 +1,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:f="http://java.sun.com/jsf/core"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
+  xmlns:f="http://java.sun.com/jsf/core">
 
   <div class="prop"><span class="name"> <ui:insert
     name="label"/> </span> <span class="value"> <ui:insert/> </span></div>
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 d96ac6eb2a..72b3e52194 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
@@ -2,7 +2,6 @@
   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"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:a4j="http://richfaces.org/a4j">
 
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 9bd2d80180..4d499fc41a 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
@@ -2,7 +2,6 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:a4j="http://richfaces.org/a4j"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
   class="modal" id="newLanguageDialog" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true">
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 86b40248f9..7f290be4c8 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
@@ -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:rich="http://richfaces.org/rich"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:a4j="http://richfaces.org/a4j"
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 06534c12db..bb4b9a651a 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
@@ -3,7 +3,6 @@
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:a4j="http://richfaces.org/a4j"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   xmlns:rich="http://richfaces.org/rich"
   class="modal" id="searchUserDialog" tabindex="-1" role="dialog"
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 0c8c86b52b..e3c80c854a 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
@@ -3,7 +3,6 @@
   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:f="http://java.sun.com/jsf/core"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
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 72df729726..a1d5d6312b 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
@@ -2,7 +2,6 @@
   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"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
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 908ee1116a..d76ad736e9 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
@@ -3,7 +3,6 @@
   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">
 
 <script type="text/javascript">
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 e03dec6b24..fd43382c8d 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
@@ -21,8 +21,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:a4j="http://richfaces.org/a4j"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
+  xmlns:a4j="http://richfaces.org/a4j">
 
 <script type="text/javascript">
   //<![CDATA[
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 5c54797bfe..910585c53e 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
@@ -1,5 +1,4 @@
 <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:zanata="http://java.sun.com/jsf/composite/zanata"
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 1830bef799..7f1ad2a3c8 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
@@ -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"
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 9ecb83febc..68d4f23da4 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
@@ -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"
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 d82242eceb..fc32adf30a 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,6 +1,5 @@
 <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"
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 fd01e9078f..7834d54e4f 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
@@ -1,5 +1,4 @@
 <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:zanata="http://java.sun.com/jsf/composite/zanata"
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 cbaf8ba4d7..a672036ad6 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
@@ -1,5 +1,4 @@
 <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:zanata="http://java.sun.com/jsf/composite/zanata"
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 ab842ee16d..0de3523a07 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
@@ -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:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
   xmlns:ui="http://java.sun.com/jsf/facelets"
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 279119f9ec..d990e4b8d4 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
@@ -3,7 +3,6 @@
   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:f="http://java.sun.com/jsf/core"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
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 b431b33907..44614d9617 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
@@ -1,5 +1,4 @@
 <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:zanata="http://java.sun.com/jsf/composite/zanata"
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 8f674f2350..56a0ac6966 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,6 +1,5 @@
 <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"
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 2946a667c2..92bee37406 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
@@ -1,6 +1,5 @@
 <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:f="http://java.sun.com/jsf/core"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
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 62b6017a3e..85c6792e80 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
@@ -1,5 +1,4 @@
 <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:zanata="http://java.sun.com/jsf/composite/zanata"
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 67fb5e2034..049055153c 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
@@ -2,7 +2,6 @@
   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"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
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 e0ef78022f..10c5404efe 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
@@ -3,7 +3,6 @@
   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:f="http://java.sun.com/jsf/core"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
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 3b411de5db..7589950c91 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
@@ -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:a4j="http://richfaces.org/a4j"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:ui="http://java.sun.com/jsf/facelets"
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 d855cb4849..021bb318a5 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
@@ -4,7 +4,6 @@
   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"
   xmlns:rich="http://richfaces.org/rich">
 
   <h:form>
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 4ccd84d959..7e6a8e311d 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/footer.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:f="http://java.sun.com/jsf/core">
 
   <footer role="contentinfo" class="l--push--v-2">
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 f9eed7cf26..d1da93a2e0 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
@@ -1,8 +1,7 @@
 <f:view contentType="text/html" xmlns="http://www.w3.org/1999/xhtml"
   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:s="http://jboss.org/schema/seam/taglib">
+  xmlns:ui="http://java.sun.com/jsf/facelets">
   <ui:fragment
     rendered="#{not empty applicationConfiguration.piwikUrl and not empty applicationConfiguration.piwikIdSite}">
     <!-- Piwik -->
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 fc005787a0..8b31f269ac 100755
--- a/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
@@ -6,8 +6,7 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:a4j="http://richfaces.org/a4j"
-  xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
   <!--[if lt IE 7]>      <html class="no-js new-zanata lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
   <!--[if IE 7]>         <html class="no-js new-zanata lt-ie9 lt-ie8"> <![endif]-->
   <!--[if IE 8]>         <html class="no-js new-zanata lt-ie9"> <![endif]-->
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
index 9acabcb5ea..e19e42a7d8 100644
--- a/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
+++ b/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
@@ -6,7 +6,6 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:a="http://richfaces.org/a4j"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j">
   <!--[if lt IE 7]>      <html class="no-js new-zanata lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
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 eca6dca991..8356bb8511 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
@@ -1,5 +1,4 @@
 <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:a4j="http://richfaces.org/a4j"
diff --git a/zanata-war/src/main/webapp/account/inactive_account.xhtml b/zanata-war/src/main/webapp/account/inactive_account.xhtml
index 78ceace67c..52461151c4 100644
--- a/zanata-war/src/main/webapp/account/inactive_account.xhtml
+++ b/zanata-war/src/main/webapp/account/inactive_account.xhtml
@@ -3,7 +3,6 @@
   xmlns:h="http://java.sun.com/jsf/html"
   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">
 
diff --git a/zanata-war/src/main/webapp/account/login.xhtml b/zanata-war/src/main/webapp/account/login.xhtml
index 0680f4aa78..6a3d98605e 100644
--- a/zanata-war/src/main/webapp/account/login.xhtml
+++ b/zanata-war/src/main/webapp/account/login.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:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
diff --git a/zanata-war/src/main/webapp/account/register.xhtml b/zanata-war/src/main/webapp/account/register.xhtml
index 3b618267cc..b46064a309 100644
--- a/zanata-war/src/main/webapp/account/register.xhtml
+++ b/zanata-war/src/main/webapp/account/register.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:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
diff --git a/zanata-war/src/main/webapp/admin/home.xhtml b/zanata-war/src/main/webapp/admin/home.xhtml
index b34548ce7d..733076196c 100644
--- a/zanata-war/src/main/webapp/admin/home.xhtml
+++ b/zanata-war/src/main/webapp/admin/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:h="http://java.sun.com/jsf/html"
   template="../WEB-INF/template/template.xhtml">
diff --git a/zanata-war/src/main/webapp/admin/processmanager.xhtml b/zanata-war/src/main/webapp/admin/processmanager.xhtml
index dffb9c74a4..fe792580d1 100644
--- a/zanata-war/src/main/webapp/admin/processmanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/processmanager.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:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
diff --git a/zanata-war/src/main/webapp/admin/rolemanager.xhtml b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
index 7976f43f1b..4ea8e4ce4a 100644
--- a/zanata-war/src/main/webapp/admin/rolemanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -3,8 +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">
+  xmlns:a4j="http://richfaces.org/a4j">
 
 <ui:composition template="../WEB-INF/template/template.xhtml">
 
diff --git a/zanata-war/src/main/webapp/admin/stats.xhtml b/zanata-war/src/main/webapp/admin/stats.xhtml
index 18b7c9b419..296ba59e2c 100644
--- a/zanata-war/src/main/webapp/admin/stats.xhtml
+++ b/zanata-war/src/main/webapp/admin/stats.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:a4j="http://richfaces.org/a4j"
   xmlns:f="http://java.sun.com/jsf/core"
diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
index a566564621..9b34cc2ed1 100644
--- a/zanata-war/src/main/webapp/admin/usermanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -5,7 +5,6 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:a4j="http://richfaces.org/a4j"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
 <ui:composition template="../WEB-INF/template/template.xhtml">
diff --git a/zanata-war/src/main/webapp/error.xhtml b/zanata-war/src/main/webapp/error.xhtml
index bdc69545b9..f4a52d2fc3 100644
--- a/zanata-war/src/main/webapp/error.xhtml
+++ b/zanata-war/src/main/webapp/error.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:h="http://java.sun.com/jsf/html"
   template="WEB-INF/template/template.xhtml">
diff --git a/zanata-war/src/main/webapp/glossary/view.xhtml b/zanata-war/src/main/webapp/glossary/view.xhtml
index 5934507443..6232785cc3 100644
--- a/zanata-war/src/main/webapp/glossary/view.xhtml
+++ b/zanata-war/src/main/webapp/glossary/view.xhtml
@@ -6,8 +6,7 @@
   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:s="http://jboss.org/schema/seam/taglib">
+  xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
 <ui:composition template="../WEB-INF/template/template.xhtml">
 
diff --git a/zanata-war/src/main/webapp/language/home.xhtml b/zanata-war/src/main/webapp/language/home.xhtml
index 1fc89c1aa2..cabd67f8a4 100644
--- a/zanata-war/src/main/webapp/language/home.xhtml
+++ b/zanata-war/src/main/webapp/language/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"
diff --git a/zanata-war/src/main/webapp/profile/home.xhtml b/zanata-war/src/main/webapp/profile/home.xhtml
index 0f6de596d6..a97fc74c73 100644
--- a/zanata-war/src/main/webapp/profile/home.xhtml
+++ b/zanata-war/src/main/webapp/profile/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:h="http://java.sun.com/jsf/html"
   xmlns:ui="http://java.sun.com/jsf/facelets"
   template="../WEB-INF/template/template.xhtml">
diff --git a/zanata-war/src/main/webapp/project/add_iteration.xhtml b/zanata-war/src/main/webapp/project/add_iteration.xhtml
index 4db5ffc93e..273559b807 100644
--- a/zanata-war/src/main/webapp/project/add_iteration.xhtml
+++ b/zanata-war/src/main/webapp/project/add_iteration.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"
diff --git a/zanata-war/src/main/webapp/project/create_project.xhtml b/zanata-war/src/main/webapp/project/create_project.xhtml
index 0edb429bb6..a4440fbc30 100644
--- a/zanata-war/src/main/webapp/project/create_project.xhtml
+++ b/zanata-war/src/main/webapp/project/create_project.xhtml
@@ -3,7 +3,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"
   template="../WEB-INF/template/template.xhtml">
 
   <ui:define
diff --git a/zanata-war/src/main/webapp/project/home.xhtml b/zanata-war/src/main/webapp/project/home.xhtml
index 222b32b75c..609142ccd3 100644
--- a/zanata-war/src/main/webapp/project/home.xhtml
+++ b/zanata-war/src/main/webapp/project/home.xhtml
@@ -1,7 +1,6 @@
 <!DOCTYPE html 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"
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index a65558e95b..862c2b39ec 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.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:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
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 bd0f9116b7..2bc997b4b4 100644
--- a/zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
@@ -3,7 +3,6 @@
 <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"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
diff --git a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
index 1e858374cd..f678508ed9 100644
--- a/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
@@ -5,7 +5,6 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:a4j="http://richfaces.org/a4j"
   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">
 
 <composite:interface>
diff --git a/zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml b/zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
index 98415d673f..c4309ebed8 100644
--- a/zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/checkbox.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:ui="http://java.sun.com/jsf/facelets"
   xmlns:h="http://java.sun.com/jsf/html">
 
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 6ddd66094c..5c97c8a141 100644
--- a/zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/global-messages.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:ui="http://java.sun.com/jsf/facelets">
 
 <composite:interface>
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 0602368fd6..0676c44bf9 100644
--- a/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
@@ -3,7 +3,6 @@
 <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">
diff --git a/zanata-war/src/main/webapp/resources/zanata/loader.xhtml b/zanata-war/src/main/webapp/resources/zanata/loader.xhtml
index 6f8d60db17..8355b5cc69 100644
--- a/zanata-war/src/main/webapp/resources/zanata/loader.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/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:a4j="http://richfaces.org/a4j">
 
 <composite:interface>
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 0ee1c1d2e4..bad5b33f2f 100644
--- a/zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
@@ -3,7 +3,6 @@
 <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"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:a4j="http://richfaces.org/a4j"
diff --git a/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml b/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
index b5b68d35dd..a4bf76e345 100644
--- a/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
@@ -28,8 +28,7 @@ site: http://www.fsf.org.
   xmlns:composite="http://java.sun.com/jsf/composite"
   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">
+  xmlns:rich="http://richfaces.org/rich">
 
 <composite:interface>
   <composite:attribute name="url"
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 49d6de3753..e5a1493160 100644
--- a/zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
@@ -23,8 +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">
+      xmlns:ui="http://java.sun.com/jsf/facelets">
 
 <composite:interface>
     <composite:attribute name="project" type="org.zanata.model.HProject"
diff --git a/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml b/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
index a8d91b098c..8c1c94643c 100644
--- a/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.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:h="http://java.sun.com/jsf/html">
 
 <composite:interface shortDescription="Adds a checkbox used to select or deselect
diff --git a/zanata-war/src/main/webapp/resources/zanata/statistic.xhtml b/zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
index aacfc751e9..beb7f99f8c 100644
--- a/zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
@@ -3,8 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:composite="http://java.sun.com/jsf/composite"
-  xmlns:ui="http://java.sun.com/jsf/facelets"
-  xmlns:s="http://jboss.org/schema/seam/taglib">
+  xmlns:ui="http://java.sun.com/jsf/facelets">
 
 <composite:interface>
   <composite:attribute name="value"
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 c81fedda9b..5b91fd35ac 100644
--- a/zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
+++ b/zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
@@ -2,8 +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">
+      xmlns:ui="http://java.sun.com/jsf/facelets">
 
 <composite:interface>
     <composite:attribute name="version" type="org.zanata.model.HProjectIteration"
diff --git a/zanata-war/src/main/webapp/search.xhtml b/zanata-war/src/main/webapp/search.xhtml
index c5fc11666f..81be81e6aa 100644
--- a/zanata-war/src/main/webapp/search.xhtml
+++ b/zanata-war/src/main/webapp/search.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:h="http://java.sun.com/jsf/html"
   template="/WEB-INF/template/template.xhtml">
diff --git a/zanata-war/src/main/webapp/tm/home.xhtml b/zanata-war/src/main/webapp/tm/home.xhtml
index 36decc9744..a15146b426 100644
--- a/zanata-war/src/main/webapp/tm/home.xhtml
+++ b/zanata-war/src/main/webapp/tm/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"
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 470d9ca297..cd6b55dd70 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
@@ -3,7 +3,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"
   template="../WEB-INF/template/template.xhtml">
 
   <ui:define
diff --git a/zanata-war/src/main/webapp/version-group/home.xhtml b/zanata-war/src/main/webapp/version-group/home.xhtml
index e79b3589db..f9f75828c8 100644
--- a/zanata-war/src/main/webapp/version-group/home.xhtml
+++ b/zanata-war/src/main/webapp/version-group/home.xhtml
@@ -6,7 +6,6 @@
   xmlns:f="http://java.sun.com/jsf/core"
   xmlns:rich="http://richfaces.org/rich"
   xmlns:a4j="http://richfaces.org/a4j"
-  xmlns:s="http://jboss.org/schema/seam/taglib"
   xmlns:fn="http://java.sun.com/jsp/jstl/functions"
   template="../WEB-INF/template/template_2x.xhtml">
 
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 428dd52426..379f391253 100644
--- a/zanata-war/src/main/webapp/version-group/version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/version_group.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"

From 891b5db8fca86f1e9f8d6354eb6f7cce967622e5 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Wed, 23 Sep 2015 14:34:03 +1000
Subject: [PATCH 12/15] fix(jsf) - class should be styleClass in h:panelGroup

---
 .../webapp/WEB-INF/layout/version-group/projects-tab.xhtml  | 2 +-
 zanata-war/src/main/webapp/iteration/view.xhtml             | 6 +++---
 zanata-war/src/main/webapp/language/language.xhtml          | 2 +-
 zanata-war/src/main/webapp/project/project.xhtml            | 2 +-
 zanata-war/src/main/webapp/search.xhtml                     | 4 ++--
 zanata-war/src/main/webapp/tm/home.xhtml                    | 2 +-
 .../src/main/webapp/version-group/version_group.xhtml       | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

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 a672036ad6..8d1acc3db5 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
@@ -161,7 +161,7 @@
       <zanata:loader jsHandle="true" layout="inline" type="loader--small" visible="false"
         id="projectsTab-project-label-loader"/>
 
-      <h:panelGroup id="project-label" class="i__text--right">
+      <h:panelGroup id="project-label" styleClass="i__text--right">
         #{versionGroupHomeAction.selectedVersion.project.slug}
       </h:panelGroup>
       #{msgs['Languages']}
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index 01d51d2d58..8769dadfc5 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -286,7 +286,7 @@
           <i class="i i--language"></i>
           <span class="is-hidden--s i__text--right">
             #{msgs['jsf.Languages']}
-            <h:panelGroup class="txt--neutral" id="languages-size">
+            <h:panelGroup styleClass="txt--neutral" id="languages-size">
               #{versionHomeAction.getSupportedLocale().size}
             </h:panelGroup>
           </span>
@@ -299,7 +299,7 @@
           <i class="i i--document"></i>
           <span class="is-hidden--s i__text--right">
             #{msgs['jsf.Documents']}
-            <h:panelGroup class="txt--neutral" id="documents-size">
+            <h:panelGroup styleClass="txt--neutral" id="documents-size">
               #{versionHomeAction.getDocuments().size}
             </h:panelGroup>
           </span>
@@ -313,7 +313,7 @@
             <i class="i i--group"></i>
             <span class="is-hidden--s i__text--right">
               #{msgs['jsf.Groups']}
-              <h:panelGroup class="txt--neutral" id="groups-size">
+              <h:panelGroup styleClass="txt--neutral" id="groups-size">
                 #{versionHomeAction.groups.size}
               </h:panelGroup>
             </span>
diff --git a/zanata-war/src/main/webapp/language/language.xhtml b/zanata-war/src/main/webapp/language/language.xhtml
index 076ad93e12..0c47705f5f 100644
--- a/zanata-war/src/main/webapp/language/language.xhtml
+++ b/zanata-war/src/main/webapp/language/language.xhtml
@@ -85,7 +85,7 @@
                 <i class="i i--users"></i>
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Members']}
-                <h:panelGroup class="txt--neutral" id="members-size">
+                <h:panelGroup styleClass="txt--neutral" id="members-size">
                   #{languageAction.localeMembers.size}
                 </h:panelGroup>
               </span>
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index 862c2b39ec..7fd8533fae 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.xhtml
@@ -151,7 +151,7 @@
           <i class="i i--version"></i>
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Versions']}
-                <h:panelGroup class="txt--neutral" id="versions-size">
+                <h:panelGroup styleClass="txt--neutral" id="versions-size">
                   #{projectHomeAction.getProjectVersions().size}
                 </h:panelGroup>
               </span>
diff --git a/zanata-war/src/main/webapp/search.xhtml b/zanata-war/src/main/webapp/search.xhtml
index 81be81e6aa..8f41935678 100644
--- a/zanata-war/src/main/webapp/search.xhtml
+++ b/zanata-war/src/main/webapp/search.xhtml
@@ -25,7 +25,7 @@
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Projects']}
               </span>
-                <h:panelGroup class="txt--neutral" id="projects-size">
+                <h:panelGroup styleClass="txt--neutral" id="projects-size">
                   #{zanataSearch.getTotalProjectCount()}
                 </h:panelGroup>
               </a>
@@ -38,7 +38,7 @@
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Users']}
               </span>
-                <h:panelGroup class="txt--neutral" id="users-size">
+                <h:panelGroup styleClass="txt--neutral" id="users-size">
                   #{zanataSearch.getTotalUserCount()}
                 </h:panelGroup>
               </a>
diff --git a/zanata-war/src/main/webapp/tm/home.xhtml b/zanata-war/src/main/webapp/tm/home.xhtml
index a15146b426..2c0aade909 100644
--- a/zanata-war/src/main/webapp/tm/home.xhtml
+++ b/zanata-war/src/main/webapp/tm/home.xhtml
@@ -239,7 +239,7 @@
                       <div class="list__item__info">
                         <h3 class="list__title">
                           #{tm.slug}
-                          <h:panelGroup class="badge l--push-left-quarter" id="tm-size"
+                          <h:panelGroup styleClass="badge l--push-left-quarter" id="tm-size"
                             title="#{msgs['jsf.transmemory.NoOfEntries']}">
                             #{translationMemoryAction.getTranslationMemorySize(tm.slug)}
                           </h:panelGroup>
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 379f391253..e6e9420063 100644
--- a/zanata-war/src/main/webapp/version-group/version_group.xhtml
+++ b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -170,7 +170,7 @@
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Languages']}
               </span>
-            <h:panelGroup class="txt--neutral" id="languages-size">
+            <h:panelGroup styleClass="txt--neutral" id="languages-size">
               #{versionGroupHomeAction.activeLocales.size}
             </h:panelGroup>
           </a>
@@ -196,7 +196,7 @@
               <span class="is-hidden--s i__text--right">
                 #{msgs['jsf.Maintainers']}
               </span>
-            <h:panelGroup class="txt--neutral" id="maintainers-size">
+            <h:panelGroup styleClass="txt--neutral" id="maintainers-size">
               #{versionGroupHome.instance.maintainers.size}
             </h:panelGroup>
           </a>

From f2cca68b1a9c796507708595a387551a7605fab1 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Wed, 23 Sep 2015 15:45:04 +1000
Subject: [PATCH 13/15] disable upload button when user clear upload file

---
 .../java/org/zanata/action/GlossaryAction.java     |  4 ++++
 .../java/org/zanata/action/VersionHomeAction.java  | 14 +++++++++++---
 .../layout/glossary/upload_glossary_modal.xhtml    |  4 ++++
 .../layout/version/upload_translation_modal.xhtml  |  2 ++
 zanata-war/src/main/webapp/iteration/view.xhtml    |  7 ++++++-
 5 files changed, 27 insertions(+), 4 deletions(-)

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 c8ec7a8730..4c2848fa43 100644
--- a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
@@ -166,6 +166,10 @@ public void glossaryFileUploaded(FileUploadEvent event) throws IOException {
         glossaryFileUpload.setFileName(uploadedFile.getName());
     }
 
+    public void glossaryFileCleared() {
+        glossaryFileUpload = new GlossaryFileUploadHelper();
+    }
+
     /**
      * Helper class to upload glossary files.
      */
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 ddf5f8ffc7..9ea150b433 100644
--- a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
@@ -772,8 +772,8 @@ public String sourceExtensionOf(String docPath, String docName) {
     public String translationExtensionOf(String docPath, String docName) {
         return "."
             + translationFileServiceImpl.getTranslationFileExtension(
-            projectSlug,
-            versionSlug, docPath, docName);
+                projectSlug,
+                versionSlug, docPath, docName);
     }
 
     public boolean hasOriginal(String docPath, String docName) {
@@ -973,7 +973,7 @@ public boolean needDocumentTypeSelection(String fileName) {
 
     public List<DocumentType> getDocumentTypes(String fileName) {
         return Lists.newArrayList(
-            translationFileServiceImpl.getDocumentTypes(fileName));
+                translationFileServiceImpl.getDocumentTypes(fileName));
     }
 
     public void setDefaultTranslationDocType(String fileName) {
@@ -1067,12 +1067,20 @@ public void sourceFileUploaded(FileUploadEvent event) throws IOException {
 
     }
 
+    public void sourceFileCleared() {
+        sourceFileUpload = new SourceFileUploadHelper();
+    }
+
     public void transFileUploaded(FileUploadEvent event) throws IOException {
         UploadedFile uploadedFile = event.getUploadedFile();
         translationFileUpload.setFileName(uploadedFile.getName());
         translationFileUpload.setFileContents(uploadedFile.getInputStream());
     }
 
+    public void transFileCleared() {
+        translationFileUpload = new TranslationFileUploadHelper();
+    }
+
     private class DocumentFilter extends InMemoryListFilter<HDocument> {
         private DocumentDAO documentDAO =
                 ServiceLocator.instance().getInstance(DocumentDAO.class);
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 cb95fc2ac6..25cb607f02 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
@@ -2,6 +2,7 @@
   xmlns:h="http://java.sun.com/jsf/html"
   xmlns:c="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"
   class="modal" id="glossaryUploadDialog" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true">
@@ -106,12 +107,15 @@
         <div class="form__item txt--understated" id="message">
           <span>#{msgs['jsf.Glossary.supportedFileFormat']}</span>
         </div>
+
+        <a4j:jsFunction name="clearSelection" action="#{glossaryAction.glossaryFileCleared}"/>
         <div class="form__item">
           <rich:fileUpload id="upload-file"
             fileUploadListener="#{glossaryAction.glossaryFileUploaded}"
             onfilesubmit="onGlossaryFileSubmitted()"
             addControlLabel="Select file..." clearAllLabel="Clear all" clearLabel="Clear"
             uploadLabel="upload" immediateUpload="true" maxFilesQuantity="1"
+            onclear="clearSelection();enableUploadGlossaryButton(false);"
             listHeight="100"
             />
         </div>
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 6e419d6677..2f39e551a8 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
@@ -105,12 +105,14 @@
         <div class="l--pad-top-quarter form__item txt--understated" id="uploadPanelMsg"></div>
 
         <div class="form__item">
+          <a4j:jsFunction name="clearTransFileUpload" action="#{versionHomeAction.transFileCleared}"/>
           <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"
+            onclear="clearTransFileUpload();setUploadTranslationDocButtonEnabled(false);"
             />
 
         </div>
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index 8769dadfc5..f9a25fc51a 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -74,6 +74,8 @@
   .
     show();
     checkIfFileSelected();
+
+    setUploadSourceButtonEnabled(false);
   }
 
   function hideUploadSourcePanel() {
@@ -454,11 +456,14 @@
     <h:outputText id="uploadSourcePanelHeader"/>
   </f:facet>
   <h:form id="uploadSrcForm" >
+    <a4j:jsFunction name="clearSourceUpload" action="#{versionHomeAction.sourceFileCleared}"/>
+
     <rich:fileUpload
       fileUploadListener="#{versionHomeAction.sourceFileUploaded}"
       addControlLabel="Select file..." clearAllLabel="Clear all" clearLabel="Clear"
       uploadLabel="upload" immediateUpload="true" maxFilesQuantity="1" listHeight="60"
-
+      onclear="clearSourceUpload();setUploadSourceButtonEnabled(false);"
+      onfilesubmit="setUploadSourceButtonEnabled(true);"
       />
     <h:inputHidden id="uploadSourceDocId"
       value="#{versionHomeAction.sourceFileUpload.docId}"/>

From 12b288884afe6b5a4278d9cf7b072cae228a6769 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Wed, 9 Sep 2015 16:23:26 +1000
Subject: [PATCH 14/15] ZNTA-650 refactor - admin edit user/role doesn't need
 to use conversation scope

---
 .../java/org/zanata/action/RoleAction.java    | 27 ++++------
 .../java/org/zanata/action/UserAction.java    | 52 +++----------------
 zanata-war/src/main/webapp/WEB-INF/pages.xml  | 14 +++++
 .../src/main/webapp/admin/roledetail.xhtml    |  4 +-
 .../src/main/webapp/admin/rolemanager.xhtml   | 17 +++---
 .../src/main/webapp/admin/userdetail.xhtml    |  4 +-
 .../src/main/webapp/admin/usermanager.xhtml   | 10 ++--
 7 files changed, 48 insertions(+), 80 deletions(-)

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 e8a2536905..affe8badaa 100644
--- a/zanata-war/src/main/java/org/zanata/action/RoleAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/RoleAction.java
@@ -17,6 +17,7 @@
 import org.zanata.security.annotations.ZanataSecured;
 
 import static org.jboss.seam.ScopeType.CONVERSATION;
+import static org.jboss.seam.ScopeType.PAGE;
 import static org.jboss.seam.annotations.Install.APPLICATION;
 
 /**
@@ -24,7 +25,7 @@
  *         <a href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
  */
 @Name("zanataRoleAction")
-@Scope(CONVERSATION)
+@Scope(PAGE)
 @Install(precedence = APPLICATION)
 @ZanataSecured
 @CheckLoggedIn
@@ -40,16 +41,14 @@ public class RoleAction implements Serializable {
     @In
     ZanataIdentity identity;
 
-    @Begin
-    public void createRole() {
-        groups = new ArrayList<>();
-    }
-
-    @Begin
-    public void editRole(String role) {
-        this.originalRole = role;
-        this.role = role;
-        groups = identityManager.getRoleGroups(role);
+    public void loadRole() {
+        if (role == null) {
+            // creating new role
+            groups = new ArrayList<>();
+        } else {
+            this.originalRole = role;
+            groups = identityManager.getRoleGroups(role);
+        }
     }
 
     public String save() {
@@ -73,7 +72,6 @@ private String saveNewRole() {
                 identityManager.addRoleToGroup(role, r);
             }
 
-            Conversation.instance().end();
         }
 
         return "success";
@@ -96,14 +94,11 @@ 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";
+        return "success";
     }
 
     public String getRole() {
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 cefecd934d..e8d97b485d 100644
--- a/zanata-war/src/main/java/org/zanata/action/UserAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/UserAction.java
@@ -30,7 +30,6 @@
 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;
@@ -49,7 +48,7 @@
 import org.zanata.ui.faces.FacesMessages;
 
 import static javax.faces.application.FacesMessage.SEVERITY_ERROR;
-import static org.jboss.seam.ScopeType.CONVERSATION;
+import static org.jboss.seam.ScopeType.PAGE;
 import static org.jboss.seam.annotations.Install.APPLICATION;
 
 /**
@@ -60,7 +59,7 @@
  *         href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
 @Name("org.jboss.seam.security.management.userAction")
-@Scope(CONVERSATION)
+@Scope(PAGE)
 @Install(precedence = APPLICATION)
 public class UserAction implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -86,8 +85,6 @@ public class UserAction implements Serializable {
     @In
     private PersonDAO personDAO;
 
-    private boolean newUserFlag;
-
     private String originalUsername;
 
     @Getter
@@ -136,18 +133,9 @@ public String getName(String username) {
         return personDAO.findByUsername(username).getName();
     }
 
-    @Begin
-    public void createUser() {
-        roles = new ArrayList<>();
-        newUserFlag = true;
-    }
-
-    @Begin
-    public void editUser(String username) {
-        this.username = username;
+    public void loadUser() {
         roles = identityManager.getGrantedRoles(username);
         enabled = identityManager.isUserEnabled(username);
-        newUserFlag = false;
         originalUsername = username;
     }
 
@@ -156,7 +144,7 @@ public String save() {
         String newUsername = getUsername();
 
         // Allow user name changes when editing
-        if (!newUserFlag && !originalUsername.equals(newUsername)) {
+        if (!originalUsername.equals(newUsername)) {
             if (isNewUsernameValid(newUsername)) {
                 userAccountServiceImpl.editUsername(originalUsername,
                         newUsername);
@@ -171,11 +159,8 @@ public String save() {
         }
 
         String saveResult;
-        if (newUserFlag) {
-            saveResult = saveNewUser();
-        } else {
-            saveResult = saveExistingUser();
-        }
+
+        saveResult = saveExistingUser();
 
         if (usernameChanged) {
             String email = getEmail(newUsername);
@@ -186,27 +171,6 @@ public String save() {
         return saveResult;
     }
 
-    private String saveNewUser() {
-        if (password == null || !password.equals(confirm)) {
-            facesMessages.addToControl("password", "Passwords do not match");
-            return "failure";
-        }
-
-        boolean success = identityManager.createUser(username, password);
-
-        if (success) {
-            for (String role : roles) {
-                identityManager.grantRole(username, role);
-            }
-            if (!enabled) {
-                identityManager.disableUser(username);
-            }
-            Conversation.instance().end();
-            return "success";
-        }
-        return "failure";
-    }
-
     private String saveExistingUser() {
         // Check if a new password has been entered
         if (password != null && !"".equals(password)) {
@@ -238,7 +202,6 @@ private String saveExistingUser() {
             identityManager.disableUser(username);
         }
 
-        Conversation.instance().end();
         return "success";
     }
 
@@ -258,9 +221,8 @@ private boolean isNewUsernameValid(String username) {
         }
     }
 
-    @End
     public String cancel() {
-        return "/admin/usermanager";
+        return "success";
     }
 
     public String getUsername() {
diff --git a/zanata-war/src/main/webapp/WEB-INF/pages.xml b/zanata-war/src/main/webapp/WEB-INF/pages.xml
index ccbe29b397..bfc90136ed 100644
--- a/zanata-war/src/main/webapp/WEB-INF/pages.xml
+++ b/zanata-war/src/main/webapp/WEB-INF/pages.xml
@@ -178,11 +178,18 @@
   <page view-id="/admin/*" action="#{identity.checkRole('admin')}"></page>
 
   <page view-id="/admin/roledetail.xhtml">
+    <param name="role" value="#{zanataRoleAction.role}" />
+    <action execute="#{zanataRoleAction.loadRole()}" />
     <navigation from-action="#{zanataRoleAction.save}">
       <rule if-outcome="success">
         <redirect view-id="/admin/rolemanager.xhtml" />
       </rule>
     </navigation>
+    <navigation from-action="#{zanataRoleAction.cancel}">
+      <rule if-outcome="success">
+        <redirect view-id="/admin/rolemanager.xhtml" />
+      </rule>
+    </navigation>
   </page>
 
   <page view-id="/admin/rolemanager.xhtml" action="#{zanataRoleSearch.loadRoles}">
@@ -195,11 +202,18 @@
   </page>
 
   <page view-id="/admin/userdetail.xhtml">
+    <param name="username" value="#{userAction.username}" />
+    <action execute="#{userAction.loadUser()}"/>
     <navigation from-action="#{userAction.save}">
       <rule if-outcome="success">
         <redirect view-id="/admin/usermanager.xhtml" />
       </rule>
     </navigation>
+    <navigation from-action="#{userAction.cancel}">
+      <rule if-outcome="success">
+        <redirect view-id="/admin/usermanager.xhtml" />
+      </rule>
+    </navigation>
   </page>
 
   <page view-id="/admin/usermanager.xhtml" action="#{userSearch.loadUsers}">
diff --git a/zanata-war/src/main/webapp/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
index 379abc108d..f498795514 100644
--- a/zanata-war/src/main/webapp/admin/roledetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/roledetail.xhtml
@@ -3,7 +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:c="http://java.sun.com/jsf/core"
+  xmlns:f="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">
@@ -54,7 +54,7 @@
             <zanata:decorate id="groups" componentId="groupsField">
               <h:selectManyCheckbox id="groups" value="#{zanataRoleAction.groups}"
                 layout="pageDirection" styleClass="groups">
-                <c:selectItems value="#{identityManager.listRoles()}" var="role"
+                <f:selectItems value="#{identityManager.listRoles()}" var="role"
                   itemLabel="#{role}"/>
               </h:selectManyCheckbox>
             </zanata:decorate>
diff --git a/zanata-war/src/main/webapp/admin/rolemanager.xhtml b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
index 4ea8e4ce4a..c09fe26d21 100644
--- a/zanata-war/src/main/webapp/admin/rolemanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <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:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:a4j="http://richfaces.org/a4j"
+      xmlns:f="http://java.sun.com/jsf/core">
 
 <ui:composition template="../WEB-INF/template/template.xhtml">
 
   <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() {
@@ -40,7 +40,7 @@
                   aria-labelledby="dropdownContent">
                   <li>
                     <h:link styleClass="i__item--right"
-                      onclick="createRole()"
+                      outcome="/admin/roledetail.xhtml"
                       rendered="#{identity.hasPermission('seam.account', 'create', null)}"
                       value="#{msgs['jsf.CreateRole']}">
                       <i class="i i--plus i__item__icon"></i>
@@ -77,9 +77,7 @@
                       </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)}"
+                  <h:link outcome="/admin/roledetail.xhtml"
                     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">
@@ -89,7 +87,8 @@
                         </h3>
                       </div>
                     </div>
-                  </h:commandLink>
+                    <f:param name="role" value="#{zanataRoleSearch.selectedRole}" />
+                  </h:link>
                 </li>
               </ui:repeat>
             </ul>
diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
index f9fce15364..fd1a7f2f4d 100644
--- a/zanata-war/src/main/webapp/admin/userdetail.xhtml
+++ b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -3,7 +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:c="http://java.sun.com/jsf/core"
+  xmlns:f="http://java.sun.com/jsf/core"
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata"
   xmlns:s="http://jboss.org/schema/seam/taglib">
 
@@ -86,7 +86,7 @@
             <zanata:decorate id="roles" componentId="rolesField">
               <h:selectManyCheckbox id="roles" value="#{userAction.roles}"
                 layout="pageDirection" styleClass="checkbox">
-                <c:selectItems value="#{identityManager.listGrantableRoles()}" var="role"
+                <f:selectItems value="#{identityManager.listGrantableRoles()}" var="role"
                   itemLabel="#{role}"/>
               </h:selectManyCheckbox>
             </zanata:decorate>
diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
index 9b34cc2ed1..f5373ad94b 100644
--- a/zanata-war/src/main/webapp/admin/usermanager.xhtml
+++ b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -8,12 +8,9 @@
   xmlns:zanata="http://java.sun.com/jsf/composite/zanata">
 
 <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>
 
     <a4j:jsFunction name="deleteUser"
       action="#{userAction.deleteUser(username)}" render="usermanagerForm,
@@ -84,7 +81,7 @@
                     </div>
                   </div>
 
-                  <h:commandLink onclick="editUser('#{user}');return false"
+                  <h:link outcome="/admin/userdetail.xhtml"
                     disabled="#{not identity.hasPermission('seam.user', 'update')}">
                     <div class="list__item__content">
                       <div class="list__item__info">
@@ -107,7 +104,8 @@
                         </span>
                       </div>
                     </div>
-                  </h:commandLink>
+                    <f:param name="username" value="#{user}"/>
+                  </h:link>
                 </li>
               </ui:repeat>
             </ul>

From 72208c1fffaa52ec883a86a7cf9484c286d136d7 Mon Sep 17 00:00:00 2001
From: Patrick Huang <pahuang@redhat.com>
Date: Fri, 25 Sep 2015 16:06:22 +1000
Subject: [PATCH 15/15] rename method names

---
 .../src/main/java/org/zanata/action/GlossaryAction.java       | 2 +-
 .../src/main/java/org/zanata/action/VersionHomeAction.java    | 4 ++--
 .../WEB-INF/layout/glossary/upload_glossary_modal.xhtml       | 2 +-
 .../WEB-INF/layout/version/upload_translation_modal.xhtml     | 2 +-
 zanata-war/src/main/webapp/iteration/view.xhtml               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

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 4c2848fa43..a7a50e4001 100644
--- a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
@@ -166,7 +166,7 @@ public void glossaryFileUploaded(FileUploadEvent event) throws IOException {
         glossaryFileUpload.setFileName(uploadedFile.getName());
     }
 
-    public void glossaryFileCleared() {
+    public void clearGlossaryUpload() {
         glossaryFileUpload = new GlossaryFileUploadHelper();
     }
 
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 9ea150b433..e6c72a0e8f 100644
--- a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
@@ -1067,7 +1067,7 @@ public void sourceFileUploaded(FileUploadEvent event) throws IOException {
 
     }
 
-    public void sourceFileCleared() {
+    public void clearSourceFileUpload() {
         sourceFileUpload = new SourceFileUploadHelper();
     }
 
@@ -1077,7 +1077,7 @@ public void transFileUploaded(FileUploadEvent event) throws IOException {
         translationFileUpload.setFileContents(uploadedFile.getInputStream());
     }
 
-    public void transFileCleared() {
+    public void clearTransFileUpload() {
         translationFileUpload = new TranslationFileUploadHelper();
     }
 
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 25cb607f02..6284520f26 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
@@ -108,7 +108,7 @@
           <span>#{msgs['jsf.Glossary.supportedFileFormat']}</span>
         </div>
 
-        <a4j:jsFunction name="clearSelection" action="#{glossaryAction.glossaryFileCleared}"/>
+        <a4j:jsFunction name="clearSelection" action="#{glossaryAction.clearGlossaryUpload}"/>
         <div class="form__item">
           <rich:fileUpload id="upload-file"
             fileUploadListener="#{glossaryAction.glossaryFileUploaded}"
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 2f39e551a8..ac4afb8e3c 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
@@ -105,7 +105,7 @@
         <div class="l--pad-top-quarter form__item txt--understated" id="uploadPanelMsg"></div>
 
         <div class="form__item">
-          <a4j:jsFunction name="clearTransFileUpload" action="#{versionHomeAction.transFileCleared}"/>
+          <a4j:jsFunction name="clearTransFileUpload" action="#{versionHomeAction.clearTransFileUpload}"/>
           <rich:fileUpload id="upload-file"
             fileUploadListener="#{versionHomeAction.transFileUploaded}"
             onfilesubmit="onTranslationFileSubmitted()"
diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
index f9a25fc51a..d84f4d6f99 100644
--- a/zanata-war/src/main/webapp/iteration/view.xhtml
+++ b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -456,7 +456,7 @@
     <h:outputText id="uploadSourcePanelHeader"/>
   </f:facet>
   <h:form id="uploadSrcForm" >
-    <a4j:jsFunction name="clearSourceUpload" action="#{versionHomeAction.sourceFileCleared}"/>
+    <a4j:jsFunction name="clearSourceUpload" action="#{versionHomeAction.clearSourceFileUpload}"/>
 
     <rich:fileUpload
       fileUploadListener="#{versionHomeAction.sourceFileUploaded}"