diff --git a/system/scripts/actors/character-sheet.js b/system/scripts/actors/character-sheet.js
index 24578d0..22df5d0 100644
--- a/system/scripts/actors/character-sheet.js
+++ b/system/scripts/actors/character-sheet.js
@@ -73,10 +73,14 @@ export class CharacterSheetL5r5e extends BaseSheetL5r5e {
                 xp = Math.floor(xp / 2);
             }
 
-            const rank = Math.max(0, item.data.bought_at_rank - 1);
+            const rank = Math.max(0, item.data.bought_at_rank);
+            if (rank < 1) {
+                // Ignore starting comp/items
+                return;
+            }
             if (!adv[rank]) {
                 adv[rank] = {
-                    rank: rank + 1,
+                    rank: rank,
                     spent: 0,
                     goal: CONFIG.l5r5e.xp.costPerRank[rank] || null,
                     list: [],
diff --git a/system/scripts/actors/twenty-questions-dialog.js b/system/scripts/actors/twenty-questions-dialog.js
index ccfc2d5..40adc35 100644
--- a/system/scripts/actors/twenty-questions-dialog.js
+++ b/system/scripts/actors/twenty-questions-dialog.js
@@ -33,7 +33,8 @@ export class TwentyQuestionsDialog extends FormApplication {
             template: CONFIG.l5r5e.paths.templates + "actors/twenty-questions-dialog.html",
             title: game.i18n.localize("l5r5e.twenty_questions.title"),
             width: 600,
-            height: 600,
+            height: 800,
+            tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "part1" }],
             resizable: true,
             closeOnSubmit: false,
             submitOnClose: false,
diff --git a/system/scripts/actors/twenty-questions.js b/system/scripts/actors/twenty-questions.js
index c8a3cd5..09510e1 100644
--- a/system/scripts/actors/twenty-questions.js
+++ b/system/scripts/actors/twenty-questions.js
@@ -209,10 +209,10 @@ export class TwentyQuestions {
      * Fill a actor data from this object
      */
     async toActor(actor, itemsCache) {
-        const actorDatas = duplicate(actor.data.data);
+        const actorDatas = actor.data.data;
         const formData = this.data;
 
-        // Update the actor real datas
+        // Update the actor
         actorDatas.zeni = Math.floor(formData.step2.wealth * 50);
         actorDatas.identity = {
             ...actorDatas.identity,
@@ -268,24 +268,24 @@ export class TwentyQuestions {
         await actor.deleteEmbeddedEntity("OwnedItem", deleteIds);
 
         // Add items in 20Q to actor
-        Object.values(itemsCache).forEach((types) => {
-            types.forEach((item) => {
+        for (const types of Object.values(itemsCache)) {
+            for (const item of types) {
                 const itemData = duplicate(item.data);
                 if (itemData.data?.bought_at_rank) {
                     itemData.data.bought_at_rank = 0;
                 }
-                actor.createEmbeddedEntity("OwnedItem", itemData);
-            });
-        });
+                if (itemData.data?.xp_spent) {
+                    itemData.data.xp_spent = 0;
+                }
+                await actor.createEmbeddedEntity("OwnedItem", itemData);
+            }
+        }
 
         // Update actor
-        actor.update({
+        await actor.update({
             name: (formData.step2.family + " " + formData.step19.firstname).trim(),
-            data: diffObject(actor.data.data, actorDatas),
+            data: actor.data.data,
         });
-
-        // TODO Tmp
-        // console.log(actor);
     }
 
     /**
diff --git a/system/scripts/config.js b/system/scripts/config.js
index f37d073..cb11027 100644
--- a/system/scripts/config.js
+++ b/system/scripts/config.js
@@ -8,7 +8,7 @@ L5R5E.paths = {
 L5R5E.stances = ["earth", "air", "water", "fire", "void"];
 L5R5E.techniques = ["kata", "kiho", "invocation", "ritual", "shuji", "maho", "ninjutsu"];
 L5R5E.xp = {
-    costPerRank: [20, 24, 32, 44, 60],
+    costPerRank: [0, 20, 24, 32, 44, 60],
     ringCostMultiplier: 3,
     skillCostMultiplier: 2,
     techniqueCost: 3,
diff --git a/system/templates/actors/twenty-questions-dialog.html b/system/templates/actors/twenty-questions-dialog.html
index 49c870e..b3aec38 100644
--- a/system/templates/actors/twenty-questions-dialog.html
+++ b/system/templates/actors/twenty-questions-dialog.html
@@ -7,39 +7,116 @@
         <h1>{{localize 'l5r5e.twenty_questions.title'}}</h1>
         <div>
             {{localize 'l5r5e.twenty_questions.intro'}}
+            <br>
             <br><i> {{localize 'l5r5e.twenty_questions.section'}}</i>
         </div>
 
-        <h2>{{localize 'l5r5e.twenty_questions.part1.title'}}</h2>
-        <div class="parts part1">
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part1.q1'}}</h3>
-                    <input type="text" name="step1.clan" value="{{data.step1.clan}}">
-                </label>
+        <section class="sheet-body">
+            <nav class="sheet-tabs tabs" data-group="primary">
+                <a class="item" data-tab="part1">I</a>
+                <a class="item" data-tab="part2">II</a>
+                <a class="item" data-tab="part3">III</a>
+                <a class="item" data-tab="part4">IV</a>
+                <a class="item" data-tab="part5">V</a>
+                <a class="item" data-tab="part6">VI</a>
+                <a class="item" data-tab="part7">VII</a>
+            </nav>
+            <article class="tab parts part1" data-group="primary" data-tab="part1">
+                <h2>{{localize 'l5r5e.twenty_questions.part1.title'}}</h2>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part1.q1'}}</h3>
+                        <input type="text" name="step1.clan" value="{{data.step1.clan}}">
+                    </label>
 
-                <table>
-                    <tr>
-                        <td class="third">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.incring1'}}
+                    <table>
+                        <tr>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incring1'}}
+                                    <br>
+                                    <select name="step1.ring" class="ring-select">
+                                        {{#select data.step1.ring}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosem'}}</option>
+                                        {{#each ringsList as |obj|}}
+                                        <option value="{{obj.id}}">{{obj.label}}</option>
+                                        {{/each}}
+                                        {{/select}}
+                                    </select>
+                                </label>
+                            </td>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incskill1'}}
+                                    <br>
+                                    <select name="step1.skill" class="skill-select">
+                                        {{#select data.step1.skill}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                        {{#each skillsList as |skills catId|}}
+                                        <optgroup label="{{localizeSkill catId 'title'}}">
+                                            {{#each skills as |obj|}}
+                                            <option value="{{obj.id}}">{{obj.label}}</option>
+                                            {{/each}}
+                                        </optgroup>
+                                        {{/each}}
+                                        {{/select}}
+                                    </select>
+                                </label>
+                            </td>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.status'}}
+                                    <br>
+                                    <input type="number" name="step1.social_status" min="0" max="100" value="{{data.step1.social_status}}"
+                                           data-dtype="Number" placeholder="0">
+                                </label>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part1.q2'}}</h3>
+                        <input type="text" name="step2.family" value="{{data.step2.family}}">
+                    </label>
+
+                    <table>
+                        <tr>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incring1'}}
+                                    <br>
+                                    <select name="step2.ring" class="ring-select">
+                                        {{#select data.step2.ring}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosem'}}</option>
+                                        {{#each ringsList as |obj|}}
+                                        <option value="{{obj.id}}">{{obj.label}}</option>
+                                        {{/each}}
+                                        {{/select}}
+                                    </select>
+                                </label>
+                            </td>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incskill2'}}
+                                    <br>
+                                    <select name="step2.skill1" class="skill-select">
+                                        {{#select data.step2.skill1}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                        {{#each skillsList as |skills catId|}}
+                                        <optgroup label="{{localizeSkill catId 'title'}}">
+                                            {{#each skills as |obj|}}
+                                            <option value="{{obj.id}}">{{obj.label}}</option>
+                                            {{/each}}
+                                        </optgroup>
+                                        {{/each}}
+                                        {{/select}}
+                                    </select>
+                                </label>
                                 <br>
-                                <select name="step1.ring" class="ring-select">
-                                    {{#select data.step1.ring}}
-                                    <option value="none">{{localize 'l5r5e.twenty_questions.choosem'}}</option>
-                                    {{#each ringsList as |obj|}}
-                                    <option value="{{obj.id}}">{{obj.label}}</option>
-                                    {{/each}}
-                                    {{/select}}
-                                </select>
-                            </label>
-                        </td>
-                        <td class="third">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.incskill1'}}
-                                <br>
-                                <select name="step1.skill" class="skill-select">
-                                    {{#select data.step1.skill}}
+                                <select name="step2.skill2" class="skill-select">
+                                    {{#select data.step2.skill2}}
                                     <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
                                     {{#each skillsList as |skills catId|}}
                                     <optgroup label="{{localizeSkill catId 'title'}}">
@@ -50,48 +127,92 @@
                                     {{/each}}
                                     {{/select}}
                                 </select>
-                            </label>
-                        </td>
-                        <td class="third">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.status'}}
+                            </td>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.money'}}
+                                    <br>
+                                    <input type="number" name="step2.wealth" value="{{data.step2.wealth}}" data-dtype="Number"
+                                           placeholder="0">
+                                </label>
                                 <br>
-                                <input type="number" name="step1.social_status" min="0" max="100" value="{{data.step1.social_status}}"
-                                       data-dtype="Number" placeholder="0">
-                            </label>
-                        </td>
-                    </tr>
-                </table>
-            </div>
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.glory'}}
+                                    <input type="number" name="step2.social_glory" min="0" max="100" value="{{data.step2.social_glory}}"
+                                           data-dtype="Number" placeholder="0">
+                                </label>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </article>
+            <article class="tab parts part2" data-group="primary" data-tab="part2">
+                <h2>{{localize 'l5r5e.twenty_questions.part2.title'}}</h2>
+                <div>
+                    <h3>{{localize 'l5r5e.twenty_questions.part2.q3'}}</h3>
 
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part1.q2'}}</h3>
-                    <input type="text" name="step2.family" value="{{data.step2.family}}">
-                </label>
+                    <label>
+                        {{localize 'l5r5e.twenty_questions.school'}}
+                        <br>
+                        <input type="text" name="step3.school" value="{{data.step3.school}}">
+                    </label>
 
-                <table>
-                    <tr>
-                        <td class="third">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.incring1'}}
-                                <br>
-                                <select name="step2.ring" class="ring-select">
-                                    {{#select data.step2.ring}}
+                    <label>
+                        {{localize 'l5r5e.twenty_questions.role'}}
+                        <br>
+                        <input type="text" name="step3.roles" value="{{data.step3.roles}}">
+                    </label>
+
+                    <table>
+                        <tr>
+                            <td class="fifty">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incring2'}}
+                                    <br>
+                                    <select name="step3.ring1" class="ring-select">
+                                        {{#select data.step3.ring1}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosem'}}</option>
+                                        {{#each ringsList as |obj|}}
+                                        <option value="{{obj.id}}">{{obj.label}}</option>
+                                        {{/each}}
+                                        {{/select}}
+                                    </select>
+                                </label>
+                                <select name="step3.ring2" class="ring-select">
+                                    {{#select data.step3.ring2}}
                                     <option value="none">{{localize 'l5r5e.twenty_questions.choosem'}}</option>
                                     {{#each ringsList as |obj|}}
                                     <option value="{{obj.id}}">{{obj.label}}</option>
                                     {{/each}}
                                     {{/select}}
                                 </select>
-                            </label>
-                        </td>
-                        <td class="third">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.incskill2'}}
                                 <br>
-                                <select name="step2.skill1" class="skill-select">
-                                    {{#select data.step2.skill1}}
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.honor'}}
+                                    <br>
+                                    <input type="number" name="step3.social_honor" min="0" max="100" value="{{data.step3.social_honor}}"
+                                           data-dtype="Number" placeholder="0">
+                                </label>
+                            </td>
+                            <td class="fifty">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incskill3'}}
+                                    <br>
+                                    <select name="step3.skill1" class="skill-select">
+                                        {{#select data.step3.skill1}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                        {{#each skillsList as |skills catId|}}
+                                        <optgroup label="{{localizeSkill catId 'title'}}">
+                                            {{#each skills as |obj|}}
+                                            <option value="{{obj.id}}">{{obj.label}}</option>
+                                            {{/each}}
+                                        </optgroup>
+                                        {{/each}}
+                                        {{/select}}
+                                    </select>
+                                </label>
+                                <select name="step3.skill2" class="skill-select">
+                                    {{#select data.step3.skill2}}
                                     <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
                                     {{#each skillsList as |skills catId|}}
                                     <optgroup label="{{localizeSkill catId 'title'}}">
@@ -102,527 +223,412 @@
                                     {{/each}}
                                     {{/select}}
                                 </select>
-                            </label>
-                            <br>
-                            <select name="step2.skill2" class="skill-select">
-                                {{#select data.step2.skill2}}
-                                <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                                {{#each skillsList as |skills catId|}}
-                                <optgroup label="{{localizeSkill catId 'title'}}">
-                                    {{#each skills as |obj|}}
-                                    <option value="{{obj.id}}">{{obj.label}}</option>
+                                <select name="step3.skill3" class="skill-select">
+                                    {{#select data.step3.skill3}}
+                                    <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                    {{#each skillsList as |skills catId|}}
+                                    <optgroup label="{{localizeSkill catId 'title'}}">
+                                        {{#each skills as |obj|}}
+                                        <option value="{{obj.id}}">{{obj.label}}</option>
+                                        {{/each}}
+                                    </optgroup>
                                     {{/each}}
-                                </optgroup>
-                                {{/each}}
-                                {{/select}}
-                            </select>
-                        </td>
-                        <td class="third">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.money'}}
+                                    {{/select}}
+                                </select>
+                                <select name="step3.skill4" class="skill-select">
+                                    {{#select data.step3.skill4}}
+                                    <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                    {{#each skillsList as |skills catId|}}
+                                    <optgroup label="{{localizeSkill catId 'title'}}">
+                                        {{#each skills as |obj|}}
+                                        <option value="{{obj.id}}">{{obj.label}}</option>
+                                        {{/each}}
+                                    </optgroup>
+                                    {{/each}}
+                                    {{/select}}
+                                </select>
+                                <select name="step3.skill5" class="skill-select">
+                                    {{#select data.step3.skill5}}
+                                    <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                    {{#each skillsList as |skills catId|}}
+                                    <optgroup label="{{localizeSkill catId 'title'}}">
+                                        {{#each skills as |obj|}}
+                                        <option value="{{obj.id}}">{{obj.label}}</option>
+                                        {{/each}}
+                                    </optgroup>
+                                    {{/each}}
+                                    {{/select}}
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">
+                                {{localize 'l5r5e.twenty_questions.access'}}
                                 <br>
-                                <input type="number" name="step2.wealth" value="{{data.step2.wealth}}" data-dtype="Number"
-                                       placeholder="0">
-                            </label>
-                            <br>
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.glory'}}
-                                <input type="number" name="step2.social_glory" min="0" max="100" value="{{data.step2.social_glory}}"
-                                       data-dtype="Number" placeholder="0">
-                            </label>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-
-        <h2>{{localize 'l5r5e.twenty_questions.part2.title'}}</h2>
-        <div class="parts part2">
-            <div>
-            <h3>{{localize 'l5r5e.twenty_questions.part2.q3'}}</h3>
-
-            <label>
-                {{localize 'l5r5e.twenty_questions.school'}}
-                <br>
-                <input type="text" name="step3.school" value="{{data.step3.school}}">
-            </label>
-
-            <label>
-                {{localize 'l5r5e.twenty_questions.role'}}
-                <br>
-                <input type="text" name="step3.roles" value="{{data.step3.roles}}">
-            </label>
-
-            <table>
-                <tr>
-                    <td class="fifty">
-                        <label>
-                            {{localize 'l5r5e.twenty_questions.incring2'}}
-                            <br>
-                            <select name="step3.ring1" class="ring-select">
-                                {{#select data.step3.ring1}}
-                                <option value="none">{{localize 'l5r5e.twenty_questions.choosem'}}</option>
-                                {{#each ringsList as |obj|}}
-                                <option value="{{obj.id}}">{{obj.label}}</option>
+                                {{#each techniquesList as |technique|}}
+                                <label>
+                                    <input type="checkbox" name="step3.allowed_techniques.{{technique}}" {{checked (lookup ../data.step3.allowed_techniques technique)}}>
+                                    {{localizeTechnique technique}}
+                                </label>
                                 {{/each}}
-                                {{/select}}
-                            </select>
-                        </label>
-                        <select name="step3.ring2" class="ring-select">
-                            {{#select data.step3.ring2}}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fifty">
+                                {{localize 'l5r5e.twenty_questions.schoolab'}}
+                                <br>
+                                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.school_ability stepName='step3.school_ability' itemType='techniques' hideDndAt=1 }}
+                                <br>
+                                {{localize 'l5r5e.twenty_questions.startech'}}
+                                <br>
+                                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.techniques stepName='step3.techniques' itemType='techniques' hideDndAt=5 }}
+                            </td>
+                            <td class="fifty">
+                                {{localize 'l5r5e.twenty_questions.outfit'}}
+                                <br>
+                                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.equipment stepName='step3.equipment' itemType='items' hideDndAt=10 }}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part2.q4'}}</h3>
+                        <textarea name="step4.stand_out">{{data.step4.stand_out}}</textarea>
+                    </label>
+                    <br>
+                    <label>
+                        {{localize 'l5r5e.twenty_questions.incring1'}}
+                        <br>
+                        <select name="step4.ring" class="ring-select">
+                            {{#select data.step4.ring}}
                             <option value="none">{{localize 'l5r5e.twenty_questions.choosem'}}</option>
                             {{#each ringsList as |obj|}}
                             <option value="{{obj.id}}">{{obj.label}}</option>
                             {{/each}}
                             {{/select}}
                         </select>
+                    </label>
+                </div>
+            </article>
+            <article class="tab parts part3" data-group="primary" data-tab="part3">
+                <h2>{{localize 'l5r5e.twenty_questions.part3.title'}}</h2>
+                <div>
+                    <h3>{{localize 'l5r5e.twenty_questions.part3.q5'}}</h3>
+
+                    <label>
+                        {{localize 'l5r5e.twenty_questions.choogiri'}}
                         <br>
-                        <label>
-                            {{localize 'l5r5e.twenty_questions.honor'}}
-                            <br>
-                            <input type="number" name="step3.social_honor" min="0" max="100" value="{{data.step3.social_honor}}"
-                                   data-dtype="Number" placeholder="0">
-                        </label>
-                    </td>
-                    <td class="fifty">
-                        <label>
-                            {{localize 'l5r5e.twenty_questions.incskill3'}}
-                            <br>
-                            <select name="step3.skill1" class="skill-select">
-                                {{#select data.step3.skill1}}
-                                <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                                {{#each skillsList as |skills catId|}}
-                                <optgroup label="{{localizeSkill catId 'title'}}">
-                                    {{#each skills as |obj|}}
-                                    <option value="{{obj.id}}">{{obj.label}}</option>
-                                    {{/each}}
-                                </optgroup>
-                                {{/each}}
-                                {{/select}}
-                            </select>
-                        </label>
-                        <select name="step3.skill2" class="skill-select">
-                            {{#select data.step3.skill2}}
-                            <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                            {{#each skillsList as |skills catId|}}
-                            <optgroup label="{{localizeSkill catId 'title'}}">
-                                {{#each skills as |obj|}}
-                                <option value="{{obj.id}}">{{obj.label}}</option>
-                                {{/each}}
-                            </optgroup>
-                            {{/each}}
-                            {{/select}}
-                        </select>
-                        <select name="step3.skill3" class="skill-select">
-                            {{#select data.step3.skill3}}
-                            <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                            {{#each skillsList as |skills catId|}}
-                            <optgroup label="{{localizeSkill catId 'title'}}">
-                                {{#each skills as |obj|}}
-                                <option value="{{obj.id}}">{{obj.label}}</option>
-                                {{/each}}
-                            </optgroup>
-                            {{/each}}
-                            {{/select}}
-                        </select>
-                        <select name="step3.skill4" class="skill-select">
-                            {{#select data.step3.skill4}}
-                            <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                            {{#each skillsList as |skills catId|}}
-                            <optgroup label="{{localizeSkill catId 'title'}}">
-                                {{#each skills as |obj|}}
-                                <option value="{{obj.id}}">{{obj.label}}</option>
-                                {{/each}}
-                            </optgroup>
-                            {{/each}}
-                            {{/select}}
-                        </select>
-                        <select name="step3.skill5" class="skill-select">
-                            {{#select data.step3.skill5}}
-                            <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                            {{#each skillsList as |skills catId|}}
-                            <optgroup label="{{localizeSkill catId 'title'}}">
-                                {{#each skills as |obj|}}
-                                <option value="{{obj.id}}">{{obj.label}}</option>
-                                {{/each}}
-                            </optgroup>
-                            {{/each}}
-                            {{/select}}
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                        {{localize 'l5r5e.twenty_questions.access'}}
+                        <textarea name="step5.social_giri">{{data.step5.social_giri}}</textarea>
+                    </label>
+                </div>
+
+                <div>
+                    <h3>{{localize 'l5r5e.twenty_questions.part3.q6'}}</h3>
+
+                    <label>
+                        {{localize 'l5r5e.twenty_questions.chooninjo'}}
                         <br>
-                        {{#each techniquesList as |technique|}}
-                        <label>
-                            <input type="checkbox" name="step3.allowed_techniques.{{technique}}" {{checked (lookup ../data.step3.allowed_techniques technique)}}>
-                            {{localizeTechnique technique}}
-                        </label>
-                        {{/each}}
-                    </td>
-                </tr>
-                <tr>
-                    <td class="fifty">
-                        {{localize 'l5r5e.twenty_questions.schoolab'}}
-                        <br>
-                        {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.school_ability stepName='step3.school_ability' itemType='techniques' hideDndAt=1 }}
-                        <br>
-                        {{localize 'l5r5e.twenty_questions.startech'}}
-                        <br>
-                        {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.techniques stepName='step3.techniques' itemType='techniques' hideDndAt=5 }}
-                    </td>
-                    <td class="fifty">
-                        {{localize 'l5r5e.twenty_questions.outfit'}}
-                        <br>
-                        {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.equipment stepName='step3.equipment' itemType='items' hideDndAt=10 }}
-                    </td>
-                </tr>
-            </table>
-        </div>
+                        <textarea name="step6.social_ninjo">{{data.step6.social_ninjo}}</textarea>
+                    </label>
+                </div>
 
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part2.q4'}}</h3>
-                    <textarea name="step4.stand_out">{{data.step4.stand_out}}</textarea>
-                </label>
-                <br>
-                <label>
-                    {{localize 'l5r5e.twenty_questions.incring1'}}
-                    <br>
-                    <select name="step4.ring" class="ring-select">
-                        {{#select data.step4.ring}}
-                        <option value="none">{{localize 'l5r5e.twenty_questions.choosem'}}</option>
-                        {{#each ringsList as |obj|}}
-                        <option value="{{obj.id}}">{{obj.label}}</option>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                </label>
-            </div>
-        </div>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part3.q7'}}</h3>
+                        <textarea name="step7.clan_relations">{{data.step7.clan_relations}}</textarea>
+                    </label>
 
-        <h2>{{localize 'l5r5e.twenty_questions.part3.title'}}</h2>
-        <div class="parts part3">
-            <div>
-                <h3>{{localize 'l5r5e.twenty_questions.part3.q5'}}</h3>
-
-                <label>
-                    {{localize 'l5r5e.twenty_questions.choogiri'}}
-                    <br>
-                    <textarea name="step5.social_giri">{{data.step5.social_giri}}</textarea>
-                </label>
-            </div>
-
-            <div>
-                <h3>{{localize 'l5r5e.twenty_questions.part3.q6'}}</h3>
-
-                <label>
-                    {{localize 'l5r5e.twenty_questions.chooninjo'}}
-                    <br>
-                    <textarea name="step6.social_ninjo">{{data.step6.social_ninjo}}</textarea>
-                </label>
-            </div>
-
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part3.q7'}}</h3>
-                    <textarea name="step7.clan_relations">{{data.step7.clan_relations}}</textarea>
-                </label>
-
-                <table>
-                    <tr>
-                        <td class="third">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.incskill1'}}
-                                <br>
-                                <select name="step7.skill" class="skill-select">
-                                    {{#select data.step7.skill}}
-                                    <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                                    {{#each skillsList as |skills catId|}}
-                                    <optgroup label="{{localizeSkill catId 'title'}}">
-                                        {{#each skills as |obj|}}
-                                        <option value="{{obj.id}}">{{obj.label}}</option>
+                    <table>
+                        <tr>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incskill1'}}
+                                    <br>
+                                    <select name="step7.skill" class="skill-select">
+                                        {{#select data.step7.skill}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                        {{#each skillsList as |skills catId|}}
+                                        <optgroup label="{{localizeSkill catId 'title'}}">
+                                            {{#each skills as |obj|}}
+                                            <option value="{{obj.id}}">{{obj.label}}</option>
+                                            {{/each}}
+                                        </optgroup>
                                         {{/each}}
-                                    </optgroup>
-                                    {{/each}}
-                                    {{/select}}
-                                </select>
-                            </label>
-                        </td>
-                        <td class="or">
-                            {{localize 'l5r5e.twenty_questions.or'}}
-                        </td>
-                        <td class="">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.incglory'}}
-                                <br>
-                                <input type="number" name="step7.social_add_glory" value="{{data.step7.social_add_glory}}"
-                                       data-dtype="Number" placeholder="0" disabled>
-                            </label>
-                        </td>
-                    </tr>
-                </table>
-            </div>
+                                        {{/select}}
+                                    </select>
+                                </label>
+                            </td>
+                            <td class="or">
+                                {{localize 'l5r5e.twenty_questions.or'}}
+                            </td>
+                            <td class="">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incglory'}}
+                                    <br>
+                                    <input type="number" name="step7.social_add_glory" value="{{data.step7.social_add_glory}}"
+                                           data-dtype="Number" placeholder="0" disabled>
+                                </label>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
 
-            <div>
-            <label>
-                <h3>{{localize 'l5r5e.twenty_questions.part3.q8'}}</h3>
-                <textarea name="step8.bushido">{{data.step8.bushido}}</textarea>
-            </label>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part3.q8'}}</h3>
+                        <textarea name="step8.bushido">{{data.step8.bushido}}</textarea>
+                    </label>
 
-            <table>
-                <tr>
-                    <td class="third">
-                        <label>
-                            {{localize 'l5r5e.twenty_questions.incskill1'}}
-                            <br>
-                            <select name="step8.skill" class="skill-select">
-                                {{#select data.step8.skill}}
-                                <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                                {{#each noHonorSkillsList as |skillId|}}
-                                <option value="{{skillId}}">{{localizeSkillId skillId}}</option>
-                                {{/each}}
-                                {{/select}}
-                            </select>
-                        </label>
-                    </td>
-                    <td class="or">
-                        {{localize 'l5r5e.twenty_questions.or'}}
-                    </td>
-                    <td class="">
-                        <label>
-                            {{localize 'l5r5e.twenty_questions.inchonor'}}
-                            <br>
-                            <input type="number" name="step8.social_add_honor" value="{{data.step8.social_add_honor}}"
-                                   data-dtype="Number" placeholder="0" disabled>
-                        </label>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        </div>
-
-        <h2>{{localize 'l5r5e.twenty_questions.part4.title'}}</h2>
-        <div class="parts part4">
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part4.q9'}}</h3>
-                    <textarea name="step9.success">{{data.step9.success}}</textarea>
-                </label>
-                <br>
-                {{localize 'l5r5e.twenty_questions.distinction'}}
-                <br>
-                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step9.distinction stepName='step9.distinction' itemType='peculiarities' hideDndAt=1 }}
-            </div>
-
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part4.q10'}}</h3>
-                    <textarea name="step10.difficulty">{{data.step10.difficulty}}</textarea>
-                </label>
-                <br>
-                {{localize 'l5r5e.twenty_questions.adversity'}}
-                <br>
-                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step10.adversity stepName='step10.adversity' itemType='peculiarities' hideDndAt=1 }}
-            </div>
-
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part4.q11'}}</h3>
-                    <textarea name="step11.calms">{{data.step11.calms}}</textarea>
-                </label>
-                <br>
-                {{localize 'l5r5e.twenty_questions.passion'}}
-                <br>
-                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step11.passion stepName='step11.passion' itemType='peculiarities' hideDndAt=1 }}
-            </div>
-
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part4.q12'}}</h3>
-                    <textarea name="step12.worries">{{data.step12.worries}}</textarea>
-                </label>
-                <br>
-                {{localize 'l5r5e.twenty_questions.anxiety'}}
-                <br>
-                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step12.anxiety stepName='step12.anxiety' itemType='peculiarities' hideDndAt=1 }}
-            </div>
-
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part4.q13'}}</h3>
-                    <textarea name="step13.most_learn">{{data.step13.most_learn}}</textarea>
-                </label>
-                <br>
-
-                <table>
-                    <tr>
-                        <td class="third">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.incskill1'}}
-                                <br>
-                                <select name="step13.skill" class="skill-select">
-                                    {{#select data.step13.skill}}
-                                    <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                                    {{#ifCond cache.step13.advantage.length '==' '0'}}
-                                    {{#each skillsList as |skills catId|}}
-                                    <optgroup label="{{localizeSkill catId 'title'}}">
-                                        {{#each skills as |obj|}}
-                                        <option value="{{obj.id}}">{{obj.label}}</option>
+                    <table>
+                        <tr>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incskill1'}}
+                                    <br>
+                                    <select name="step8.skill" class="skill-select">
+                                        {{#select data.step8.skill}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                        {{#each noHonorSkillsList as |skillId|}}
+                                        <option value="{{skillId}}">{{localizeSkillId skillId}}</option>
                                         {{/each}}
-                                    </optgroup>
-                                    {{/each}}
-                                    {{/ifCond}}
-                                    {{/select}}
-                                </select>
-                            </label>
-                        </td>
-                        <td class="or">
-                            {{localize 'l5r5e.twenty_questions.or'}}
-                        </td>
-                        <td class="">
-                            {{localize 'l5r5e.twenty_questions.advant'}}
-                            <br>
-                            {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step13.advantage stepName='step13.advantage' itemType='peculiarities' hideDndAt=1 }}
-                        </td>
-                    </tr>
-                </table>
-
-                <br>
-                {{localize 'l5r5e.twenty_questions.disadvant'}}
-                <br>
-                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step13.disadvantage stepName='step13.disadvantage' itemType='peculiarities' hideDndAt=1 }}
-            </div>
-        </div>
-
-        <h2>{{localize 'l5r5e.twenty_questions.part5.title'}}</h2>
-        <div class="parts part5">
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part5.q14'}}</h3>
-                    <textarea name="step14.first_sight">{{data.step14.first_sight}}</textarea>
-                </label>
-                <br>
-                <label>
-                    {{localize 'l5r5e.twenty_questions.accoutr'}}
+                                        {{/select}}
+                                    </select>
+                                </label>
+                            </td>
+                            <td class="or">
+                                {{localize 'l5r5e.twenty_questions.or'}}
+                            </td>
+                            <td class="">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.inchonor'}}
+                                    <br>
+                                    <input type="number" name="step8.social_add_honor" value="{{data.step8.social_add_honor}}"
+                                           data-dtype="Number" placeholder="0" disabled>
+                                </label>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </article>
+            <article class="tab parts part4" data-group="primary" data-tab="part4">
+                <h2>{{localize 'l5r5e.twenty_questions.part4.title'}}</h2>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part4.q9'}}</h3>
+                        <textarea name="step9.success">{{data.step9.success}}</textarea>
+                    </label>
                     <br>
-                    {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step14.special_features stepName='step14.special_features' itemType='items' hideDndAt=1 }}
-                </label>
-            </div>
-
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part5.q15'}}</h3>
-                    <textarea name="step15.stress">{{data.step15.stress}}</textarea>
-                </label>
-            </div>
-
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part5.q16'}}</h3>
-                    <textarea name="step16.relations">{{data.step16.relations}}</textarea>
-                </label>
-                <br>
-                <label>
-                    {{localize 'l5r5e.twenty_questions.object'}}
+                    {{localize 'l5r5e.twenty_questions.distinction'}}
                     <br>
-                    {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step16.item stepName='step16.item' itemType='items' hideDndAt=1 }}
-                </label>
-            </div>
-        </div>
+                    {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step9.distinction stepName='step9.distinction' itemType='peculiarities' hideDndAt=1 }}
+                </div>
 
-        <h2>{{localize 'l5r5e.twenty_questions.part6.title'}}</h2>
-        <div class="parts part6">
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part6.q17'}}</h3>
-                    <textarea name="step17.parents_pov">{{data.step17.parents_pov}}</textarea>
-                </label>
-                <br>
-                <label>
-                    {{localize 'l5r5e.twenty_questions.incskill1'}}
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part4.q10'}}</h3>
+                        <textarea name="step10.difficulty">{{data.step10.difficulty}}</textarea>
+                    </label>
                     <br>
-                    <select name="step17.skill" class="skill-select">
-                        {{#select data.step17.skill}}
-                        <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
-                        {{#each skillsList as |skills catId|}}
-                        <optgroup label="{{localizeSkill catId 'title'}}">
-                            {{#each skills as |obj|}}
-                            <option value="{{obj.id}}">{{obj.label}}</option>
+                    {{localize 'l5r5e.twenty_questions.adversity'}}
+                    <br>
+                    {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step10.adversity stepName='step10.adversity' itemType='peculiarities' hideDndAt=1 }}
+                </div>
+
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part4.q11'}}</h3>
+                        <textarea name="step11.calms">{{data.step11.calms}}</textarea>
+                    </label>
+                    <br>
+                    {{localize 'l5r5e.twenty_questions.passion'}}
+                    <br>
+                    {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step11.passion stepName='step11.passion' itemType='peculiarities' hideDndAt=1 }}
+                </div>
+
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part4.q12'}}</h3>
+                        <textarea name="step12.worries">{{data.step12.worries}}</textarea>
+                    </label>
+                    <br>
+                    {{localize 'l5r5e.twenty_questions.anxiety'}}
+                    <br>
+                    {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step12.anxiety stepName='step12.anxiety' itemType='peculiarities' hideDndAt=1 }}
+                </div>
+
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part4.q13'}}</h3>
+                        <textarea name="step13.most_learn">{{data.step13.most_learn}}</textarea>
+                    </label>
+                    <br>
+
+                    <table>
+                        <tr>
+                            <td class="third">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.incskill1'}}
+                                    <br>
+                                    <select name="step13.skill" class="skill-select">
+                                        {{#select data.step13.skill}}
+                                        <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                                        {{#ifCond cache.step13.advantage.length '==' '0'}}
+                                        {{#each skillsList as |skills catId|}}
+                                        <optgroup label="{{localizeSkill catId 'title'}}">
+                                            {{#each skills as |obj|}}
+                                            <option value="{{obj.id}}">{{obj.label}}</option>
+                                            {{/each}}
+                                        </optgroup>
+                                        {{/each}}
+                                        {{/ifCond}}
+                                        {{/select}}
+                                    </select>
+                                </label>
+                            </td>
+                            <td class="or">
+                                {{localize 'l5r5e.twenty_questions.or'}}
+                            </td>
+                            <td class="">
+                                {{localize 'l5r5e.twenty_questions.advant'}}
+                                <br>
+                                {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step13.advantage stepName='step13.advantage' itemType='peculiarities' hideDndAt=1 }}
+                            </td>
+                        </tr>
+                    </table>
+
+                    <br>
+                    {{localize 'l5r5e.twenty_questions.disadvant'}}
+                    <br>
+                    {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step13.disadvantage stepName='step13.disadvantage' itemType='peculiarities' hideDndAt=1 }}
+                </div>
+            </article>
+            <article class="tab parts part5" data-group="primary" data-tab="part5">
+                <h2>{{localize 'l5r5e.twenty_questions.part5.title'}}</h2>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part5.q14'}}</h3>
+                        <textarea name="step14.first_sight">{{data.step14.first_sight}}</textarea>
+                    </label>
+                    <br>
+                    <label>
+                        {{localize 'l5r5e.twenty_questions.accoutr'}}
+                        <br>
+                        {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step14.special_features stepName='step14.special_features' itemType='items' hideDndAt=1 }}
+                    </label>
+                </div>
+
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part5.q15'}}</h3>
+                        <textarea name="step15.stress">{{data.step15.stress}}</textarea>
+                    </label>
+                </div>
+
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part5.q16'}}</h3>
+                        <textarea name="step16.relations">{{data.step16.relations}}</textarea>
+                    </label>
+                    <br>
+                    <label>
+                        {{localize 'l5r5e.twenty_questions.object'}}
+                        <br>
+                        {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step16.item stepName='step16.item' itemType='items' hideDndAt=1 }}
+                    </label>
+                </div>
+            </article>
+            <article class="tab parts part6" data-group="primary" data-tab="part6">
+                <h2>{{localize 'l5r5e.twenty_questions.part6.title'}}</h2>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part6.q17'}}</h3>
+                        <textarea name="step17.parents_pov">{{data.step17.parents_pov}}</textarea>
+                    </label>
+                    <br>
+                    <label>
+                        {{localize 'l5r5e.twenty_questions.incskill1'}}
+                        <br>
+                        <select name="step17.skill" class="skill-select">
+                            {{#select data.step17.skill}}
+                            <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
+                            {{#each skillsList as |skills catId|}}
+                            <optgroup label="{{localizeSkill catId 'title'}}">
+                                {{#each skills as |obj|}}
+                                <option value="{{obj.id}}">{{obj.label}}</option>
+                                {{/each}}
+                            </optgroup>
                             {{/each}}
-                        </optgroup>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                </label>
-            </div>
+                            {{/select}}
+                        </select>
+                    </label>
+                </div>
 
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part6.q18'}}</h3>
-                    <textarea name="step18.heritage_name">{{data.step18.heritage_name}}</textarea>
-                </label>
-                <table>
-                    <tr>
-                        <td class="fifty">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.d10r1'}}
-                                <a class="inline-roll roll" title="1d10" data-mode="roll"
-                                   data-flavor="{{localize 'l5r5e.twenty_questions.d10r1'}}" data-formula="1d10">
-                                    <i class="fas fa-dice-d20"></i> 1d10
-                                </a>
-                                <br>
-                                <input type="number" name="step18.heritage_1" value="{{data.step18.heritage_1}}" data-dtype="Number">
-                            </label>
-                        </td>
-                        <td class="fifty">
-                            <label>
-                                {{localize 'l5r5e.twenty_questions.d10r2'}}
-                                <a class="inline-roll roll" title="1d10" data-mode="roll"
-                                   data-flavor="{{localize 'l5r5e.twenty_questions.d10r2'}}" data-formula="1d10">
-                                    <i class="fas fa-dice-d20"></i> 1d10
-                                </a>
-                                <br>
-                                <input type="number" name="step18.heritage_2" value="{{data.step18.heritage_2}}" data-dtype="Number">
-                            </label>
-                        </td>
-                    </tr>
-                </table>
-            </div>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part6.q18'}}</h3>
+                        <textarea name="step18.heritage_name">{{data.step18.heritage_name}}</textarea>
+                    </label>
+                    <table>
+                        <tr>
+                            <td class="fifty">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.d10r1'}}
+                                    <a class="inline-roll roll" title="1d10" data-mode="roll"
+                                       data-flavor="{{localize 'l5r5e.twenty_questions.d10r1'}}" data-formula="1d10">
+                                        <i class="fas fa-dice-d20"></i> 1d10
+                                    </a>
+                                    <br>
+                                    <input type="number" name="step18.heritage_1" value="{{data.step18.heritage_1}}" data-dtype="Number">
+                                </label>
+                            </td>
+                            <td class="fifty">
+                                <label>
+                                    {{localize 'l5r5e.twenty_questions.d10r2'}}
+                                    <a class="inline-roll roll" title="1d10" data-mode="roll"
+                                       data-flavor="{{localize 'l5r5e.twenty_questions.d10r2'}}" data-formula="1d10">
+                                        <i class="fas fa-dice-d20"></i> 1d10
+                                    </a>
+                                    <br>
+                                    <input type="number" name="step18.heritage_2" value="{{data.step18.heritage_2}}" data-dtype="Number">
+                                </label>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
 
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part6.q19'}}</h3>
-                    <textarea name="step19.firstname">{{data.step19.firstname}}</textarea>
-                </label>
-            </div>
-        </div>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part6.q19'}}</h3>
+                        <textarea name="step19.firstname">{{data.step19.firstname}}</textarea>
+                    </label>
+                </div>
+            </article>
+            <article class="tab parts part7" data-group="primary" data-tab="part7">
+                <h2>{{localize 'l5r5e.twenty_questions.part7.title'}}</h2>
+                <div>
+                    <label>
+                        <h3>{{localize 'l5r5e.twenty_questions.part7.q20'}}</h3>
+                        <textarea name="step20.death">{{data.step20.death}}</textarea>
+                    </label>
+                </div>
+                <hr>
+                {{#if hasErrors}}
+                corriger les erreurs pour poursuivre !
+                {{else}}
+                <div class="form-group footer">
+                    <div id="generchar_disclaimer">
+                        {{localize 'l5r5e.twenty_questions.generchar_disclaimer'}}
+                    </div>
 
-        <h2>{{localize 'l5r5e.twenty_questions.part7.title'}}</h2>
-        <div class="parts part7">
-            <div>
-                <label>
-                    <h3>{{localize 'l5r5e.twenty_questions.part7.q20'}}</h3>
-                    <textarea name="step20.death">{{data.step20.death}}</textarea>
-                </label>
-            </div>
-        </div>
+                    <button name="generate" id="generate" type="button">
+                        {{localize 'l5r5e.twenty_questions.generchar'}} <i class='fas fa-arrow-circle-right'></i>
+                    </button>
+                </div>
+                {{/if}}
+            </article>
+        </section>
     </div>
 
-    <hr>
-    {{#if hasErrors}}
-        corriger les erreurs pour poursuivre !
-    {{else}}
-    <div class="form-group footer">
-        <div id="generchar_disclaimer">
-            {{localize 'l5r5e.twenty_questions.generchar_disclaimer'}}
-        </div>
-
-        <button name="generate" id="generate" type="button">
-            {{localize 'l5r5e.twenty_questions.generchar'}} <i class='fas fa-arrow-circle-right'></i>
-        </button>
-    </div>
-    {{/if}}
 </form>
\ No newline at end of file