diff --git a/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/TrueFalse.test.tsx.snap b/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/TrueFalse.test.tsx.snap
index c010906..21e2a07 100644
--- a/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/TrueFalse.test.tsx.snap
+++ b/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/TrueFalse.test.tsx.snap
@@ -35,66 +35,43 @@ exports[`TrueFalse snapshot test with image 1`] = `
   border-radius: 4px;
   background-color: hsl(0, 0%, 100%);
   color: hsl(180, 15%, 41%);
-">Vrai/Faux</span>
+">Réponse courte</span>
     </span>
   </div>
-<p style="
+
+  <div style="
+  display: flex;
+">
+    <span>
+      <p style="
   color: hsl(0, 0%, 0%);
-">Sample Stem with Image</p><span style="
+" class="present-question-stem">
+                      Sample Stem with Image <img alt="" src="https://example.com/cat.gif">
+
+                  </p>
+    </span>
+  </div>
+
+    <div>
+      <span style="
   color: hsl(0, 0%, 0%);
-">Choisir une réponse:</span>
-        <div class='multiple-choice-answers-container'>
-          <input class="gift-input" type="radio" id="idmocked-id" name="idmocked-id">
-          
-            <label style="
-          display: inline-block;
-          padding: 0.2em 0 0.2em 0;
-         
-  color: hsl(0, 0%, 0%);
-" for="idmocked-id">
-            Vrai
-            </label>
-          <svg style="
-  vertical-align: text-bottom;
+">Réponse: </span><input class="gift-input" type="text" style="
   display: inline-block;
-  margin-left: 0.1rem;
-  margin-right: 0.2rem;
- 
-    width: 1em;
-    color: hsl(120, 39%, 54%);
-  " role="img" aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"></path></svg>
-          <span style="
-      color: hsl(180, 15%, 41%);
-    ">Correct!</span>
-          </input>
+  padding: 0.375rem 0.75rem;
+  line-height: 1.5;
+  color: hsl(0, 0%, 16%);
+  background-color: hsl(0, 0%, 100%);
+  border: 1px solid hsl(0, 0%, 81%);
+  border-radius: 0.25rem;
+  box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 2px 0px;
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+  width: 90%;
+" placeholder="A, B, C">
         </div>
-        
-        <div class='multiple-choice-answers-container'>
-          <input class="gift-input" type="radio" id="idmocked-id" name="idmocked-id">
-          
-            <label style="
-          display: inline-block;
-          padding: 0.2em 0 0.2em 0;
-         
-  color: hsl(0, 0%, 0%);
-" for="idmocked-id">
-            Faux
-            </label>
-          <svg style="
-  vertical-align: text-bottom;
-  display: inline-block;
-  margin-left: 0.1rem;
-  margin-right: 0.2rem;
- 
-    width: 0.75em;
-    color: hsl(2, 64%, 58%);
-  " role="img" aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 352 512"><path fill="currentColor" d="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"></path></svg>
-          <span style="
-      color: hsl(180, 15%, 41%);
-    ">Incorrect!</span>
-          </input>
-        </div>
-        <div style="
+      <div style="
   position: relative;
   margin-top: 1rem;
   padding: 0 1rem;
@@ -104,7 +81,7 @@ exports[`TrueFalse snapshot test with image 1`] = `
   border-radius: 6px;
   box-shadow: 0px 2px 5px hsl(0, 0%, 74%);
 ">
-        <p><img src="https://via.placeholder.com/150" alt="Sample Image" /></p>
+        <p><img alt="Sample Image" src="https://via.placeholder.com/150"></p>
       </div></section>
 </DocumentFragment>
 `;
@@ -147,9 +124,19 @@ exports[`TrueFalse snapshot test with katex 1`] = `
 "&gt;Vrai/Faux&lt;/span&gt;
     &lt;/span&gt;
   &lt;/div&gt;
-&lt;p style="
+
+  &lt;div style="
+  display: flex;
+"&gt;
+    &lt;span&gt;
+      &lt;p style="
   color: hsl(0, 0%, 0%);
-"&gt;&lt;span class="katex-display"&gt;&lt;span class="katex"&gt;&lt;span class="katex-mathml"&gt;&lt;math xmlns="http://www.w3.org/1998/Math/MathML" display="block"&gt;&lt;semantics&gt;&lt;mrow&gt;&lt;mfrac&gt;&lt;mrow&gt;&lt;mi&gt;z&lt;/mi&gt;&lt;mi&gt;z&lt;/mi&gt;&lt;mi&gt;z&lt;/mi&gt;&lt;/mrow&gt;&lt;mrow&gt;&lt;mi&gt;y&lt;/mi&gt;&lt;mi&gt;y&lt;/mi&gt;&lt;mi&gt;y&lt;/mi&gt;&lt;/mrow&gt;&lt;/mfrac&gt;&lt;/mrow&gt;&lt;annotation encoding="application/x-tex"&gt;\\frac{zzz}{yyy}&lt;/annotation&gt;&lt;/semantics&gt;&lt;/math&gt;&lt;/span&gt;&lt;span class="katex-html" aria-hidden="true"&gt;&lt;span class="base"&gt;&lt;span class="strut" style="height:1.988em;vertical-align:-0.8804em;"&gt;&lt;/span&gt;&lt;span class="mord"&gt;&lt;span class="mopen nulldelimiter"&gt;&lt;/span&gt;&lt;span class="mfrac"&gt;&lt;span class="vlist-t vlist-t2"&gt;&lt;span class="vlist-r"&gt;&lt;span class="vlist" style="height:1.1076em;"&gt;&lt;span style="top:-2.314em;"&gt;&lt;span class="pstrut" style="height:3em;"&gt;&lt;/span&gt;&lt;span class="mord"&gt;&lt;span class="mord mathnormal" style="margin-right:0.03588em;"&gt;yyy&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style="top:-3.23em;"&gt;&lt;span class="pstrut" style="height:3em;"&gt;&lt;/span&gt;&lt;span class="frac-line" style="border-bottom-width:0.04em;"&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style="top:-3.677em;"&gt;&lt;span class="pstrut" style="height:3em;"&gt;&lt;/span&gt;&lt;span class="mord"&gt;&lt;span class="mord mathnormal" style="margin-right:0.04398em;"&gt;zzz&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span class="vlist-s"&gt;​&lt;/span&gt;&lt;/span&gt;&lt;span class="vlist-r"&gt;&lt;span class="vlist" style="height:0.8804em;"&gt;&lt;span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span class="mclose nulldelimiter"&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/p&gt;&lt;span style="
+" class="present-question-stem"&gt;
+                      &lt;span class="katex-display"&gt;&lt;span class="katex"&gt;&lt;span class="katex-mathml"&gt;&lt;math display="block" xmlns="http://www.w3.org/1998/Math/MathML"&gt;&lt;mrow&gt;&lt;mfrac&gt;&lt;mrow&gt;&lt;mi&gt;z&lt;/mi&gt;&lt;mi&gt;z&lt;/mi&gt;&lt;mi&gt;z&lt;/mi&gt;&lt;/mrow&gt;&lt;mrow&gt;&lt;mi&gt;y&lt;/mi&gt;&lt;mi&gt;y&lt;/mi&gt;&lt;mi&gt;y&lt;/mi&gt;&lt;/mrow&gt;&lt;/mfrac&gt;&lt;/mrow&gt;\\frac{zzz}{yyy}&lt;/math&gt;&lt;/span&gt;&lt;span aria-hidden="true" class="katex-html"&gt;&lt;span class="base"&gt;&lt;span style="height:1.988em;vertical-align:-0.8804em;" class="strut"&gt;&lt;/span&gt;&lt;span class="mord"&gt;&lt;span class="mopen nulldelimiter"&gt;&lt;/span&gt;&lt;span class="mfrac"&gt;&lt;span class="vlist-t vlist-t2"&gt;&lt;span class="vlist-r"&gt;&lt;span style="height:1.1076em;" class="vlist"&gt;&lt;span style="top:-2.314em;"&gt;&lt;span style="height:3em;" class="pstrut"&gt;&lt;/span&gt;&lt;span class="mord"&gt;&lt;span style="margin-right:0.03588em;" class="mord mathnormal"&gt;yyy&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style="top:-3.23em;"&gt;&lt;span style="height:3em;" class="pstrut"&gt;&lt;/span&gt;&lt;span style="border-bottom-width:0.04em;" class="frac-line"&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style="top:-3.677em;"&gt;&lt;span style="height:3em;" class="pstrut"&gt;&lt;/span&gt;&lt;span class="mord"&gt;&lt;span style="margin-right:0.04398em;" class="mord mathnormal"&gt;zzz&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span class="vlist-s"&gt;​&lt;/span&gt;&lt;/span&gt;&lt;span class="vlist-r"&gt;&lt;span style="height:0.8804em;" class="vlist"&gt;&lt;span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span class="mclose nulldelimiter"&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;
+                  &lt;/p&gt;
+    &lt;/span&gt;
+  &lt;/div&gt;
+&lt;span style="
   color: hsl(0, 0%, 0%);
 "&gt;Choisir une réponse:&lt;/span&gt;
         &lt;div class='multiple-choice-answers-container'&gt;
@@ -213,8 +200,7 @@ exports[`TrueFalse snapshot test with katex 1`] = `
   border-radius: 6px;
   box-shadow: 0px 2px 5px hsl(0, 0%, 74%);
 "&gt;
-        &lt;p&gt;Sample Global Feedback
-&lt;/p&gt;
+        &lt;p&gt;Sample Global Feedback&lt;/p&gt;
       &lt;/div&gt;&lt;/section&gt;
 </DocumentFragment>
 `;
@@ -257,9 +243,19 @@ exports[`TrueFalse snapshot test with moodle 1`] = `
 "&gt;Vrai/Faux&lt;/span&gt;
     &lt;/span&gt;
   &lt;/div&gt;
-&lt;p style="
+
+  &lt;div style="
+  display: flex;
+"&gt;
+    &lt;span&gt;
+      &lt;p style="
   color: hsl(0, 0%, 0%);
-"&gt;Sample Stem&lt;/p&gt;&lt;span style="
+" class="present-question-stem"&gt;
+                      Sample Stem
+                  &lt;/p&gt;
+    &lt;/span&gt;
+  &lt;/div&gt;
+&lt;span style="
   color: hsl(0, 0%, 0%);
 "&gt;Choisir une réponse:&lt;/span&gt;
         &lt;div class='multiple-choice-answers-container'&gt;
@@ -366,9 +362,19 @@ exports[`TrueFalse snapshot test with plain text 1`] = `
 "&gt;Vrai/Faux&lt;/span&gt;
     &lt;/span&gt;
   &lt;/div&gt;
-&lt;p style="
+
+  &lt;div style="
+  display: flex;
+"&gt;
+    &lt;span&gt;
+      &lt;p style="
   color: hsl(0, 0%, 0%);
-"&gt;Sample Stem&lt;/p&gt;&lt;span style="
+" class="present-question-stem"&gt;
+                      Sample Stem
+                  &lt;/p&gt;
+    &lt;/span&gt;
+  &lt;/div&gt;
+&lt;span style="
   color: hsl(0, 0%, 0%);
 "&gt;Choisir une réponse:&lt;/span&gt;
         &lt;div class='multiple-choice-answers-container'&gt;