diff --git a/15-multi-step-form/src/main/resources/public/out.css b/15-multi-step-form/src/main/resources/public/out.css
index f2ea97c..4773b55 100644
--- a/15-multi-step-form/src/main/resources/public/out.css
+++ b/15-multi-step-form/src/main/resources/public/out.css
@@ -829,6 +829,21 @@ video {
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
 }
 
+.\!bg-red-500 {
+  --tw-bg-opacity: 1 !important;
+  background-color: rgb(239 68 68 / var(--tw-bg-opacity)) !important;
+}
+
+.\!bg-white {
+  --tw-bg-opacity: 1 !important;
+  background-color: rgb(255 255 255 / var(--tw-bg-opacity)) !important;
+}
+
+.\!bg-light-blue {
+  --tw-bg-opacity: 1 !important;
+  background-color: hsl(206 94% 87% / var(--tw-bg-opacity)) !important;
+}
+
 .bg-sidebar-mobile {
   background-image: url("images/bg-sidebar-mobile.svg");
 }
@@ -939,6 +954,11 @@ video {
   color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
+.\!text-marine-blue {
+  --tw-text-opacity: 1 !important;
+  color: hsl(213 96% 18% / var(--tw-text-opacity)) !important;
+}
+
 .drop-shadow-xl {
   --tw-drop-shadow: drop-shadow(0 20px 13px rgb(0 0 0 / 0.03)) drop-shadow(0 8px 5px rgb(0 0 0 / 0.08));
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
diff --git a/15-multi-step-form/src/main/resources/templates/step1.html b/15-multi-step-form/src/main/resources/templates/step1.html
index fb2515d..0464417 100644
--- a/15-multi-step-form/src/main/resources/templates/step1.html
+++ b/15-multi-step-form/src/main/resources/templates/step1.html
@@ -38,7 +38,7 @@
     <form
       class="flex flex-col items-center w-screen h-screen md:grid md:items-start md:p-5 md:bg-white md:rounded-2xl md:grid-cols-[auto_1fr] md:w-desktop-form md:h-desktop-form md:drop-shadow-2xl"
       id="form-step"
-      th:fragment="formFragment(formData.userAnswers)"
+      th:fragment="formFragment(formData)"
       hx-post="/submit-step/1/2"
       hx-swap="outerHTML"
       action="/submit-step/1/2"
@@ -47,48 +47,70 @@
       <summary
         class="w-full h-44 bg-no-repeat md:row-span-2 bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
         id="sidebar"
+        th:fragment="stepsSummary(formData)"
       >
         <ol
           class="grid grid-cols-[repeat(4,_auto)] gap-x-5 content-center items-center place-content-center h-24 md:flex-col md:h-full md:grid-rows-[repeat(4,_auto)] md:grid-cols-1 md:content-start md:p-10 md:gap-y-7 text-white text-sm uppercase"
         >
-          <li class="items-center md:grid md:gap-x-4 md:grid-cols-[auto_1fr]">
+          <li
+            class="items-center md:grid md:gap-x-4 md:grid-cols-[auto_1fr]"
+            th:each="stepNum: ${formData.stepsAmount}"
+          >
             <div
-              class="grid place-content-center w-8 h-8 text-white rounded-full border border-white"
+              class="grid place-content-center w-8 h-8 font-bold text-white rounded-full border border-white"
+              th:classappend="${stepNum.index} == ${formData.userAnswers.currentStep} ? '!bg-light-blue !text-marine-blue'"
+              th:text="${stepNum.index}"
             >
               1
             </div>
             <p class="hidden md:flex md:flex-col">
-              <span class="text-light-gray">Step 1</span><span class="font-bold">Your info</span>
+              <span class="text-light-gray"
+                >Step <span th:text="${stepNum.index}">1</span></span
+              ><span class="font-bold" th:text="${stepNum.name}"
+                >Your info</span
+              >
             </p>
           </li>
-          <li class="items-center md:grid md:gap-x-4 md:grid-cols-[auto_1fr]">
+          <li
+            class="items-center md:grid md:gap-x-4 md:grid-cols-[auto_1fr]"
+            th:remove="all"
+          >
             <div
               class="grid place-content-center w-8 h-8 text-white rounded-full border border-white"
             >
               2
             </div>
             <p class="hidden md:flex md:flex-col">
-              <span class="text-light-gray">Step 2</span><span class="font-bold">Select plan</span>
+              <span class="text-light-gray">Step 2</span
+              ><span class="font-bold">Select plan</span>
             </p>
           </li>
-          <li class="items-center md:grid md:gap-x-4 md:grid-cols-[auto_1fr]">
+          <li
+            class="items-center md:grid md:gap-x-4 md:grid-cols-[auto_1fr]"
+            th:remove="all"
+          >
             <div
               class="grid place-content-center w-8 h-8 text-white rounded-full border border-white"
             >
               3
             </div>
             <p class="hidden md:flex md:flex-col">
-              <span class="text-light-gray">Step 3</span><span class="font-bold">Add-ons</span>
+              <span class="text-light-gray">Step 3</span
+              ><span class="font-bold">Add-ons</span>
             </p>
           </li>
-          <li class="items-center md:grid md:gap-x-4 md:grid-cols-[auto_1fr]">
+          <li
+            class="items-center md:grid md:gap-x-4 md:grid-cols-[auto_1fr]"
+            th:remove="all"
+          >
             <div
               class="grid place-content-center w-8 h-8 text-white rounded-full border border-white"
             >
               4
             </div>
             <p class="hidden md:flex md:flex-col">
-              <span class="text-light-gray">Step 4</span><span class="font-bold">summary</span>
+              <span class="text-light-gray">Step 4</span
+              ><span class="font-bold">summary</span>
             </p>
           </li>
         </ol>
@@ -98,11 +120,15 @@
         class="flex flex-col py-8 px-6 -mt-20 w-11/12 bg-white rounded-xl md:px-24 md:mt-0 md:w-full drop-shadow-xl md:drop-shadow-none"
       >
         <!-- Step 1 start -->
-        <h1 class="text-2xl font-bold md:text-4xl text-marine-blue">Personal info</h1>
+        <h1 class="text-2xl font-bold md:text-4xl text-marine-blue">
+          Personal info
+        </h1>
         <p class="py-3 text-cool-gray">
           Please provide your name, email address, and phone number.
         </p>
-        <label for="name" class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue">Name</label>
+        <label for="name" class="pt-3 text-sm md:pt-5 md:pb-2 text-marine-blue"
+          >Name</label
+        >
         <input
           id="name"
           th:value="${formData.userAnswers.step1.name}"
@@ -146,7 +172,7 @@
           type="submit"
           class="grid place-content-center mr-3 w-24 h-10 text-sm font-semibold text-white rounded md:mr-24 md:w-32 md:h-12 md:text-base md:rounded-lg bg-marine-blue"
           value="Next Step"
-          >
+        />
         <a
           th:remove="all"
           href="step2.html"
diff --git a/15-multi-step-form/src/main/resources/templates/step2.html b/15-multi-step-form/src/main/resources/templates/step2.html
index 6faf673..6a414ae 100644
--- a/15-multi-step-form/src/main/resources/templates/step2.html
+++ b/15-multi-step-form/src/main/resources/templates/step2.html
@@ -43,11 +43,12 @@
         hx-swap="outerHTML"
         action="/submit-step/2/3"
         method="post"
-        th:fragment="formFragment(formData.userAnswers)"
+        th:fragment="formFragment(formData)"
       >
         <summary
           class="w-full h-44 bg-no-repeat md:row-span-2 bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
           id="sidebar"
+          th:replace="~{step1::stepsSummary (${formData})}"
         >
           <ol
             class="grid grid-cols-[repeat(4,_auto)] gap-x-5 content-center items-center place-content-center h-24 md:flex-col md:h-full md:grid-rows-[repeat(4,_auto)] md:grid-cols-1 md:content-start md:p-10 md:gap-y-7 text-white text-sm uppercase"
diff --git a/15-multi-step-form/src/main/resources/templates/step3.html b/15-multi-step-form/src/main/resources/templates/step3.html
index 9fb6e32..2b95520 100644
--- a/15-multi-step-form/src/main/resources/templates/step3.html
+++ b/15-multi-step-form/src/main/resources/templates/step3.html
@@ -43,11 +43,12 @@
         hx-swap="outerHTML"
         action="/submit-step/3/4"
         method="post"
-        th:fragment="formFragment(formData.userAnswers)"
+        th:fragment="formFragment(formData)"
       >
         <summary
           class="w-full h-44 bg-no-repeat md:row-span-2 bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
           id="sidebar"
+          th:replace="~{step1::stepsSummary (${formData})}"
         >
           <ol
             class="grid grid-cols-[repeat(4,_auto)] gap-x-5 content-center items-center place-content-center h-24 md:flex-col md:h-full md:grid-rows-[repeat(4,_auto)] md:grid-cols-1 md:content-start md:p-10 md:gap-y-7 text-white text-sm uppercase"
diff --git a/15-multi-step-form/src/main/resources/templates/step4.html b/15-multi-step-form/src/main/resources/templates/step4.html
index 52e97b2..17668a0 100644
--- a/15-multi-step-form/src/main/resources/templates/step4.html
+++ b/15-multi-step-form/src/main/resources/templates/step4.html
@@ -48,6 +48,7 @@
         <summary
           class="w-full h-44 bg-no-repeat md:row-span-2 bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
           id="sidebar"
+          th:replace="~{step1::stepsSummary (${formData})}"
         >
           <ol
             class="grid grid-cols-[repeat(4,_auto)] gap-x-5 content-center items-center place-content-center h-24 md:flex-col md:h-full md:grid-rows-[repeat(4,_auto)] md:grid-cols-1 md:content-start md:p-10 md:gap-y-7 text-white text-sm uppercase"
diff --git a/15-multi-step-form/src/main/resources/templates/step5.html b/15-multi-step-form/src/main/resources/templates/step5.html
index f770e57..2120cc7 100644
--- a/15-multi-step-form/src/main/resources/templates/step5.html
+++ b/15-multi-step-form/src/main/resources/templates/step5.html
@@ -44,6 +44,7 @@
         <summary
           class="w-full h-44 bg-no-repeat md:row-span-2 bg-sidebar-mobile marker:text-white md:bg-sidebar-desktop md:h-[568px] md:w-[274px]"
           id="sidebar"
+          th:replace="~{step1::stepsSummary (${formData})}"
         >
           <ol
             class="grid grid-cols-[repeat(4,_auto)] gap-x-5 content-center items-center place-content-center h-24 md:flex-col md:h-full md:grid-rows-[repeat(4,_auto)] md:grid-cols-1 md:content-start md:p-10 md:gap-y-7 text-white text-sm uppercase"
diff --git a/15-multi-step-form/src/main/scala/multistepform/Models.scala b/15-multi-step-form/src/main/scala/multistepform/Models.scala
index 010644c..078ebb9 100644
--- a/15-multi-step-form/src/main/scala/multistepform/Models.scala
+++ b/15-multi-step-form/src/main/scala/multistepform/Models.scala
@@ -19,6 +19,8 @@ object Models {
   final case class FormData(
       userAnswers: Answers
   ) {
+    val stepsAmount = Steps.values.toList.asJava
+
     // yeah, in real world it will not be this simple
     def yearlyCost(monthlyCost: Int): Int = 10 * monthlyCost
 
@@ -94,6 +96,16 @@ object Models {
     }
   }
 
+  /**
+   * TODO would be nice to connect answers to the steps enum
+   * in some helpful way.
+   */
+  enum Steps(val index: Int, val name: String):
+    case Step1 extends Steps(1, "Your info")
+    case Step2 extends Steps(2, "Select plan")
+    case Step3 extends Steps(3, "Add-ons")
+    case Step4 extends Steps(4, "Summary")
+
   enum PlanType(val monthlyCost: Int):
     case Arcade extends PlanType(9)
     case Advanced extends PlanType(12)