diff --git a/build.gradle.kts b/build.gradle.kts
index c88478a..0ab8a76 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,13 +4,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 description = "Kotlin version of the Spring Petclinic application"
 group = "org.springframework.samples"
 // Align with Spring Version
-version = "3.1.0"
+version = "3.1.3"
 
 java.sourceCompatibility = JavaVersion.VERSION_17
 
 plugins {
-    val kotlinVersion = "1.8.21"
-    id("org.springframework.boot") version "3.1.0"
+    val kotlinVersion = "1.8.22"
+    id("org.springframework.boot") version "3.1.3"
     id("io.spring.dependency-management") version "1.1.0"
     id("com.google.cloud.tools.jib") version "3.1.4"
     kotlin("jvm") version kotlinVersion
diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html
index 916ce1e..a6e133f 100755
--- a/src/main/resources/templates/fragments/layout.html
+++ b/src/main/resources/templates/fragments/layout.html
@@ -45,23 +45,23 @@
 
             <ul class="nav navbar-nav me-auto">
 
-                <li th:replace="::menuItem ('/','home','home page','home','Home')">
+                <li th:replace="~{::menuItem ('/','home','home page','home','Home')}">
                     <span class="fa fa-home" aria-hidden="true"></span>
                     <span>Home</span>
                 </li>
 
-                <li th:replace="::menuItem ('/owners/find','owners','find owners','search','Find owners')">
+                <li th:replace="~{::menuItem ('/owners/find','owners','find owners','search','Find owners')}">
                     <span class="fa fa-search" aria-hidden="true"></span>
                     <span>Find owners</span>
                 </li>
 
-                <li th:replace="::menuItem ('/vets.html','vets','veterinarians','th-list','Veterinarians')">
+                <li th:replace="~{::menuItem ('/vets.html','vets','veterinarians','th-list','Veterinarians')}">
                     <span class="fa fa-th-list" aria-hidden="true"></span>
                     <span>Veterinarians</span>
                 </li>
 
                 <li
-                        th:replace="::menuItem ('/oups','error','trigger a RuntimeException to see how it is handled','exclamation-triangle','Error')">
+                        th:replace="~{::menuItem ('/oups','error','trigger a RuntimeException to see how it is handled','exclamation-triangle','Error')}">
                     <span class="fa exclamation-triangle" aria-hidden="true"></span>
                     <span>Error</span>
                 </li>
@@ -73,7 +73,7 @@
 <div class="container-fluid">
     <div class="container xd-container">
 
-        <th:block th:include="${template}" />
+        <th:block th:insert="${template}" />
 
         <br />
         <br />