diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
index ad96960684..4bce1c64b6 100644
--- a/zanata-war/src/main/resources/messages.properties
+++ b/zanata-war/src/main/resources/messages.properties
@@ -233,9 +233,6 @@ jsf.ManageMaintainers=Manage Maintainers
 ! "Copy Trans" refers to a specific feature that copies previous versions of translations to the current version.
 ! You may choose an appropriate short name to refer to this feature, or keep this name as-is.
 ! This string is used in other strings wherever #{messages['jsf.CopyTrans']} is found, to ensure that the name is used consistently.
-jsf.CopyTrans=Copy Trans
-jsf.copytrans.message=Copy Trans attempts to reuse translations that have been entered in Zanata by matching them with unstranslated strings in your project/version. Consequently, Copy Trans is best used before translation and review work is initiated on a project.
-jsf.copytrans.message2=Each translation has to pass through each of these checks before it will be copied.
 jsf.project.CopyTransOpts.tooltip=Set this project's default #{messages['jsf.CopyTrans']} settings.
 jsf.ProjectMaintainers=Project Maintainers
 jsf.NoMaintainersDefined=(No maintainers defined)
@@ -298,8 +295,14 @@ jsf.iteration.CopyTrans.Action.continue=Continue
 jsf.iteration.CopyTrans.Help.reject=Skip the translation and do not copy it.
 jsf.iteration.CopyTrans.Action.downgradeToFuzzy=Continue as Fuzzy
 jsf.iteration.CopyTrans.Help.downgradeToFuzzy=The translation is still considered for reuse, but it will be reused as fuzzy. Subsequent conditions will be checked.
-jsf.CopyTrans.Help.message=message=If all previous steps have passed, <span class="txt--success">copy as translated.</span>
-jsf.CopyTrans.Help.message2=Unless previously marked as <strong class="txt--unsure">fuzzy</strong>.
+jsf.CopyTrans=Copy Trans
+
+jsf.Copytrans.message=Copy Trans attempts to reuse translations that have been entered in Zanata by matching them with unstranslated strings in your project/version. Consequently, Copy Trans is best used before translation and review work is initiated on a project.
+jsf.Copytrans.message2=Each translation has to pass through each of these checks before it will be copied.
+
+jsf.CopyTrans.Action.message=message=If all previous steps have passed, <span class="txt--success">copy as translated.</span>
+jsf.CopyTrans.Action.message2=Unless previously marked as <strong class="txt--unsure">fuzzy</strong>.
+
 ! used in coloured display tiles
 #FIXME this is actually longer, may not be necessary or should be named better
 jsf.iteration.CopyTrans.Action.short.downgradeToFuzzy=Copy as Fuzzy
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 fac04230ed..7ea54c53fa 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,136 +1,161 @@
-<s:div xmlns:s="http://jboss.org/schema/seam/taglib"
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
   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:a4j="http://richfaces.org/a4j">
+  xmlns:s="http://jboss.org/schema/seam/taglib">
 
   <script type="text/javascript">
-    function actionSelected(radio, cellId) {
-      var cell = jQuery('#' + cellId);
-      var radioButton = jQuery(radio);
 
-      if (radioButton.val() == 'REJECT') {
-        jQuery(cell).attr('class', 'reject_action');
-        jQuery(cell).html("#{messages['jsf.iteration.CopyTrans.Action.reject']}");
-      }
-      else if (radioButton.val() == 'DOWNGRADE_TO_FUZZY') {
-        jQuery(cell).attr('class', 'downgrade_action');
-        jQuery(cell).html("#{messages['jsf.iteration.CopyTrans.Action.short.downgradeToFuzzy']}");
-      }
-      else if (radioButton.val() == 'IGNORE') {
-        jQuery(cell).attr('class', 'ignore_action');
-        jQuery(cell).html("#{messages['jsf.iteration.CopyTrans.Action.short.ignore']}");
-      }
-      else {
-        jQuery(cell).attr('class', '');
-        jQuery(cell).html('');
-      }
+    function onValueChanged(checkbox) {
+      bindCopyTransValue(jQuery(checkbox).attr("name"),
+        jQuery(checkbox).attr("value"))
     }
-
-    // initialize selected option colours
-    jQuery(function () {
-      actionSelected(jQuery("input[name='#{rich:clientId('projectMismatchAction')}']:checked"),
-        'projectMismatchCell');
-      actionSelected(jQuery("input[name='#{rich:clientId('contextMismatchAction')}']:checked"),
-        'contextMismatchCell');
-      actionSelected(jQuery("input[name='#{rich:clientId('documentIdMismatchAction')}']:checked"),
-        'documentIdMismatchCell');
-    });
   </script>
 
-  <!-- Simply needed to load jQuery -->
-  <rich:jQuery query="jquery"/>
-
-  <a4j:outputPanel id="copyTransOptionsPanel">
-    <rich:panel>
+  <ol class="list--slat">
+    <li>
+      <div class="g--tighter">
+        <div class="g__item w--3-8 l--push-bottom-quarter">
+          <p class="list__title">
+            #{messages['jsf.iteration.CopyTrans.Condition.onContentMismatch']}</p>
 
-      <table border="0" class="copy_trans_options_table" width="100%"
-        cellspacing="3px">
-        <tr>
-          <th>#{messages['jsf.iteration.CopyTrans.Condition']}</th>
-          <th colspan="2">#{messages['jsf.iteration.CopyTrans.Action']}</th>
-        </tr>
-        <tr>
-          <td
-            width="25%">1. #{messages['jsf.iteration.CopyTrans.Condition.onContentMismatch']}</td>
-          <td class="reject_action" width="15%">
+          <p class="txt--meta">
+            #{messages['jsf.iteration.CopyTrans.Condition.onContentMismatch.details']}</p>
+        </div>
+        <div class="g__item w--5-8 txt--align-right l--push-bottom-quarter">
+          <button class="button button--small button--danger" disabled="">
             #{messages['jsf.iteration.CopyTrans.Action.reject']}
-          </td>
-          <td width="60%">
-          </td>
-        </tr>
-        <tr>
-          <td>2. #{messages['jsf.iteration.CopyTrans.Condition.onContextMismatch']}</td>
-          <td id="contextMismatchCell">
-          </td>
-          <td>
-            <h:selectOneRadio id="contextMismatchAction"
-              value="#{copyTransOptionsModel.contextMismatchAction}"
-              onchange="actionSelected(this, 'contextMismatchCell');">
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.reject']}"
-                itemValue="REJECT"/>
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.downgradeToFuzzy']}"
-                itemValue="DOWNGRADE_TO_FUZZY"/>
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.ignore']}"
-                itemValue="IGNORE"/>
-            </h:selectOneRadio>
-          </td>
-        </tr>
-        <tr>
-          <td>3. #{messages['jsf.iteration.CopyTrans.Condition.onProjectMismatch']}</td>
-          <td id="projectMismatchCell">
-          </td>
-          <td>
-            <h:selectOneRadio id="projectMismatchAction"
-              value="#{copyTransOptionsModel.projectMismatchAction}"
-              onchange="actionSelected(this, 'projectMismatchCell');">
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.reject']}"
-                itemValue="REJECT"/>
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.downgradeToFuzzy']}"
-                itemValue="DOWNGRADE_TO_FUZZY"/>
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.ignore']}"
-                itemValue="IGNORE"/>
-            </h:selectOneRadio>
-          </td>
-        </tr>
-        <tr>
-          <td>4. #{messages['jsf.iteration.CopyTrans.Condition.onDocIdMismatch']}</td>
-          <td id="documentIdMismatchCell">
-          </td>
-          <td>
-            <h:selectOneRadio id="documentIdMismatchAction"
-              value="#{copyTransOptionsModel.docIdMismatchAction}"
-              onchange="actionSelected(this, 'documentIdMismatchCell');">
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.reject']}"
-                itemValue="REJECT"/>
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.downgradeToFuzzy']}"
-                itemValue="DOWNGRADE_TO_FUZZY"/>
-              <f:selectItem
-                itemLabel="#{messages['jsf.iteration.CopyTrans.Action.ignore']}"
-                itemValue="IGNORE"/>
-            </h:selectOneRadio>
-          </td>
-        </tr>
-        <tr>
-          <td>5. #{messages['jsf.iteration.CopyTrans.Condition.final']}</td>
-          <td class="translated_action">
-            #{messages['jsf.Translated']}
-          </td>
-          <td>
-          </td>
-        </tr>
-      </table>
+          </button>
+        </div>
+      </div>
+    </li>
+
+    <li>
+      <div class="g--tighter">
+        <div class="g__item w--3-8 l--push-bottom-quarter">
+          <p class="list__title">
+            #{messages['jsf.iteration.CopyTrans.Condition.onContextMismatch']}
+          </p>
+
+          <p class="txt--meta">
+            #{messages['jsf.iteration.CopyTrans.Condition.onContextMismatch.details']}
+          </p>
+        </div>
+        <div class="g__item w--5-8 txt--align-right l--push-bottom-quarter">
+          <div class="button--group">
+            <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
+              var="ruleAction">
+              <s:fragment
+                rendered="#{copyTransOptionsModel.contextMismatchAction ne ruleAction.action}">
+                <input id="contextMismatch--#{ruleAction.action}"
+                  name="contextMismatch"
+                  onclick="onValueChanged(this)"
+                  value="#{ruleAction.action}" type="radio"
+                  class="form__item__input"/>
+              </s:fragment>
+              <s:fragment
+                rendered="#{copyTransOptionsModel.contextMismatchAction eq ruleAction.action}">
+                <input id="contextMismatch--#{ruleAction.action}"
+                  name="contextMismatch"
+                  onclick="onValueChanged(this)"
+                  value="#{ruleAction.action}" type="radio"
+                  class="form__item__input"
+                  checked="true"/>
+              </s:fragment>
+              <label for="contextMismatch--#{ruleAction.action}"
+                class="button button--small #{ruleAction.css}">
+                #{ruleAction.displayText}
+              </label>
+            </ui:repeat>
+          </div>
+        </div>
+      </div>
+    </li>
+    <li>
+      <div class="g--tighter">
+        <div class="g__item w--3-8 l--push-bottom-quarter">
+          <p class="list__title">
+            #{messages['jsf.iteration.CopyTrans.Condition.onProjectMismatch']}
+          </p>
+
+          <p class="txt--meta">
+            #{messages['jsf.iteration.CopyTrans.Condition.onProjectMismatch.details']}
+          </p>
+        </div>
+        <div class="g__item w--5-8 txt--align-right l--push-bottom-quarter">
+          <div class="button--group">
+            <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
+              var="ruleAction">
+              <s:fragment
+                rendered="#{copyTransOptionsModel.projectMismatchAction ne ruleAction.action}">
+                <input id="projectMismatch--#{ruleAction.action}"
+                  name="projectMismatch"
+                  onclick="onValueChanged(this)"
+                  value="#{ruleAction.action}" type="radio"
+                  class="form__item__input"/>
+              </s:fragment>
+              <s:fragment
+                rendered="#{copyTransOptionsModel.projectMismatchAction eq ruleAction.action}">
+                <input id="projectMismatch--#{ruleAction.action}"
+                  name="projectMismatch"
+                  onclick="onValueChanged(this)"
+                  value="#{ruleAction.action}" type="radio"
+                  class="form__item__input"
+                  checked="true"/>
+              </s:fragment>
+              <label for="projectMismatch--#{ruleAction.action}"
+                class="button button--small #{ruleAction.css}">
+                #{ruleAction.displayText}
+              </label>
+            </ui:repeat>
+          </div>
+        </div>
+      </div>
+    </li>
+
 
-    </rich:panel>
-  </a4j:outputPanel>
+    <li>
+      <div class="g--tighter">
+        <div class="g__item w--3-8 l--push-bottom-quarter">
+          <p class="list__title">
+            #{messages['jsf.iteration.CopyTrans.Condition.onDocIdMismatch']}
+          </p>
 
-</s:div>
+          <p class="txt--meta">
+            #{messages['jsf.iteration.CopyTrans.Condition.onDocIdMismatch.details']}
+          </p>
+        </div>
+        <div class="g__item w--5-8 txt--align-right l--push-bottom-quarter">
+          <div class="button--group">
+            <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
+              var="ruleAction">
+              <s:fragment
+                rendered="#{copyTransOptionsModel.docIdMismatchAction ne ruleAction.action}">
+                <input id="docIdMismatch--#{ruleAction.action}"
+                  name="docIdMismatch"
+                  onclick="onValueChanged(this)"
+                  value="#{ruleAction.action}" type="radio"
+                  class="form__item__input"/>
+              </s:fragment>
+              <s:fragment
+                rendered="#{copyTransOptionsModel.docIdMismatchAction eq ruleAction.action}">
+                <input id="docIdMismatch--#{ruleAction.action}"
+                  name="docIdMismatch"
+                  onclick="onValueChanged(this)"
+                  value="#{ruleAction.action}" type="radio"
+                  class="form__item__input"
+                  checked="true"/>
+              </s:fragment>
+              <label for="docIdMismatch--#{ruleAction.action}"
+                class="button button--small #{ruleAction.css}">
+                #{ruleAction.displayText}
+              </label>
+            </ui:repeat>
+          </div>
+        </div>
+      </div>
+    </li>
+    <li>
+      <p class="list__title">#{messages['jsf.CopyTrans.Action.message']}</p>
+      <p class="txt--meta">#{messages['jsf.CopyTrans.Action.message2']}</p>
+    </li>
+  </ol>
+</ui:composition>
\ No newline at end of file
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline2.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline2.xhtml
deleted file mode 100644
index e4a7f19e1c..0000000000
--- a/zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline2.xhtml
+++ /dev/null
@@ -1,161 +0,0 @@
-<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">
-
-  <script type="text/javascript">
-
-    function onValueChanged(checkbox) {
-      bindCopyTransValue(jQuery(checkbox).attr("name"),
-        jQuery(checkbox).attr("value"))
-    }
-  </script>
-
-  <ol class="list--slat">
-    <li>
-      <div class="g--tighter">
-        <div class="g__item w--3-8 l--push-bottom-quarter">
-          <p class="list__title">
-            #{messages['jsf.iteration.CopyTrans.Condition.onContentMismatch']}</p>
-
-          <p class="txt--meta">
-            #{messages['jsf.iteration.CopyTrans.Condition.onContentMismatch.details']}</p>
-        </div>
-        <div class="g__item w--5-8 txt--align-right l--push-bottom-quarter">
-          <button class="button button--small button--danger" disabled="">
-            #{messages['jsf.iteration.CopyTrans.Action.reject']}
-          </button>
-        </div>
-      </div>
-    </li>
-
-    <li>
-      <div class="g--tighter">
-        <div class="g__item w--3-8 l--push-bottom-quarter">
-          <p class="list__title">
-            #{messages['jsf.iteration.CopyTrans.Condition.onContextMismatch']}
-          </p>
-
-          <p class="txt--meta">
-            #{messages['jsf.iteration.CopyTrans.Condition.onContextMismatch.details']}
-          </p>
-        </div>
-        <div class="g__item w--5-8 txt--align-right l--push-bottom-quarter">
-          <div class="button--group">
-            <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
-              var="ruleAction">
-              <s:fragment
-                rendered="#{copyTransOptionsModel.contextMismatchAction ne ruleAction.action}">
-                <input id="contextMismatch--#{ruleAction.action}"
-                  name="contextMismatch"
-                  onclick="onValueChanged(this)"
-                  value="#{ruleAction.action}" type="radio"
-                  class="form__item__input"/>
-              </s:fragment>
-              <s:fragment
-                rendered="#{copyTransOptionsModel.contextMismatchAction eq ruleAction.action}">
-                <input id="contextMismatch--#{ruleAction.action}"
-                  name="contextMismatch"
-                  onclick="onValueChanged(this)"
-                  value="#{ruleAction.action}" type="radio"
-                  class="form__item__input"
-                  checked="true"/>
-              </s:fragment>
-              <label for="contextMismatch--#{ruleAction.action}"
-                class="button button--small #{ruleAction.css}">
-                #{ruleAction.displayText}
-              </label>
-            </ui:repeat>
-          </div>
-        </div>
-      </div>
-    </li>
-    <li>
-      <div class="g--tighter">
-        <div class="g__item w--3-8 l--push-bottom-quarter">
-          <p class="list__title">
-            #{messages['jsf.iteration.CopyTrans.Condition.onProjectMismatch']}
-          </p>
-
-          <p class="txt--meta">
-            #{messages['jsf.iteration.CopyTrans.Condition.onProjectMismatch.details']}
-          </p>
-        </div>
-        <div class="g__item w--5-8 txt--align-right l--push-bottom-quarter">
-          <div class="button--group">
-            <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
-              var="ruleAction">
-              <s:fragment
-                rendered="#{copyTransOptionsModel.projectMismatchAction ne ruleAction.action}">
-                <input id="projectMismatch--#{ruleAction.action}"
-                  name="projectMismatch"
-                  onclick="onValueChanged(this)"
-                  value="#{ruleAction.action}" type="radio"
-                  class="form__item__input"/>
-              </s:fragment>
-              <s:fragment
-                rendered="#{copyTransOptionsModel.projectMismatchAction eq ruleAction.action}">
-                <input id="projectMismatch--#{ruleAction.action}"
-                  name="projectMismatch"
-                  onclick="onValueChanged(this)"
-                  value="#{ruleAction.action}" type="radio"
-                  class="form__item__input"
-                  checked="true"/>
-              </s:fragment>
-              <label for="projectMismatch--#{ruleAction.action}"
-                class="button button--small #{ruleAction.css}">
-                #{ruleAction.displayText}
-              </label>
-            </ui:repeat>
-          </div>
-        </div>
-      </div>
-    </li>
-
-
-    <li>
-      <div class="g--tighter">
-        <div class="g__item w--3-8 l--push-bottom-quarter">
-          <p class="list__title">
-            #{messages['jsf.iteration.CopyTrans.Condition.onDocIdMismatch']}
-          </p>
-
-          <p class="txt--meta">
-            #{messages['jsf.iteration.CopyTrans.Condition.onDocIdMismatch.details']}
-          </p>
-        </div>
-        <div class="g__item w--5-8 txt--align-right l--push-bottom-quarter">
-          <div class="button--group">
-            <ui:repeat value="#{copyTransOptionsModel.ruleActions}"
-              var="ruleAction">
-              <s:fragment
-                rendered="#{copyTransOptionsModel.docIdMismatchAction ne ruleAction.action}">
-                <input id="docIdMismatch--#{ruleAction.action}"
-                  name="docIdMismatch"
-                  onclick="onValueChanged(this)"
-                  value="#{ruleAction.action}" type="radio"
-                  class="form__item__input"/>
-              </s:fragment>
-              <s:fragment
-                rendered="#{copyTransOptionsModel.docIdMismatchAction eq ruleAction.action}">
-                <input id="docIdMismatch--#{ruleAction.action}"
-                  name="docIdMismatch"
-                  onclick="onValueChanged(this)"
-                  value="#{ruleAction.action}" type="radio"
-                  class="form__item__input"
-                  checked="true"/>
-              </s:fragment>
-              <label for="docIdMismatch--#{ruleAction.action}"
-                class="button button--small #{ruleAction.css}">
-                #{ruleAction.displayText}
-              </label>
-            </ui:repeat>
-          </div>
-        </div>
-      </div>
-    </li>
-    <li>
-      <p class="list__title">#{messages['jsf.CopyTrans.Help.message']}</p>
-      <p class="txt--meta">#{messages['jsf.CopyTrans.Help.message2']}</p>
-    </li>
-  </ol>
-</ui:composition>
\ No newline at end of file
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 630fe2dd7a..fcfa23860e 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
@@ -247,15 +247,15 @@
     <hr/>
     <h3 class="heading--secondary">#{messages['jsf.CopyTrans']}</h3>
 
-    <p>#{messages['jsf.copytrans.message']}
+    <p>#{messages['jsf.Copytrans.message']}
       <a href="http://zanata.org/help/reuse/copytrans-explained/" title=""
         data-original-title="#{messages['jsf.project.CopyTransOpts.tooltip']}">
         <i class="i i--help"></i>
       </a>
     </p>
 
-    <p class="message--highlight">#{messages['jsf.copytrans.message2']}</p>
-    <ui:include src="/WEB-INF/layout/copy_trans_inline2.xhtml"/>
+    <p class="message--highlight">#{messages['jsf.Copytrans.message2']}</p>
+    <ui:include src="/WEB-INF/layout/copy_trans_inline.xhtml"/>
   </h:form>
 </li>
 <li id="settings-permissions">