diff --git a/app_only.html b/app_only.html
index 59368c8..9ea73fd 100644
--- a/app_only.html
+++ b/app_only.html
@@ -770,9 +770,12 @@
 
         currentQuestionId = questionId;
         currentQuestionId = parseInt(currentQuestionId, 10);
+
         var questionContainer = document.getElementById('questionContainer');
         questionContainer.classList.remove('show');
 
+        var question = questions[currentQuestionId];
+
         var secondProgressSteps = document.querySelectorAll('.progress-tracker li:nth-child(2)');
         secondProgressSteps.forEach(function(firstProgressStep) {
             if (currentQuestionId === 1) {
@@ -784,7 +787,7 @@
         });
         var lastProgressSteps = document.querySelectorAll('.progress-tracker li:nth-child(3)');
         lastProgressSteps.forEach(function(lastProgressStep) {
-            if ([10, 11, 12, 13, 14, 15, 22, 23, 30].includes(currentQuestionId)) {
+            if (question.isComplete) {
                 lastProgressStep.classList.add('is-complete');
             } else {
                 lastProgressStep.classList.remove('is-complete');
@@ -793,7 +796,6 @@
 
         setTimeout(function() {
             questionContainer.innerHTML = '';
-            var question = questions[currentQuestionId];
 
             if (currentQuestionId !== 1) {
                 questionContainer.innerHTML += '<i data-feather="chevron-left"></i>';