diff --git a/code/exercise_004_even_qute_products/src/main/java/com/lunatech/training/quarkus/extensions/BigDecimalExtension.java b/code/exercise_004_even_qute_products/src/main/java/com/lunatech/training/quarkus/extensions/BigDecimalExtension.java
new file mode 100644
index 0000000..0fa1668
--- /dev/null
+++ b/code/exercise_004_even_qute_products/src/main/java/com/lunatech/training/quarkus/extensions/BigDecimalExtension.java
@@ -0,0 +1,16 @@
+package com.lunatech.training.quarkus.extensions;
+
+import io.quarkus.qute.RawString;
+import io.quarkus.qute.TemplateExtension;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+@TemplateExtension
+public class BigDecimalExtension {
+
+    static RawString monetary(BigDecimal value) {
+        return new RawString("&euro; " + value.setScale(2, RoundingMode.HALF_EVEN).toString());
+    }
+
+}
\ No newline at end of file
diff --git a/code/exercise_004_even_qute_products/src/main/resources/templates/catalogue.html b/code/exercise_004_even_qute_products/src/main/resources/templates/catalogue.html
index cdc88c0..ebbebe9 100644
--- a/code/exercise_004_even_qute_products/src/main/resources/templates/catalogue.html
+++ b/code/exercise_004_even_qute_products/src/main/resources/templates/catalogue.html
@@ -1,15 +1,14 @@
-<html lang="en">
-  <head>
-    <title>Welcome to the HIQUEA catalog!</title>
-  </head>
-  <body>
+{#include layout}
+  {#title}Welcome to the HIQUEA catalog!{/}
+
+  {#body}
     <h1>HIQUEA Catalog</h1>
     <p>Total products: {products.size}</p>
     <h2>Products</h2>
     <ul>
-        {#each products}
-        <li><a href="/products/{it.id}">{it.name}</a></li>
-        {/each}
+      {#each products}
+          {#productListItem product=it /}
+      {/each}
     </ul>
-  </body>
-</html>
+  {/body}
+{/include}
\ No newline at end of file
diff --git a/code/exercise_004_even_qute_products/src/main/resources/templates/details.html b/code/exercise_004_even_qute_products/src/main/resources/templates/details.html
index f552f32..a12bd90 100644
--- a/code/exercise_004_even_qute_products/src/main/resources/templates/details.html
+++ b/code/exercise_004_even_qute_products/src/main/resources/templates/details.html
@@ -1,8 +1,7 @@
-<html lang="en">
-  <head>
-    <title>{product.name} - Details</title>
-  </head>
-  <body>
+{#include layout}
+  {#title}{product.name} - Details{/}
+
+  {#body}
     <h1>{product.name}</h1>
     <dl>
       <dt>Product ID</dt>
@@ -10,7 +9,7 @@ <h1>{product.name}</h1>
       <dt>Description</dt>
       <dd>{product.description}</dd>
       <dt>Price</dt>
-      <dd>&euro; {product.price}</dd>
+      <dd>{product.price.monetary}</dd>
     </dl>
-  </body>
-</html>
+  {/body}
+{/include}
\ No newline at end of file
diff --git a/code/exercise_004_even_qute_products/src/main/resources/templates/layout.html b/code/exercise_004_even_qute_products/src/main/resources/templates/layout.html
new file mode 100644
index 0000000..9932edc
--- /dev/null
+++ b/code/exercise_004_even_qute_products/src/main/resources/templates/layout.html
@@ -0,0 +1,8 @@
+<html lang="en">
+<head>
+    <title>{#insert title}HIQUEA{/}</title>
+</head>
+<body>
+{#insert body /}
+</body>
+</html>
\ No newline at end of file
diff --git a/code/exercise_004_even_qute_products/src/main/resources/templates/tags/productListItem.html b/code/exercise_004_even_qute_products/src/main/resources/templates/tags/productListItem.html
new file mode 100644
index 0000000..e8dba0c
--- /dev/null
+++ b/code/exercise_004_even_qute_products/src/main/resources/templates/tags/productListItem.html
@@ -0,0 +1 @@
+<li><a href="/products/{product.id}">{product.name}</a></li>
\ No newline at end of file
