diff --git a/lang/en.json b/lang/en.json
index 3493e62..9f53c1d 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -223,6 +223,7 @@
       "world": "World"
     },
     "CharacterNamePlaceholder": "Character Name",
+    "ProfilePlaceholder": "Profile",
     "none": "None",
     "bonuses": "Bonuses",
     "choose_ability": "Choose Ability",
diff --git a/lang/fr.json b/lang/fr.json
index bc7fe65..0f05774 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -314,6 +314,7 @@
     "total_damage": "Dégâts totaux",
     "wound_thresholds": "Seuils de blessures",
     "CharacterNamePlaceholder": "Nom du personnage",
+    "ProfilePlaceholder": "Profil",
     "sexes": {
       "female": "Féminin",
       "male": "Masculin"
diff --git a/less/actor/actor.less b/less/actor/actor.less
index 31cc399..f63ef78 100644
--- a/less/actor/actor.less
+++ b/less/actor/actor.less
@@ -106,6 +106,10 @@
       overflow-y: auto;
       padding: 8px;
       border-right: 1px solid rgba(255, 255, 255, 0.1);
+
+      > * {
+        flex: 0 0 auto;
+      }
     }
 
     > nav.tabs {
@@ -331,21 +335,39 @@
   }
 
   .padding-with-frieze {
-    margin-left: 18% !important;
-    margin-right: 10% !important;
+    padding: 0.25rem;
 
     li {
       max-width: 100%;
     }
 
-    .major-totem {
-      position: relative;
-
+    .resource-label {
       h4 {
-        position: absolute;
-        transform: rotate(-8deg);
-        opacity: 1;
-        transition: 0.2s;
+        font-size: 1em;
+      }
+    }
+
+    .major-totem {
+      display: flex;
+      justify-content: center;
+      margin-bottom: 0.75rem;
+      padding: 0.6rem;
+      background-color: rgba(0, 0, 0, 0.12);
+      border: 2px groove #eeede0;
+
+      .flexcol {
+        gap: 0.3rem;
+
+        h4 {
+          margin: 0;
+          font-size: 1.1em;
+        }
+
+        .img-totem {
+          width: 64px;
+          height: 64px;
+          filter: drop-shadow(0px 0px 10px rgb(0, 0, 0));
+        }
       }
     }
 
diff --git a/less/actor/totem.less b/less/actor/totem.less
index d532431..66edb61 100644
--- a/less/actor/totem.less
+++ b/less/actor/totem.less
@@ -19,26 +19,39 @@
   }
 
   div.minor-totems {
-    position: relative;
-    height: 8.5rem;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: stretch;
+    gap: 0.25rem;
+    min-height: 8.5rem;
+    padding: 0.5rem;
     background-color: rgba(146, 156, 111, 0.5215686275);
 
     h3 {
-      position: relative;
-      z-index: 1;
+      text-align: center;
+      margin: 0;
+      font-size: 1.2rem;
+      line-height: 1.1;
+    }
+
+    .totem-row {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
 
     h5 {
-      position: absolute;
-      top: 2.6rem;
       margin: 0;
-      z-index: 1;
+      display: inline-flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 0.25rem;
+      font-size: 0.8rem;
 
       img {
-        max-width: 2rem;
-        position: absolute;
-        top: 1.4rem;
-        bottom: auto;
+        max-width: 1.5rem;
+        height: auto;
       }
 
       &.human, &.adapted {
@@ -62,50 +75,31 @@
     }
 
     .totem-dice {
-      position: absolute;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      z-index: 2;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
 
       .human-dice,
       .adapted-dice {
         display: flex;
         flex-direction: row;
-        margin-left: 2rem;
+        align-items: center;
       }
 
       .human-dice i,
       .adapted-dice i {
-        padding-top: 0.5rem;
         color: @totem-human-color;
-        position: relative;
-        z-index: 0;
         pointer-events: none;
       }
 
       .adapted-dice {
-        justify-content: flex-end;
-        margin-left: 0;
-        margin-right: 2rem;
         transform: rotate(180deg);
+
+        i {
+          transform: rotate(180deg);
+          color: @totem-adapted-color;
+        }
       }
-
-      .adapted-dice i {
-        transform: rotate(180deg);
-        padding-top: 0.5rem;
-        color: @totem-adapted-color;
-      }
-    }
-
-    .human {
-      left: 0;
-      img { left: 0; }
-    }
-
-    .adapted {
-      right: 0;
-      img { right: 0; left: auto; }
     }
   }
 }
diff --git a/module/applications/sheets/base-actor-sheet.mjs b/module/applications/sheets/base-actor-sheet.mjs
index c6e1101..6e695bf 100644
--- a/module/applications/sheets/base-actor-sheet.mjs
+++ b/module/applications/sheets/base-actor-sheet.mjs
@@ -114,7 +114,8 @@ export default class VermineBaseActorSheet extends HandlebarsApplicationMixin(fo
       isEditable: this.isEditable,
       enrichedNotes: await enrich("identity.notes"),
       enrichedBiography: await enrich("identity.biography"),
-      enrichedRelations: await enrich("identity.relations")
+      enrichedRelations: await enrich("identity.relations"),
+      enrichedEquipmentNotes: await enrich("equipment.description")
     }
   }
 
diff --git a/templates/actor/appv2/character-equipment.hbs b/templates/actor/appv2/character-equipment.hbs
index 43f7644..a123ff1 100644
--- a/templates/actor/appv2/character-equipment.hbs
+++ b/templates/actor/appv2/character-equipment.hbs
@@ -82,18 +82,15 @@
     </div>
     <div>
       <h4>{{ localize 'IDENTITY.notes'}}</h4>
-      {{editor system.equipment.description target="system.equipment.description"
-      button=true owner=owner editable=editable}}
+      {{formInput systemFields.equipment.fields.description enriched=enrichedEquipmentNotes value=system.equipment.description name="system.equipment.description" toggled=true}}
     </div>
   </div>
-  <div class="grid grid-2col">
-    <div class="weapons">
-      <h4>{{localize 'ITEMS.weapons'}}</h4>
-      {{> "systems/vermine2047/templates/actor/parts/actor-weapons.hbs"}}
-    </div>
-    <div class="protections">
-      <h4>{{localize 'ITEMS.defenses'}}</h4>
-      {{> "systems/vermine2047/templates/actor/parts/actor-defenses.hbs"}}
-    </div>
+  <div class="weapons">
+    <h4>{{localize 'ITEMS.weapons'}}</h4>
+    {{> "systems/vermine2047/templates/actor/parts/actor-weapons.hbs"}}
+  </div>
+  <div class="protections">
+    <h4>{{localize 'ITEMS.defenses'}}</h4>
+    {{> "systems/vermine2047/templates/actor/parts/actor-defenses.hbs"}}
   </div>
 </div>
diff --git a/templates/actor/appv2/character-header.hbs b/templates/actor/appv2/character-header.hbs
index 865ba89..8f10daf 100644
--- a/templates/actor/appv2/character-header.hbs
+++ b/templates/actor/appv2/character-header.hbs
@@ -2,7 +2,6 @@
 <header class="char-header grid grid-2col">
   <section class="char-details">
     <h1 class="char-name flexrow flex-group-left w-full">
-      <label>{{ localize 'IDENTITY.name' }}</label>
       {{#if isEditMode}}
       <input name="name" type="text" value="{{actor.name}}"
         placeholder="{{localize "VERMINE.CharacterNamePlaceholder"}}" />
@@ -11,12 +10,12 @@
       {{/if}}
     </h1>
     <div class="profile flexrow flex-group-center">
-      <label>{{ localize 'IDENTITY.profile' }}</label>
       {{#if isEditMode}}
       <input name="system.identity.profile" type="text"
-        value="{{system.identity.profile }}" data-dtype="String" />
+        value="{{system.identity.profile }}" data-dtype="String"
+        placeholder="{{ localize 'VERMINE.ProfilePlaceholder' }}" />
       {{else}}
-      <span>{{system.identity.profile}}</span>
+      <span>{{#if system.identity.profile}}{{system.identity.profile}}{{else}}{{ localize 'VERMINE.ProfilePlaceholder' }}{{/if}}</span>
       {{/if}}
     </div>
     <div class="flexrow flex-group-center">
@@ -34,7 +33,6 @@
   </section>
   <section class="char-level">
     <h1 class="char-vermine2047 flexrow flex-group-left w-full">
-      <label for="system.identity.totem">{{ localize 'IDENTITY.totem' }}</label>
       {{#if (eq system.identity.totem "")}}
       <a data-action="chooseTotem" class="chooseTotem">Choisissez votre totem</a>
       {{ else }}
diff --git a/templates/actor/appv2/character-main.hbs b/templates/actor/appv2/character-main.hbs
index 41642dc..c4cc99f 100644
--- a/templates/actor/appv2/character-main.hbs
+++ b/templates/actor/appv2/character-main.hbs
@@ -18,27 +18,29 @@
     <img class="profile-img" src="{{actor.img}}" data-action="editImage" data-edit="img"
       title="{{actor.name}}" height="100" width="100" />
   </div>
-  <div class="minor-totems">
-    {{!-- Totem Evolution --}}
-    <h3>{{localize "ITEMS.evolution"}}</h3>
-    <h5 class="human
-      {{#ifgt system.adaptation.totems.human.value system.adaptation.totems.adapted.value}}
-      major
-      {{/ifgt}}
-      ">{{localize "TOTEMS.human.name"}}
-      <img class="img-totem"
-        src="/systems/vermine2047/assets/images/ui/totems/human.webp" />
-    </h5>
+    <div class="minor-totems">
+      {{!-- Totem Evolution --}}
+      <h3>{{localize "ITEMS.evolution"}}</h3>
+      <div class="totem-row">
+        <h5 class="human
+        {{#ifgt system.adaptation.totems.human.value system.adaptation.totems.adapted.value}}
+          major
+        {{/ifgt}}
+        ">{{localize "TOTEMS.human.name"}}
+          <img class="img-totem"
+            src="/systems/vermine2047/assets/images/ui/totems/human.webp" />
+        </h5>
 
-    <h5 class="adapted
-    {{#ifgt system.adaptation.totems.adapted.value system.adaptation.totems.human.value}}
-      major
-      {{/ifgt}}">{{localize "TOTEMS.adapted.name"}}
-      <img class="img-totem"
-        src="/systems/vermine2047/assets/images/ui/totems/adapted.webp" />
-    </h5>
+        <h5 class="adapted
+        {{#ifgt system.adaptation.totems.adapted.value system.adaptation.totems.human.value}}
+          major
+        {{/ifgt}}">{{localize "TOTEMS.adapted.name"}}
+          <img class="img-totem"
+            src="/systems/vermine2047/assets/images/ui/totems/adapted.webp" />
+        </h5>
+      </div>
 
-    <div class="totem-dice flexrow flex-group-center">
+      <div class="totem-dice flexrow flex-group-center">
       <div class="human-dice flexrow">
         {{#repeat system.adaptation.totems.human.max 1 "humantotem"}}
         <div class="hexa{{#ifgteq system.adaptation.totems.human.value @humantotem}} checked{{/ifgteq}}"
@@ -77,12 +79,12 @@
     {{#if system.identity.totem }}
     <li class="row lgb major-totem">
       <div class="flexcol flex-group-center items-center w-full">
-        <h4>{{ smarttl 'TOTEMS' system.identity.totem 'name' }}</h4>
         <img
           class="img-totem"
           src="/systems/vermine2047/assets/images/ui/totems/{{ system.identity.totem }}.webp"
-          alt="{{ smarttl 'TOTEMS' system.identity.totem 'name' }}" width="80"
-          height="80" />
+          alt="{{ smarttl 'TOTEMS' system.identity.totem 'name' }}" width="64"
+          height="64" />
+        <h4>{{ smarttl 'TOTEMS' system.identity.totem 'name' }}</h4>
       </div>
     </li>
     {{/if}}
diff --git a/templates/actor/character/character-header.hbs b/templates/actor/character/character-header.hbs
index 7d546e9..0f8d98f 100644
--- a/templates/actor/character/character-header.hbs
+++ b/templates/actor/character/character-header.hbs
@@ -2,14 +2,13 @@
 <header class="char-header grid grid-2col">
     <section class="char-details">
         <h1 class="char-name flexrow  flex-group-left w-full">
-            <label>{{ localize 'IDENTITY.name' }}</label>
             <input name="name" type="text" value="{{actor.name}}"
                 placeholder="{{localize "VERMINE.CharacterNamePlaceholder"}}" />
         </h1>
         <div class="profile flexrow  flex-group-center">
-            <label>{{ localize 'IDENTITY.profile' }}</label>
             <input name="system.identity.profile" type="text"
-                value="{{system.identity.profile }}" data-dtype="String" />
+                value="{{system.identity.profile }}" data-dtype="String"
+                placeholder="{{ localize 'VERMINE.ProfilePlaceholder' }}" />
         </div>
         <div class="flexrow  flex-group-center">
             <label for="system.identity.age">{{ localize 'IDENTITY.age'
@@ -24,8 +23,6 @@
     </section>
     <section class="char-level">
         <h1 class="char-vermine2047 flexrow flex-group-left w-full">
-            <label for="system.identity.totem">{{ localize 'IDENTITY.totem'
-                }}</label>
             {{#if (eq system.identity.totem "")}}
             <a name="chooseTotem" class="chooseTotem">Choisissez votre totem</a>
             {{ else }}
diff --git a/templates/actor/character/character-id.hbs b/templates/actor/character/character-id.hbs
index 994db5e..e1db30a 100644
--- a/templates/actor/character/character-id.hbs
+++ b/templates/actor/character/character-id.hbs
@@ -5,22 +5,24 @@
 <div class="minor-totems">
   {{!-- Totem Evolution --}}
   <h3>{{localize "ITEMS.evolution"}}</h3>
-  <h5 class="human
-    {{#ifgt system.adaptation.totems.human.value system.adaptation.totems.adapted.value}}
-    major
-    {{/ifgt}}
-    ">{{localize "TOTEMS.human.name"}}
-    <img class="img-totem"
-      src="/systems/vermine2047/assets/images/ui/totems/human.webp" />
-  </h5>
+  <div class="totem-row">
+    <h5 class="human
+      {{#ifgt system.adaptation.totems.human.value system.adaptation.totems.adapted.value}}
+      major
+      {{/ifgt}}
+      ">{{localize "TOTEMS.human.name"}}
+      <img class="img-totem"
+        src="/systems/vermine2047/assets/images/ui/totems/human.webp" />
+    </h5>
 
-  <h5 class="adapted
-  {{#ifgt system.adaptation.totems.adapted.value system.adaptation.totems.human.value}}
-    major
-    {{/ifgt}}">{{localize "TOTEMS.adapted.name"}}
-    <img class="img-totem"
-      src="/systems/vermine2047/assets/images/ui/totems/adapted.webp" />
-  </h5>
+    <h5 class="adapted
+    {{#ifgt system.adaptation.totems.adapted.value system.adaptation.totems.human.value}}
+      major
+      {{/ifgt}}">{{localize "TOTEMS.adapted.name"}}
+      <img class="img-totem"
+        src="/systems/vermine2047/assets/images/ui/totems/adapted.webp" />
+    </h5>
+  </div>
 
   <div class="totem-dice flexrow flex-group-center">
     <div class="human-dice flexrow">
@@ -63,8 +65,8 @@
       <img
         class="img-totem"
         src="/systems/vermine2047/assets/images/ui/totems/{{ system.identity.totem }}.webp"
-        alt="{{ smarttl 'TOTEMS' system.identity.totem 'name' }}" width="80"
-        height="80" />
+        alt="{{ smarttl 'TOTEMS' system.identity.totem 'name' }}" width="64"
+        height="64" />
     </div>
   </li>
   {{/if}}
diff --git a/templates/actor/parts/actor-weapons.hbs b/templates/actor/parts/actor-weapons.hbs
index 41d0a12..6c5158f 100644
--- a/templates/actor/parts/actor-weapons.hbs
+++ b/templates/actor/parts/actor-weapons.hbs
@@ -1,11 +1,11 @@
 <ol class="items-list">
   <li class="item flexrow items-header">
     <div class="item-name" style="flex:4;">{{ localize 'IDENTITY.name'}}</div>
-    <div class="item-ranges">{{ localize 'VERMINE.ranges'}}</div>
-    <div class="item-damages">{{ localize 'VERMINE.dmg'}}</div>
-    <div class="item-ammo">{{ localize 'VERMINE.ammo_sm'}}</div>
-    <div class="item-rarity">{{ localize 'VERMINE.rarity_sm'}}</div>
-    <div class="item-reliability">{{ localize 'VERMINE.reliability_sm'}}</div>
+    <div class="item-ranges" style="flex:2;">{{ localize 'VERMINE.ranges'}}</div>
+    <div class="item-damages" style="flex:2;">{{ localize 'VERMINE.dmg'}}</div>
+    <div class="item-ammo" style="flex:1;">{{ localize 'VERMINE.ammo_sm'}}</div>
+    <div class="item-rarity" style="flex:1;">{{ localize 'VERMINE.rarity_sm'}}</div>
+    <div class="item-reliability" style="flex:1;">{{ localize 'VERMINE.reliability_sm'}}</div>
     <div class="item-controls">
       <a class="item-control item-create" title="Create item"
         data-type="weapon" data-action="create"><i class="fas fa-plus"></i></a>
@@ -22,18 +22,18 @@
       </div>
       <a data-action="roll">{{item.name}}</a>
     </div>
-    <div><a data-action="edit" title="Edit Item">{{item.system.min_range}} /
+    <div style="flex:2;"><a data-action="edit" title="Edit Item">{{item.system.min_range}} /
         {{item.system.max_range}}</a></div>
-    <div><a data-action="edit" title="Edit Item">
+    <div style="flex:2;"><a data-action="edit" title="Edit Item">
         {{#if item.system.damage.addVigor}}
         vigueur+
         {{/if}}
         {{item.system.damage.value}}
         ({{item.system.damage.type}})
       </a></div>
-    <div><a data-action="edit" title="Edit Item">{{item.system.ammo}}</a></div>
-    <div><a data-action="edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
-    <div><a data-action="edit" title="Edit Item">{{item.system.reliability}}</a></div>
+    <div style="flex:1;"><a data-action="edit" title="Edit Item">{{item.system.ammo}}</a></div>
+    <div style="flex:1;"><a data-action="edit" title="Edit Item">{{item.system.rarity.value}}</a></div>
+    <div style="flex:1;"><a data-action="edit" title="Edit Item">{{item.system.reliability}}</a></div>
     <div class="item-controls">
       <a data-action="delete" title="Delete Item"><i
           class="fas fa-trash"></i></a>