diff --git a/PluralVariants.html b/PluralVariants.html
index a771e42..e663f13 100644
--- a/PluralVariants.html
+++ b/PluralVariants.html
@@ -2,15 +2,15 @@
   <div class="layout-column layout-column--half translation-set__source">
     <fieldset data-drupal-selector="edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string" id="edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string" class="js-form-item form-item js-form-wrapper form-wrapper">
       <legend>
-    <span class="fieldset-legend">Plural variants <span class="visually-hidden">(English)</span></span>
+    <span class="fieldset-legend">Plural variants</span>
   </legend>
   <div class="fieldset-wrapper">
-            <div id="edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0" class="js-form-item form-item js-form-type-item form-type-item js-form-item-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0 form-item-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0">
-      <label for="edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0">Singular form</label>
+            <span class="visually-hidden">Source string (English)</span><div class="form-item">
+      <label>Singular form</label>
         <span lang="en">1 place</span>
         </div>
-<div id="edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-1" class="js-form-item form-item js-form-type-item form-type-item js-form-item-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-1 form-item-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-1">
-      <label for="edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-1">First plural form</label>
+<div class="form-item">
+      <label>First plural form</label>
         <span lang="en">@count places</span>
         </div>
 
@@ -21,10 +21,10 @@
   <div class="layout-column layout-column--half translation-set__translated">
     <fieldset data-drupal-selector="edit-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string" id="edit-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string" class="js-form-item form-item js-form-wrapper form-wrapper">
       <legend>
-    <span class="fieldset-legend">Plural variants <span class="visually-hidden">(French)</span></span>
+    <span class="fieldset-legend">Plural variants</span>
   </legend>
   <div class="fieldset-wrapper">
-            <div class="js-form-item form-item js-form-type-textfield form-type-textfield js-form-item-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0 form-item-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0">
+            <span class="visually-hidden">Translated string (French)</span><div class="js-form-item form-item js-form-type-textfield form-type-textfield js-form-item-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0 form-item-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0">
       <label for="edit-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0">Singular form</label>
         <input data-drupal-selector="edit-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0" id="edit-translation-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-0" name="translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][0]" value="1 place" size="60" maxlength="128" class="form-text" lang="fr" type="text">
 
diff --git a/TranslateEditForm.html b/TranslateEditForm.html
index 76e78c5..9b3ec7f 100644
--- a/TranslateEditForm.html
+++ b/TranslateEditForm.html
@@ -1,11 +1,11 @@
 <tr data-drupal-selector="edit-strings-286" class="odd">
-                      <td><span class="visually-hidden">Source string (Built-in English)</span><span lang="en"><div id="edit-strings-286-original-0" class="js-form-item form-item js-form-type-item form-type-item js-form-item-strings-286-original-0 form-item-strings-286-original-0">
-      <label for="edit-strings-286-original-0">Singular form</label>
-        1 minute
+                      <td><span class="visually-hidden">Source string (Built-in English)</span><div>
+      <label>Singular form</label>
+        <span lang="en">1 minute</span>
         </div>
-</span><br><div id="edit-strings-286-original-2" class="js-form-item form-item js-form-type-item form-type-item js-form-item-strings-286-original-2 form-item-strings-286-original-2">
-      <label for="edit-strings-286-original-2">Plural form</label>
-        @count minutes
+<br><div>
+      <label>Plural form</label>
+        <span lang="en">@count minutes</span>
         </div>
 </td>
                       <td><span class="visually-hidden">Translated string (French)</span><div class="js-form-item form-item js-form-type-textarea form-type-textarea js-form-item-strings-286-translations-0 form-item-strings-286-translations-0">