diff --git a/styles/simple.css b/styles/simple.css
index 4b5bb013..a2d18d65 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -63,15 +63,15 @@
 .window-app {
   font-family: CaslonAntique;
   text-align: justify;
-  font-size: 15px;
+  font-size: 16px;
   letter-spacing: 1px;
 }
 
 /* Fonts */
-.sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item {font-family: "GoudyAcc"}
-.sheet nav.sheet-tabs {font-family: "GoudyAcc";}
+.sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item {font-family: "GoudyAcc"} /* For title, sidebar character and scene */
+.sheet nav.sheet-tabs {font-family: "CaslonAntique";} /* For nav and title */
 .window-app input, .foundryvtt-reve-de-dragon .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
-  font-family: "CaslonAntique";
+  font-family: "CaslonAntique"; /* For sheet parts */
 }
 
 .window-header{
@@ -83,7 +83,7 @@
   padding: 0;
 }
 
-.tabs .item.active, a:hover {
+.tabs .item.active, .blessures-list li ul li:first-child:hover, a:hover {
   text-shadow: 1px 0px 0px #ff6600;
 }
 
@@ -95,8 +95,7 @@
 
 table {border: 1px solid #7a7971;}
 
-.grid,
-.grid-2col {
+.grid, .grid-2col {
   display: grid;
   grid-column: span 2 / span 2;
   grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -420,7 +419,7 @@ nav.sheet-tabs .item:after {
   padding: 0;
 }
 
-section.sheet-body:after, section.sheet-body div:after {
+section.sheet-body:after {
   content: "";
   display: block;
   clear: both;
@@ -463,22 +462,63 @@ section.sheet-body:after, section.sheet-body div:after {
 /* Global UI elements  */
 
 /* ======================================== */
+
+h1, h2, h3, h4 {
+  font-weight: bold;
+}
+
+ul, ol {
+    margin: 0;
+    padding: 0;
+}
+ul, li {
+  list-style-type: none;
+}
+
+.sheet li {
+  margin: 0.125rem;
+  padding: 0.25rem;
+}
+.header-fields li {
+  margin: 0;
+  padding: 0;
+}
+
+.alterne-list > .list-item:hover {
+  background: rgba(100, 100, 50, 0.25);
+}
 .alterne-list > .list-item:nth-child(even) {
-  background-color:#7b733b29;
-  background: #7b733b29;
+  background: rgba(80, 60, 0, 0.10);
 }
 .alterne-list > .list-item:nth-child(odd) {
-  background-color: #9e856a0d;
-  background: #9e856a0d;
+  background: rgb(160, 130, 100, 0.05);
 }
+
+.blessures-list ul {
+  display: flex;
+}
+
+.blessures-list li {
+  flex: 1;
+  flex-basis: auto;
+}
+.blessures-list li ul li:first-child {
+  flex: 0;
+  align-items: center;
+  justify-content: center;
+  padding: 0.5rem;
+  cursor: pointer;
+}
+
 .carac-label {
   font-weight: bold;
 }
 .list-item {
-  margin: 2px 2px 2px 2px;
+  margin: 0.125rem;
   box-shadow: inset 0px 0px 1px #00000096;
-  border-radius: 5px;
-  padding: 2px 5px 0px 5px;
+  border-radius: 0.25rem;
+  padding: 0.125rem;
+  flex: 1 1 5rem;
 }
 .sheet-competence-img {
   width: 24px;
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 76906f3a..29d3d71b 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -109,41 +109,41 @@
         <div class="tab items" data-group="primary" data-tab="carac">
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol">
-              <ol class="carac-list alterne-list">
-              {{#each data.carac as |carac key|}}
-                  <li class="competence flexrow list-item" data-attribute="{{key}}">
-                    {{#if carac.isTaille}}
-                      <span class="carac-label flexrow" name="data.carac.{{key}}.label">{{carac.label}}</span>
-                    {{else}}
-                      <span class="carac-label flexrow" name="data.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span>
-                    {{/if}}
-                      {{#if carac.derivee}}
-                        <label class="competence-value flexrow">{{carac.value}}</label>
+              <ul class="carac-list alterne-list">
+                {{#each data.carac as |carac key|}}
+                    <li class="competence flexrow list-item" data-attribute="{{key}}">
+                      {{#if carac.isTaille}}
+                        <span class="carac-label flexrow" name="data.carac.{{key}}.label">{{carac.label}}</span>
                       {{else}}
-                        <input class="carac-value flexrow" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.data.editCaracComp}}disabled{{/unless}} />
-                        <input class="competence-xp flexrow" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}} />
+                        <span class="carac-label flexrow" name="data.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span>
                       {{/if}}
-                  </li>
-              {{/each}}
-              <li class="competence flexrow">
-                <span class="carac-label flexrow" name="carac-total">Total Caractéristiques </span>
-                <span class="competence-value flexrow" name="carac-total-value">{{data.caracSum}} </span>
-              </li>
-              </ol>          
+                        {{#if carac.derivee}}
+                          <label class="competence-value flexrow">{{carac.value}}</label>
+                        {{else}}
+                          <input class="carac-value flexrow" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.data.editCaracComp}}disabled{{/unless}} />
+                          <input class="competence-xp flexrow" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.data.editCaracComp}}disabled{{/unless}} />
+                        {{/if}}
+                    </li>
+                {{/each}}
+                <li class="competence flexrow">
+                  <span class="carac-label flexrow" name="carac-total">Total Caractéristiques </span>
+                  <span class="competence-value flexrow" name="carac-total-value">{{data.caracSum}} </span>
+                </li>
+              </ul>          
             </div>
             <div class="flex-group-left flexcol" >
-              <ol class="carac-list">
-              {{#each data.attributs as |attr key|}}
-                  <li class="competence flexrow" data-attribute="{{key}}">
-                      <span class="competence-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} : {{attr.value}}</span>
-                  </li>
-              {{/each}}
-              {{#each data.sante as |point key|}}
-                  <li class="competence flexrow" data-attribute="{{key}}">
-                      <span class="competence-label flexrow" name="data.attributs.{{key}}.label">{{point.label}} : {{point.value}} / {{point.max}}</span>
-                  </li>
-              {{/each}}
-              </ol>          
+              <ul class="carac-list">
+                {{#each data.attributs as |attr key|}}
+                    <li class="competence flexrow" data-attribute="{{key}}">
+                        <span class="competence-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} : {{attr.value}}</span>
+                    </li>
+                {{/each}}
+                {{#each data.sante as |point key|}}
+                    <li class="competence flexrow" data-attribute="{{key}}">
+                        <span class="competence-label flexrow" name="data.attributs.{{key}}.label">{{point.label}} : {{point.value}} / {{point.max}}</span>
+                    </li>
+                {{/each}}
+              </ul>
             </div>
           </div>
         </div>
@@ -155,8 +155,8 @@
               <header class="competence-header flexrow">
                   <span class="competence-title">Compétences de base</span>
               </header>
-              <ol class="item-list alterne-list">
-              {{#each data.competenceByCategory.generale as |comp key|}}
+              <ul class="item-list alterne-list">
+                {{#each data.competenceByCategory.generale as |comp key|}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
                       <span class="competence-label" name="data.competenceByCategory.generale[{{key}}].name"><a>{{comp.name}}</a></span>
@@ -165,16 +165,16 @@
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                           <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                      </div>                    
+                      </div>
                   </li>
-              {{/each}}
-              </ol>          
+                {{/each}}
+              </ul>
 
               <header class="competence-header flexrow">
                   <span class="competence-title">Compétences Particulières</span>
               </header>
-              <ol class="item-list alterne-list">
-              {{#each data.competenceByCategory.particuliere as |comp key|}}
+              <ul class="item-list alterne-list">
+                {{#each data.competenceByCategory.particuliere as |comp key|}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
                       <span class="competence-label" name="data.competenceByCategory.particuliere[{{key}}].name"><a>{{comp.name}}</a></span>
@@ -183,15 +183,15 @@
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                           <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                      </div>                    
+                      </div>
                   </li>
-              {{/each}}
-              </ol>    
+                {{/each}}
+              </ul>
             <header class="competence-header flexrow">
                 <span class="competence-title">Compétences Spécialisées</span>
             </header>
-            <ol class="item-list alterne-list">
-            {{#each data.competenceByCategory.specialisee as |comp key|}}
+            <ul class="item-list alterne-list">
+              {{#each data.competenceByCategory.specialisee as |comp key|}}
                 <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                     <img class="sheet-competence-img" src="{{comp.img}}"/>
                     <span class="competence-label" name="data.competenceByCategory.specialisee[{{key}}].name"><a>{{comp.name}}</a></span>
@@ -200,18 +200,18 @@
                     <div class="item-controls">
                         <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                         <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                    </div>                    
+                    </div>
                 </li>
-            {{/each}}
-            </ol>          
+              {{/each}}
+            </ul>
           </div>
             
             <div class="flex-group-left flexcol competence-column">
               <header class="competence-header flexrow">
                   <span class="competence-title">Compétences De Mêlée</span>
               </header>
-              <ol class="item-list alterne-list">
-              {{#each data.competenceByCategory.melee as |comp key|}}
+              <ul class="item-list alterne-list">
+                {{#each data.competenceByCategory.melee as |comp key|}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
                       <span class="competence-label" name="data.competenceByCategory.melee[{{key}}].name"><a>{{comp.name}}</a></span>
@@ -220,16 +220,16 @@
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                           <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                      </div>                    
+                      </div>
                   </li>
-              {{/each}}
-              </ol>          
+                {{/each}}
+              </ul>
 
               <header class="competence-header flexrow">
                   <span class="competence-title">Compétences De Tir</span>
               </header>
-              <ol class="item-list alterne-list">
-              {{#each data.competenceByCategory.tir as |comp key|}}
+              <ul class="item-list alterne-list">
+                {{#each data.competenceByCategory.tir as |comp key|}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
                       <span class="competence-label" name="data.competenceByCategory.tir[{{key}}].name"><a>{{comp.name}}</a></span>
@@ -238,15 +238,15 @@
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                           <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                      </div>                    
+                      </div>
                   </li>
-              {{/each}}
-              </ol>          
+                {{/each}}
+              </ul>
 
               <header class="competence-header flexrow">
                   <span class="competence-title">Compétences De Lancer</span>
               </header>
-              <ol class="item-list alterne-list">
+              <ul class="item-list alterne-list">
               {{#each data.competenceByCategory.lancer as |comp key|}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
@@ -256,16 +256,16 @@
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                           <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                      </div>                    
+                      </div>
                   </li>
-              {{/each}}
-              </ol>          
+                {{/each}}
+              </ul>
 
               <header class="competence-header flexrow">
                   <span class="competence-title">Connaissances</span>
               </header>
-              <ol class="item-list alterne-list">
-              {{#each data.competenceByCategory.connaissance as |comp key|}}
+              <ul class="item-list alterne-list">
+                {{#each data.competenceByCategory.connaissance as |comp key|}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
                       <span class="competence-label" name="data.competenceByCategory.connaissance[{{key}}].name"><a>{{comp.name}}</a></span>
@@ -274,15 +274,15 @@
                       <div class="item-controls">
                           <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                           <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                      </div>                    
+                      </div>
                   </li>
-              {{/each}}
-              </ol>          
+                {{/each}}
+              </ul>
 
               <header class="competence-header flexrow">
                   <span class="competence-title">Draconic</span>
               </header>
-              <ol class="item-list alterne-list">
+              <ul class="item-list alterne-list">
               {{#each data.competenceByCategory.draconic as |comp key|}}
                   <li class="item flexrow list-item" data-item-id="{{comp._id}}">
                       <img class="sheet-competence-img" src="{{comp.img}}"/>
@@ -295,23 +295,22 @@
                       </div>                    
                   </li>
               {{/each}}
-              </ol>  
+              </ul>
               <div>
-                <ol class="item-list">
+                <ul class="item-list">
                   <li class="item flexrow">
                     <span class="competence-label">Total XP compétences</span>
                     <span class="competence-value">{{data.competenceXPTotal}}</span>
                   </li>
-                </ol>
-              </div>        
-              <div></div>        
+                </ul>
+              </div>    
             </div>
           </div>
         </div>
 
         {{!-- Combat Tab --}}
         <div class="tab combat" data-group="primary" data-tab="combat">
-            <ol class="item-list alterne-list">
+            <ul class="item-list alterne-list">
               <li class="competence-header flexrow">
                 <span class="competence-title competence-label">Armes</span>
                 <span class="competence-title competence-label">Comp.</span>
@@ -326,156 +325,210 @@
                   <span class="competence-value" name="data.armes[{{key}}].data.dommages">{{numberFormat arme.data.dommages decimals=0 sign=true}}</span>
               </li>
             {{/each}}
-            </ol>          
+            </ul>
         </div>
 
         {{!-- Compteurs/Blessures Tab --}}
         <div class="tab blessurescompteurs" data-group="primary" data-tab="blessurescompteurs">
-          <div class="flex-group-left flexrow">
-              <ol class="item-list alterne-list">
-                {{#each data.compteurs as |compteur key|}}
-                <li class="item flexrow list-item">
-                  <span class="competence-label">{{compteur.label}}</span>
-                  {{#if compteur.isInput}}
-                  <input class="stress-value stress-style compteur-edit" id="{{key}}-edit" type="text" name="{{key}}" value="{{compteur.value}}" data-dtype="number"/>
-                    {{#if compteur.isStress}}
-                    <a class="item-control stress-test" id="stress-test" title="Faire un jet de Stress">Faire un jet de Stress</a>
-                    {{else}}
-                    <label></label>
-                    {{/if}}
-                  <label></label>
+          <div class="flex-group-left">
+            <ul class="item-list flexrow">
+              {{#each data.compteurs as |compteur key|}}
+              <li class="item list-item">
+                <span class="competence-label">{{compteur.label}}</span>
+                {{#if compteur.isInput}}
+                <input class="stress-value stress-style compteur-edit" id="{{key}}-edit" type="text" name="{{key}}" value="{{compteur.value}}" data-dtype="number"/>
+                  {{#if compteur.isStress}}
+                  <a class="item-control stress-test" id="stress-test" title="Faire un jet de Stress">Faire un jet de Stress</a>
                   {{else}}
-                  <span class="competence-label">{{compteur.value}}</span>
+                  <label></label>
                   {{/if}}
-                </li>
-                {{/each}}
-              </ol>
-            </div>
-            <div class="flex-group-left flexcol competence-column">
-              <span class="blessures-title">Blessures Légeres :</span>
-            <div class="blessure-data alterne-list">
+                <label></label>
+                {{else}}
+                <span class="competence-label">{{compteur.value}}</span>
+                {{/if}}
+              </li>
+              {{/each}}
+            </ul>
+          </div>
+          {{!-- Liste de blessures --}}
+          <div class="flex-group-left flexcol competence-column">
+            <h3 class="blessures-title">Blessures Légeres :</h3>
+            <ul class="blessure-data flexrow alterne-list blessures-list">
               {{#each data.blessures.legeres.liste as |bless key|}}
               <li class="item flexrow blessure-data list-item" data-blessure-type="legere" data-attribute={{key}} data-blessure-index="{{key}}">
-                  <a class="item-control blessure-control" title="Blessure Légère" data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                  Premiers soins <input class="blessures-soins" type="text" name='premiers_soins' data-dtype="number" value="{{this.premiers_soins}}"/> - 
-                  Soins complets <input class="blessures-soins" type="text" name='soins_complets' data-dtype="number" value="{{this.soins_complets}}"/> - 
-                  Jours <input class="blessures-soins" type="text" name='jours' data-dtype="number" value="{{this.jours}}"/> - 
-                  Loc. <input class="blessures-soins" type="text" name='localisation' data-dtype="String" value="{{this.localisation}}"/>
+                <ul>
+                  <li class="item-control blessure-control" title="Blessure Légère" data-blessure-active="{{bless.active}}">
+                    {{#if bless.active}}
+                      <i class="fas fa-circle"></i>
+                    {{else}}
+                      <i class="fas fa-genderless"></i>
+                    {{/if}}
+                  </li>
+                  <li>
+                    Premiers soins
+                    <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/>
+                  </li>
+                  <li>
+                    Soins complets
+                    <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/>
+                  </li>
+                  <li>
+                    Jours
+                    <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}"/>
+                  </li>
+                  <li>
+                    Loc.
+                    <input class="blessures-soins" type="text" name="localisation" data-dtype="String" value="{{bless.localisation}}"/>
+                  </li>
+                </ul>
               </li>
               {{/each}}
-            </div>
-            <span class="blessures-title">Blessures Graves :</span>
-            <div>
+            </ul>
+            <h3 class="blessures-title">Blessures Graves :</h3>
+            <ul class="flexrow alterne-list blessures-list">
               {{#each data.blessures.graves.liste as |bless key|}}
-              <li class="item flexrow" data-blessure-type="grave" data-attribute={{key}} data-blessure-index="{{key}}" >
-                <a class="item-control blessure-control" title="Blessure Grave" data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                Premiers soins <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/> - 
-                Soins complets <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/> - 
-                Jours <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}"/> - 
-                Loc. <input class="blessures-soins" type="text" name="localisation" data-dtype="String" value="{{bless.localisation}}"/>
+              <li class="item flexrow list-item" data-blessure-type="grave" data-attribute={{key}} data-blessure-index="{{key}}" >
+                <ul>
+                  <li class="item-control blessure-control" title="Blessure Grave" data-blessure-active="{{bless.active}}">
+                    {{#if bless.active}}
+                      <i class="fas fa-circle"></i>
+                    {{else}}
+                      <i class="fas fa-genderless"></i>
+                    {{/if}}
+                  </li>
+                  <li>
+                    Premiers soins
+                    <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/>
+                  </li>
+                  <li>
+                    Soins complets
+                    <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/>
+                  </li>
+                  <li>
+                    Jours
+                    <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}"/>
+                  </li>
+                  <li>
+                    Loc.
+                    <input class="blessures-soins" type="text" name="localisation" data-dtype="String" value="{{bless.localisation}}"/>
+                  </li>
+                </ul>
               </li>
               {{/each}}
-            </div>
-            <span class="blessures-title">Blessure Critique :</span>
-            <div>
+            </ul>
+            <h3 class="blessures-title">Blessure Critique :</h3>
+            <ul class="flexrow alterne-list blessures-list">
               {{#each data.blessures.critiques.liste as |bless key|}}
-              <li class="item flexrow" data-blessure-type="critique" data-attribute={{key}} data-blessure-index="{{key}}" >
-                <a class="item-control blessure-control" title="Blessure Critique" data-blessure-active="{{bless.active}}">{{#if bless.active}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                Premiers soins <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/> - 
-                Soins complets <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/> - 
-                Jours <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}"/> - 
-                Loc. <input class="blessures-soins" type="text" name="localisation" data-dtype="String" value="{{bless.localisation}}"/>
-              </li>
+              <li class="item list-item flexrow" data-blessure-type="critique" data-attribute={{key}} data-blessure-index="{{key}}" >
+                <ul>
+                  <li class="flex-group-center item-control blessure-control" title="Blessure Critique" data-blessure-active="{{bless.active}}">
+                    {{#if bless.active}}
+                      <i class="fas fa-circle"></i>
+                    {{else}}
+                      <i class="fas fa-genderless"></i>
+                    {{/if}}
+                  </li>
+                  <li>
+                    Premiers soins
+                    <input class="blessures-soins" type="text" name="premiers_soins" data-dtype="number" value="{{bless.premiers_soins}}"/>
+                  </li>
+                  <li>
+                    Soins complets
+                    <input class="blessures-soins" type="text" name="soins_complets" data-dtype="number" value="{{bless.soins_complets}}"/>
+                  </li>
+                  <li>
+                    Jours
+                    <input class="blessures-soins" type="text" name="jours" data-dtype="number" value="{{bless.jours}}"/>
+                  </li>
+                  <li>
+                    Loc.
+                    <input class="blessures-soins" type="text" name="localisation" data-dtype="String" value="{{bless.localisation}}"/>
+                  </li>
+                </ul>
               </li>
               {{/each}}
-            </div>
+            </ul>
           </div>
-          <div>
-            <span><strong>Queues:</strong></span>
-            {{#each data.queues as |queue key|}}
+          {{!-- Queues, Souffles, Tetes, Ombre --}}
+          <ul class="flex-group-left">
             <li class="item flexrow" data-attribute={{key}} data-item-id="{{queue._id}}">
-              <span class="queuesouffle-label"> <a data-item-id="{{queue._id}}">{{queue.name}}</a></span>
-              <div class="item-controls">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
+              <h3>Queues:</h3>
+              {{#each data.queues as |queue key|}}
+                <span class="queuesouffle-label"> <a data-item-id="{{queue._id}}">{{queue.name}}</a></span>
+                <div class="item-controls">
+                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                </div>
+              {{/each}}
             </li>
-            {{/each}}
-          </div>
-          <div>
-            <span><strong>Souffles:</strong></span>
-            {{#each data.souffles as |souffle key|}}
             <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
-              <span class="queuesouffle-label"> <a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
-              <div class="item-controls">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>                    
+              <h3>Souffles:</h3>
+              {{#each data.souffles as |souffle key|}}
+                <span class="queuesouffle-label"> <a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
+                <div class="item-controls">
+                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                </div>
+              {{/each}}                 
             </li>
-            {{/each}}
-          </div>
-          <div>
-            <span><strong>Tetes:</strong></span>
-            {{#each data.tetes as |tete key|}}
             <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
-              <span class="queuesouffle-label"> <a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
-              <div class="item-controls">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
+              <h3>Tetes:</h3>
+              {{#each data.tetes as |tete key|}}
+                <span class="queuesouffle-label"> <a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
+                <div class="item-controls">
+                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                </div>
+              {{/each}}
             </li>
-            {{/each}}
-          </div>
-          <div>
-            <span><strong>Ombres de Thanatos:</strong></span>
-            {{#each data.ombres as |ombre key|}}
             <li class="item flexrow" data-attribute={{key}} data-item-id="{{ombre._id}}">
-              <span class="queuesouffle-label"> <a data-item-id="{{ombre._id}}">{{ombre.name}}</a></span>
-              <div class="item-controls">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>                    
+              <h3>Ombres de Thanatos:</h3>
+              {{#each data.ombres as |ombre key|}}
+                <span class="queuesouffle-label"> <a data-item-id="{{ombre._id}}">{{ombre.name}}</a></span>
+                <div class="item-controls">
+                  <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                </div>
+              {{/each}}
             </li>
-            {{/each}}
-          </div>          
+          </ul>
       </div>
 
-        {{!-- hautreve Tab --}}
-        <div class="tab hautreve" data-group="primary" data-tab="hautreve" style="height:200px">
-          <div>
-            <ol class="item-list">
-              <li class="item flexrow">
-                <span class="competence-label">Position en TMR :</span> 
-                <span>
-                {{#if data.isGM}}
-                  <input class="competence-value" type="text" name="data.reve.tmrpos.coord" value="{{data.reve.tmrpos.coord}}" data-dtype="String"/>
-                {{else}}
-                  {{data.reve.tmrpos.coord}}
-                {{/if}}
-                </span>
-              </li>
-              <li class="item flexrow">
-                <span class="competence-label">Seuil de Rêve :</span>
-                <span>
-                {{#if data.isGM}}
-                  <input class="seuil-reve-value" type="text" name="data.reve.seuil.value" value="{{data.reve.seuil.value}}" data-dtype="Number"/>
-                {{else}}
-                  {{data.reve.seuil.value}}
-                {{/if}}
-                </span>
-              </li>
-              <li class="item flexrow" >
-                <span class="competence-label">Refoulement : </span>
-                <span>
-                {{#if data.isGM}}
-                  <input class="competence-value" type="text" name="data.reve.refoulement.value" value="{{data.reve.refoulement.value}}" data-dtype="Number"/>
-                {{else}}
-                  {{data.reve.refoulement.value}}
-                {{/if}}
-                </span>
-              </li>
-
-            </ol>
-          </div>
-          <div>
-            <span><strong>Sorts:</strong></span>
-            <ol class="item-list">
+      {{!-- hautreve Tab --}}
+      <div class="tab hautreve " data-group="primary" data-tab="hautreve" style="height:200px">
+        <div>
+          <ul class="item-list">
+            <li class="item flexrow">
+              <span class="competence-label">Position en TMR :</span> 
+              <span>
+              {{#if data.isGM}}
+                <input class="competence-value" type="text" name="data.reve.tmrpos.coord" value="{{data.reve.tmrpos.coord}}" data-dtype="String"/>
+              {{else}}
+                {{data.reve.tmrpos.coord}}
+              {{/if}}
+              </span>
+            </li>
+            <li class="item flexrow">
+              <span class="competence-label">Seuil de Rêve :</span>
+              <span>
+              {{#if data.isGM}}
+                <input class="seuil-reve-value" type="text" name="data.reve.seuil.value" value="{{data.reve.seuil.value}}" data-dtype="Number"/>
+              {{else}}
+                {{data.reve.seuil.value}}
+              {{/if}}
+              </span>
+            </li>
+            <li class="item flexrow" >
+              <span class="competence-label">Refoulement : </span>
+              <span>
+              {{#if data.isGM}}
+                <input class="competence-value" type="text" name="data.reve.refoulement.value" value="{{data.reve.refoulement.value}}" data-dtype="Number"/>
+              {{else}}
+                {{data.reve.refoulement.value}}
+              {{/if}}
+              </span>
+            </li>
+          </ul>
+        </div>
+        <div>
+          <span><strong>Sorts:</strong></span>
+          <ul class="item-list">
             {{#each data.sorts as |mysort key|}}
             <li class="item flexrow" data-item-id="{{mysort._id}}" data-attribute="{{key}}">
               <span class="sort-label"> <a data-id="{{mysort._id}}">{{mysort.name}}</a></span> 
@@ -485,82 +538,113 @@
               </div>
             </li>
             {{/each}}
-            </ol>
-          </div>
-          <div>
-            <span><strong>Sorts en Réserve:</strong></span>
-            <ol class="item-list">
+          </ul>
+        </div>
+        <div>
+          <span><strong>Sorts en Réserve:</strong></span>
+          <ul class="item-list">
             {{#each data.sortReserve as |reserve key|}}
             <li class="item flexrow" data-item-id="{{mysort._id}}" data-attribute="{{key}}">
               <span class="sort-label"> {{reserve.sort.name}} - {{reserve.coord}}</span> 
             </li>
             {{/each}}
-            </ol>
-          </div>
+          </ul>
         </div>
+      </div>
 
-        {{!-- Equipment Tab --}}
-        <div class="tab items" data-group="primary" data-tab="items">
-          <span cass=item-name>Encombrement total/max : {{numberFormat data.encombrementTotal decimals=1}} / {{data.attributs.encombrement.value}}</span>
-          <hr>
-          <span cass=item-name>Porté sur soi</span>      
-            <ol class="item-list alterne-list">
-            {{#each data.objets as |item id|}}
-                {{#unless item.estContenu}}
-                {{#if (ne item.type 'conteneur')}}
-                <li class="item flexrow list-item" data-item-id="{{item._id}}">
-                    <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-                    <h4 class="item-name">{{item.name}}</h4>
-                    {{#if item.data.quantite}}
-                    <h4 class="item-quantite">{{item.data.quantite}}</h4>
-                    {{/if}}
-                    <div class="item-controls">
-                        <a class="item-control item-equip" title="Equiper">{{#if item.data.equipe}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                        <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-                        <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-                    </div>
-                </li>
-                {{/if}}
-                {{/unless}}
-            {{/each}}
-            {{#each data.conteneurs as |conteneur id|}}
-            {{buildConteneur this}}
-            {{/each}}
-        </div>
+      {{!-- Equipment Tab --}}
+      <div class="tab items" data-group="primary" data-tab="items">
+        <span cass=item-name>Encombrement total/max : {{numberFormat data.encombrementTotal decimals=1}} / {{data.attributs.encombrement.value}}</span>
+        <span cass=item-name>Porté sur soi</span>      
+        <ul class="item-list alterne-list">
+        {{#each data.objets as |item id|}}
+          {{#unless item.estContenu}}
+          {{#if (ne item.type 'conteneur')}}
+          <li class="item flexrow list-item" data-item-id="{{item._id}}">
+              <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
+              <h4 class="item-name">{{item.name}}</h4>
+              {{#if item.data.quantite}}
+              <h4 class="item-quantite">{{item.data.quantite}}</h4>
+              {{/if}}
+              <div class="item-controls">
+                  <a class="item-control item-equip" title="Equiper">{{#if item.data.equipe}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                  <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+              </div>
+          </li>
+          {{/if}}
+          {{/unless}}
+        {{/each}}
+        {{#each data.conteneurs as |conteneur id|}}
+        {{buildConteneur this}}
+        {{/each}}
+        </ul>
+      </div>
 
-        {{!-- Biography Tab --}}
-        <div class="tab biography" data-group="primary" data-tab="description">
-          <div class="grid grid-2col">
-            <div class="flex-group-left flexcol competence-column">
-              <ol class="item-list alterne-list">
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Sexe : </span><input class="description-value flexrow" type="text" name="data.sexe" value="{{data.sexe}}" data-dtype="String"/></li>
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Poids : </span><input class="description-value flexrow" type="text" name="data.poids" value="{{data.poids}}" data-dtype="String"/></li>
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Taille : </span><input class="description-value flexrow" type="text" name="data.taille" value="{{data.taille}}" data-dtype="String"/></li>
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Cheveux : </span><input class="description-value flexrow" type="text" name="data.cheveux" value="{{data.cheveux}}" data-dtype="String"/></li>
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Yeux : </span><input class="description-value flexrow" type="text" name="data.yeux" value="{{data.yeux}}" data-dtype="String"/></li>
-              </ol>
-            </div>
-            <div>
-              <ol class="item-list alterne-list">
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Age : </span><input class="description-value flexrow" type="text" name="data.age" value="{{data.age}}" data-dtype="String"/></li>
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Heure de naissance : </span><input class="description-value flexrow" type="text" name="data.heure" value="{{data.heure}}" data-dtype="String"/></li>
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Beauté : </span><input class="description-value flexrow" type="text" name="data.beaute" value="{{data.beaute}}" data-dtype="String"/></li>
-                <li class="item flexrow list-item" ><span class="description-label competence-label">Main directrice : </span><input class="description-value flexrow" type="text" name="data.main" value="{{data.main}}" data-dtype="String"/></li>
-              </ol>
-            </div>
+      {{!-- Biography Tab --}}
+      <div class="tab biography" data-group="primary" data-tab="description">        
+        <article class="flexrow">
+          <ul class="item-list alterne-list">
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Sexe : 
+                <input class="description-value flexrow" type="text" name="data.sexe" value="{{data.sexe}}" data-dtype="String"/>
+              </label>
+            </li>
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Poids : 
+                <input class="description-value flexrow" type="text" name="data.poids" value="{{data.poids}}" data-dtype="String"/>
+              </label>
+            </li>
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Taille : 
+                <input class="description-value flexrow" type="text" name="data.taille" value="{{data.taille}}" data-dtype="String"/>
+              </label>
+            </li>
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Cheveux : 
+                <input class="description-value flexrow" type="text" name="data.cheveux" value="{{data.cheveux}}" data-dtype="String"/>
+              </label>
+            </li>
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Yeux : 
+                <input class="description-value flexrow" type="text" name="data.yeux" value="{{data.yeux}}" data-dtype="String"/>
+              </label>
+            </li>
+          </ul>
+          <ul class="item-list alterne-list">
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Age : 
+                <input class="description-value flexrow" type="text" name="data.age" value="{{data.age}}" data-dtype="String"/>
+              </label>
+            </li>
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Heure de naissance : 
+                <input class="description-value flexrow" type="text" name="data.heure" value="{{data.heure}}" data-dtype="String"/>
+              </label>
+            </li>
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Beauté : 
+                <input class="description-value flexrow" type="text" name="data.beaute" value="{{data.beaute}}" data-dtype="String"/>
+              </label>
+            </li>
+            <li class="item flexrow list-item">
+              <label class="description-label competence-label">Main directrice : 
+                <input class="description-value flexrow" type="text" name="data.main" value="{{data.main}}" data-dtype="String"/>
+              </label>
+            </li>
+          </ul>
+        </article>
+        <article class="flexcol">
+          <h3>Biographie : </h3>
+          <div class="form-group editor">
+            {{editor content=data.biographie target="data.biographie" button=true owner=owner editable=editable}}
           </div>
-          <hr>
-          <div class="flexcol">
-            <span><label>Biographie : </label></span>
-            <div class="form-group editor">
-              {{editor content=data.biographie target="data.biographie" button=true owner=owner editable=editable}}
-            </div>
-            <span><label>Notes : </label></span>
-            <div class="form-group editor">
-              {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
-            </div>
+          <h3>Notes : </h3>
+          <div class="form-group editor">
+            {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
           </div>
-        </div>
+        </article>
+      </div>
 
     </section>
 </form>