diff --git a/layouts/shortcodes/maec-encadre.html b/layouts/shortcodes/maec-encadre.html
index bf023f8..7fe2a6e 100644
--- a/layouts/shortcodes/maec-encadre.html
+++ b/layouts/shortcodes/maec-encadre.html
@@ -14,7 +14,13 @@
 
 {{ if $specs }}
 <div class="typewriter-specs">
-  <h3>Fiche technique</h3>
+  <h3>{{$specs.make}} {{$specs.model}}</h3>
+  {{ with $specs.logo }}
+      <figure class="logo">
+        <img src="{{ . }}" alt="Logo of {{ $specs.manufacturer }}">
+      </figure>
+  {{ end }}
+
   {{ with $specs.image }}
   <figure>
     <img src="{{ . }}" alt="Image of {{ $specs.manufacturer }} {{ $specs.type }}">
@@ -22,12 +28,8 @@
   {{ end }}
   <table>
     <tbody>
-      {{ with $specs.logo }}
-      <figure class="logo">
-        <img src="{{ . }}" alt="Logo of {{ $specs.manufacturer }}">
-      </figure>
-      {{ end }}
-      {{ with $specs.manufacturer }}
+      
+      {{ with $specs.make }}
       <tr>
         <th>Fabricant</th>
         <td>{{ . }}</td>
@@ -41,9 +43,9 @@
       </tr>
       {{ end }}
       
-      {{ with $specs.dateLaunched }}
+      {{ with $specs.dateManufactured }}
       <tr>
-        <th>Date de lancement</th>
+        <th>Date de fabrication</th>
         <td>{{ . }}</td>
       </tr>
       {{ end }}
@@ -64,14 +66,14 @@
       
       {{ with $specs.linkWiki }}
       <tr>
-        <th>Lien Wikipedia</th>
+        <th>Ressource externe</th>
         <td><a href="{{ . }}" target="_blank">Link</a></td>
       </tr>
       {{ end }}
       
       {{ with $specs.linkTpdb }}
       <tr>
-        <th>Lien Typewriter Database</th>
+        <th>Typewriter Database</th>
         <td><a href="{{ . }}" target="_blank">Link</a></td>
       </tr>
       {{ end }}