diff --git a/CHANGELOG.md b/CHANGELOG.md
index 536fb4c..f1c6529 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,18 +14,19 @@
   - The link behavior is :
     - World items and Compendiums : Direct link
     - Actor items : Try to get the world/compendium items as actor items are not accessible to others players. If the source cannot be resolved, do not display the link.
+    - Please note the target permission is not checked to display the link. So player without rights will have a permission error message on click.
 - Added Opportunity usage helper in Journal Compendium (courteously authorized by Edge).
 - Fixed Compendiums entries thanks to TesserWract :
   - Weapons:
-      - Chair, lute, sake bottle and cups, and scroll case use the "Unarmed skill"
+      - Chair, lute, sake bottle and cups, and scroll case use the "Unarmed skill".
       - Changed the umbrella's stab grip to be 2-handed.
   - Techniques :
     - "Utaku Battle Maiden": Replaced "Striking as Air" with "Courtier's Resolve".
     - "Disappearing World Style": Ring used changed from "air" to "fire".
-    - "Lord Hida's Grip": Added the "(Crab)" prerequisite.
-    - "Lord Shiba's Valor": Added the "(Phoenix)" prerequisite.
+    - "Lord Hida's Grip": Added the "(Crab)" prerequisite in title.
+    - "Lord Shiba's Valor": Added the "(Phoenix)" prerequisite in title.
 - Fixes for RnK :
-  - Visibility mode is now consistent with the 1st message (public, private, gm...).
+  - Visibility mode now should be consistent with the 1st message (public, private, gm...).
   - DiceSoNice will now not show the new dice(s) for explosive in non-public mode.
 - Fixed Title's embed items tooltips.
 - Minor fixe on editable state.
diff --git a/system/templates/gm/gm-monitor.html b/system/templates/gm/gm-monitor.html
index 201df7b..484101f 100644
--- a/system/templates/gm/gm-monitor.html
+++ b/system/templates/gm/gm-monitor.html
@@ -25,25 +25,25 @@
                 {{#if actor.data.data.attitude}}<p>({{actor.data.data.attitude}})</p>{{/if}}
             </td>
             <td><i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.stance'}} ({{localizeRing actor.data.data.stance}})</h2>{{localizeStanceTip actor.data.data.stance}}" class="i_{{actor.data.data.stance}} actor-infos-control"></i></td>
-            <td><i class="fa fas prepared-icon-{{actor.isPrepared}} {{#ifCond actor.isPrepared '==' 'false'}}badvalue{{/ifCond}}" title="{{localize (localize 'l5r5e.conflict.initiative.prepared_{value}' value=actor.isPrepared)}}"></i></td>
+            <td><i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.initiative.title'}} : {{localize (localize 'l5r5e.conflict.initiative.prepared_{value}' value=actor.isPrepared)}}</h2>" class="fa fas prepared-icon-{{actor.isPrepared}} {{#ifCond actor.isPrepared '==' 'false'}}badvalue{{/ifCond}} actor-infos-control"></i></td>
             <td>{{#if actor.haveWeaponEquipped}}<i data-type="weapons" data-actor-id="{{actor.id}}" class="fas fa-fan actor-infos-control {{#if actor.haveWeaponReadied}}badvalue{{/if}}"></i>{{/if}}</td>
             <td>{{#if actor.haveArmorEquipped}}<i data-type="armors" data-actor-id="{{actor.id}}" class="fas fa-user-shield actor-infos-control"></i>{{/if}}</td>
             <td>
                 <p>
-                {{#if actor.data.data.identity.school_rank}}
-                    {{actor.data.data.identity.school_rank}}
-                {{else}}
-                    <i class="i_bushi" title="{{localize 'l5r5e.social.npc.combat'}}"></i> {{actor.data.data.conflict_rank.martial}} <i class="i_courtier" title="{{localize 'l5r5e.social.npc.intrigue'}}"></i> {{actor.data.data.conflict_rank.social}}
-                {{/if}}
+                    {{#if actor.data.data.identity.school_rank}}
+                        {{actor.data.data.identity.school_rank}}
+                    {{else}}
+                        <i class="i_bushi" title="{{localize 'l5r5e.social.npc.combat'}}"></i> {{actor.data.data.conflict_rank.martial}} <i class="i_courtier" title="{{localize 'l5r5e.social.npc.intrigue'}}"></i> {{actor.data.data.conflict_rank.social}}
+                    {{/if}}
                 </p>
                 <p>
-                {{#if actor.data.data.rings_affinities}}
-                {{#each actor.data.data.rings_affinities as |ringValue ringId|}}
-                    {{#if ringValue}}
-                    <i class="i_{{ringId}}" title="{{localizeRing ringId}}"></i> {{ringValue}}
+                    {{#if actor.data.data.rings_affinities}}
+                    {{#each actor.data.data.rings_affinities as |ringValue ringId|}}
+                        {{#if ringValue}}
+                            <i class="i_{{ringId}}" title="{{localizeRing ringId}}"></i> {{ringValue}}
+                        {{/if}}
+                    {{/each}}
                     {{/if}}
-                {{/each}}
-                {{/if}}
                 </p>
             </td>
             <td>
diff --git a/system/templates/gm/monitor-tooltips/global.html b/system/templates/gm/monitor-tooltips/global.html
index 3840468..2f1bcdc 100644
--- a/system/templates/gm/monitor-tooltips/global.html
+++ b/system/templates/gm/monitor-tooltips/global.html
@@ -12,4 +12,5 @@
         <li><b>{{localize 'l5r5e.social.npc.advantages'}}</b> : {{advantages}}</li>
         <li><b>{{localize 'l5r5e.social.npc.disadvantages'}}</b> : {{disadvantages}}</li>
     </ul>
+    <p>{{{actorData.description}}}</p>
 </section>
\ No newline at end of file