diff --git a/assets/css/toast.css b/assets/css/toast.css
new file mode 100644
index 00000000..85e04757
--- /dev/null
+++ b/assets/css/toast.css
@@ -0,0 +1,16 @@
+/* assets/css/toast.css */
+.custom-toast-popup {
+    border-radius: 10px; /* Rounded corners */
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); /* Custom shadow */
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: fixed; /* Fixed positioning */
+    top: 50%; /* Center vertically */
+    left: 50%; /* Center horizontally */
+    transform: translate(-50%, -50%); /* Adjust for exact centering */
+    z-index: 1000; /* Ensure it appears above other elements */
+    padding: 10px;
+    color: #fff;
+    font-size: 1rem;
+  }
\ No newline at end of file
diff --git a/assets/js/assessment_v2.js b/assets/js/assessment_v2.js
index 65ab4c28..7c30e47d 100644
--- a/assets/js/assessment_v2.js
+++ b/assets/js/assessment_v2.js
@@ -1,185 +1,185 @@
-"use strict";
-
-const quizContainer = document.getElementById("quiz");
-const resultsContainer = document.getElementById("results");
-const submitButton = document.getElementById("submit");
-const difficultyLevels = ["beginner", "intermediate", "advanced"];
-
-let difficulty = [];
-let questions = { all: myQuestions };
-
-const addEventListener_explanations = () => {
-  let accordions = document.getElementsByClassName("accordion");
-  Array.from(accordions).forEach((accordion) => {
-    accordion.addEventListener("click", function () {
-      /* Toggle between adding and removing the "active" class,
-    to highlight the button that controls the panel */
-      accordion.classList.toggle("active");
-
-      /* Toggle between hiding and showing the active panel */
-      let panel = accordion.parentElement.nextElementSibling;
-      if (panel.style.display === "block") {
-        panel.style.display = "none";
-      } else {
-        panel.style.display = "block";
-      }
-    });
-  });
-};
-
-const addEventListener_checkbox = () => {
-  difficulty.forEach((diff) => {
-    let cBox = document.getElementById(diff);
-    cBox.addEventListener("change", function () {
-      if (cBox.checked) {
-        difficulty.push(diff);
-      } else {
-        difficulty.splice(difficulty.indexOf(diff), 1);
-      }
-      updateQuestions();
-    });
-  });
-};
-
-const populateQuestions = () => {
-  let num = 0;
-  myQuestions.forEach((currentQuestion) => {
-    if (difficultyLevels.indexOf(currentQuestion.difficulty) === -1) {
-      currentQuestion.difficulty = "beginner";
-    }
-    if (!(currentQuestion.difficulty in questions)) {
-      questions[currentQuestion.difficulty] = [];
-    }
-    questions[currentQuestion.difficulty].push(currentQuestion);
-
-    currentQuestion.num = num;
-    num += 1;
-  });
-
-  if (Object.keys(questions).length > 2) {
-    document.getElementById("difficulty-label").style.display = "flex";
-    difficultyLevels.forEach((diff) => {
-      if (!(diff in questions)) {
-        return;
-      }
-      difficulty.push(diff);
-      let checkbox = document.getElementById(diff);
-      checkbox.checked = true;
-      checkbox.parentElement.style.display = "flex";
-    });
-  } else {
-    difficultyLevels.forEach((diff) => {
-      if (!(diff in questions)) {
-        return;
-      }
-      difficulty.push(diff);
-    });
-  }
-};
-
-const checkDifficulties = (classlist) => {
-  if (difficulty.length === Object.keys(questions).length - 1) return true;
-  for (let i in difficulty) {
-    if (classlist.contains(difficulty[i])) return true;
-  }
-  // If beginner is checked list the unlisted question as beginner
-  for (let i in difficultyLevels) {
-    if (classlist.contains(difficultyLevels[i])) return false;
-  }
-  if (difficulty.indexOf("beginner") > -1) {
-    return true;
-  }
-};
-
-function updateQuestions() {
-  const quiz = document.getElementById("quiz");
-  const qquestions = quiz.getElementsByClassName("question");
-  for (let i = 0; i < qquestions.length; i += 1) {
-    if (!checkDifficulties(qquestions[i].classList)) {
-      qquestions[i].style.display = "none";
-      qquestions[i].nextElementSibling.style.display = "none";
-    } else {
-      qquestions[i].style.display = "block";
-      qquestions[i].nextElementSibling.style.display = "flex";
-    }
-  }
-}
-
-function showResults() {
-  // gather answer containers from our quiz
-  const answerContainers = quizContainer.querySelectorAll(".answers");
-  // keep track of user's answers
-  let numCorrect = 0;
-  let toatNum = 0;
-  // for each question...
-  myQuestions.forEach((currentQuestion) => {
-    // find selected answer
-    if (
-      difficulty.indexOf(currentQuestion.difficulty) === -1 &&
-      difficulty.length !== Object.keys(questions).length - 1
-    )
-      return;
-    let questionNumber = currentQuestion.num;
-    const answerContainer = answerContainers[questionNumber];
-    const selector = `input[name=question${questionNumber}]:checked`;
-    const userAnswer = (answerContainer.querySelector(selector) || {}).value;
-    // Add to total
-    toatNum++;
-    // if answer is correct
-    if (userAnswer === currentQuestion.correctAnswer) {
-      // Reset if previously red colored answers
-      answerContainers[questionNumber].childNodes.forEach((e) => {
-        if (e != undefined) {
-          if (e.style) e.style.color = "black";
-        }
-      });
-
-      // add to the number of correct answers
-      numCorrect++;
-
-      // color the answers green
-      //answerContainers[questionNumber].style.color = "lightgreen";
-      // Show all explanations
-      if (currentQuestion.explanations) {
-        for (let answer in currentQuestion.answers) {
-          let explanation = currentQuestion.explanations[answer];
-          let explanationButton = document.getElementById(
-            "explanation" + questionNumber.toString() + answer
-          );
-          if (explanation) {
-            explanationButton.parentElement.nextElementSibling.innerHTML = explanation;
-            explanationButton.style.display = "inline-block";
-          } else {
-            explanationButton.style.display = "none";
-          }
-        }
-      }
-    } else if (userAnswer) {
-      // if answer is wrong or blank
-      // color the answers red
-      document.getElementById(
-        "answer" + questionNumber.toString() + userAnswer
-      ).style.color = "red";
-      // Show only explanation for wrong answer
-      if (currentQuestion.explanations && userAnswer) {
-        let explanation = currentQuestion.explanations[userAnswer];
-        let explanationButton = document.getElementById(
-          "explanation" + questionNumber.toString() + userAnswer
-        );
-        if (explanation) {
-          explanationButton.parentElement.nextElementSibling.innerHTML = explanation;
-          explanationButton.style.display = "inline-block";
-        } else {
-          explanationButton.style.display = "none";
-        }
-      }
-    }
-  });
-  // show number of correct answers out of total
-  resultsContainer.innerHTML = `Score: ${numCorrect} out of ${toatNum}`;
-}
-
-populateQuestions();
-addEventListener_explanations();
-addEventListener_checkbox();
-submitButton.addEventListener("click", showResults);
+"use strict";
+
+const quizContainer = document.getElementById("quiz");
+const resultsContainer = document.getElementById("results");
+const submitButton = document.getElementById("submit");
+const difficultyLevels = ["beginner", "intermediate", "advanced"];
+
+let difficulty = [];
+let questions = { all: myQuestions };
+
+const addEventListener_explanations = () => {
+  let accordions = document.getElementsByClassName("accordion");
+  Array.from(accordions).forEach((accordion) => {
+    accordion.addEventListener("click", function () {
+      /* Toggle between adding and removing the "active" class,
+    to highlight the button that controls the panel */
+      accordion.classList.toggle("active");
+
+      /* Toggle between hiding and showing the active panel */
+      let panel = accordion.parentElement.nextElementSibling;
+      if (panel.style.display === "block") {
+        panel.style.display = "none";
+      } else {
+        panel.style.display = "block";
+      }
+    });
+  });
+};
+
+const addEventListener_checkbox = () => {
+  difficulty.forEach((diff) => {
+    let cBox = document.getElementById(diff);
+    cBox.addEventListener("change", function () {
+      if (cBox.checked) {
+        difficulty.push(diff);
+      } else {
+        difficulty.splice(difficulty.indexOf(diff), 1);
+      }
+      updateQuestions();
+    });
+  });
+};
+
+const populateQuestions = () => {
+  let num = 0;
+  myQuestions.forEach((currentQuestion) => {
+    if (difficultyLevels.indexOf(currentQuestion.difficulty) === -1) {
+      currentQuestion.difficulty = "beginner";
+    }
+    if (!(currentQuestion.difficulty in questions)) {
+      questions[currentQuestion.difficulty] = [];
+    }
+    questions[currentQuestion.difficulty].push(currentQuestion);
+
+    currentQuestion.num = num;
+    num += 1;
+  });
+
+  if (Object.keys(questions).length > 2) {
+    document.getElementById("difficulty-label").style.display = "flex";
+    difficultyLevels.forEach((diff) => {
+      if (!(diff in questions)) {
+        return;
+      }
+      difficulty.push(diff);
+      let checkbox = document.getElementById(diff);
+      checkbox.checked = true;
+      checkbox.parentElement.style.display = "flex";
+    });
+  } else {
+    difficultyLevels.forEach((diff) => {
+      if (!(diff in questions)) {
+        return;
+      }
+      difficulty.push(diff);
+    });
+  }
+};
+
+const checkDifficulties = (classlist) => {
+  if (difficulty.length === Object.keys(questions).length - 1) return true;
+  for (let i in difficulty) {
+    if (classlist.contains(difficulty[i])) return true;
+  }
+  // If beginner is checked list the unlisted question as beginner
+  for (let i in difficultyLevels) {
+    if (classlist.contains(difficultyLevels[i])) return false;
+  }
+  if (difficulty.indexOf("beginner") > -1) {
+    return true;
+  }
+};
+
+function updateQuestions() {
+  const quiz = document.getElementById("quiz");
+  const qquestions = quiz.getElementsByClassName("question");
+  for (let i = 0; i < qquestions.length; i += 1) {
+    if (!checkDifficulties(qquestions[i].classList)) {
+      qquestions[i].style.display = "none";
+      qquestions[i].nextElementSibling.style.display = "none";
+    } else {
+      qquestions[i].style.display = "block";
+      qquestions[i].nextElementSibling.style.display = "flex";
+    }
+  }
+}
+
+function showResults() {
+  // gather answer containers from our quiz
+   const answerContainers = quizContainer.querySelectorAll(".answers");   
+  // keep track of user's answers
+  let numCorrect = 0;
+  let totalNum = 0;
+    
+  // for each question...
+  myQuestions.forEach((currentQuestion) => {
+    // find selected answer
+    if (
+      difficulty.indexOf(currentQuestion.difficulty) === -1 &&
+      difficulty.length !== Object.keys(questions).length - 1
+    )
+      return;
+    let questionNumber = currentQuestion.num;
+    const answerContainer = answerContainers[questionNumber];
+    const selector = `input[name=question${questionNumber}]:checked`;
+    const userAnswer = (answerContainer.querySelector(selector) || {}).value;
+    // Add to total
+    totalNum++;
+
+    // if answer is correct
+    if (userAnswer === currentQuestion.correctAnswer) {
+      // Color the correct answer lightgreen
+      const correctAnswerElement = document.getElementById(
+        "answer" + questionNumber.toString() + userAnswer
+      );
+      correctAnswerElement.style.color = "lightgreen";
+
+      // add to the number of correct answers
+      numCorrect++;
+
+      // Show all explanations
+      if (currentQuestion.explanations) {
+        for (let answer in currentQuestion.answers) {
+          let explanation = currentQuestion.explanations[answer];
+          let explanationButton = document.getElementById(
+            "explanation" + questionNumber.toString() + answer
+          );
+          if (explanation) {
+            explanationButton.parentElement.nextElementSibling.innerHTML = explanation;
+            explanationButton.style.display = "inline-block";
+          } else {
+            explanationButton.style.display = "none";
+          }
+        }
+      }
+    } else if (userAnswer) {
+      // if answer is wrong
+      document.getElementById(
+        "answer" + questionNumber.toString() + userAnswer
+      ).style.color = "red";
+      
+      // Show explanation for the selected answer
+      if (currentQuestion.explanations && userAnswer) {
+        let explanation = currentQuestion.explanations[userAnswer];
+        let explanationButton = document.getElementById(
+          "explanation" + questionNumber.toString() + userAnswer
+        );
+        if (explanation) {
+          explanationButton.parentElement.nextElementSibling.innerHTML = explanation;
+          explanationButton.style.display = "inline-block";
+        } else {
+          explanationButton.style.display = "none";
+        }
+      }
+    }
+  });
+
+  // show number of correct answers out of total
+  resultsContainer.innerHTML = `Score: ${numCorrect} out of ${totalNum}`;
+}
+
+populateQuestions();
+addEventListener_explanations();
+addEventListener_checkbox();
+submitButton.addEventListener("click", showResults);
\ No newline at end of file
diff --git a/assets/js/event-handler.js b/assets/js/event-handler.js
index 35cf8854..cf119fad 100644
--- a/assets/js/event-handler.js
+++ b/assets/js/event-handler.js
@@ -2,7 +2,7 @@
 
 const Toast = Swal.mixin({
   toast: true,
-  position: 'bottom-end',
+  position: 'center',
   showConfirmButton: false,
   timer: 3000,
   timerProgressBar: true,
@@ -16,12 +16,14 @@ document.getElementById('bug-report').addEventListener('vl-bug-report', (e) => {
   if (e.detail.status === 200 || e.detail.status === 201) {
     const learningUnit = document.head.querySelector('meta[name="learning-unit"]').content;
     const task = document.head.querySelector('meta[name="task-name"]').content;
-    dataLayer.push({
-      event: "vl-bug-report",
-      "bug-type": e.detail.issues,
-      "learning-unit": learningUnit ? learningUnit : "",
-      "task-name": task ? task : ""
-    })
+    if (window.dataLayer) {
+      window.dataLayer.push({
+        event: "vl-bug-report",
+        "bug-type": e.detail.issues,
+        "learning-unit": learningUnit ? learningUnit : "",
+        "task-name": task ? task : ""
+      })
+    }
     Toast.fire({
       icon: 'success',
       iconColor: "white",
@@ -44,13 +46,15 @@ document.getElementById('bug-report').addEventListener('vl-bug-report', (e) => {
 function handleRatingSubmit(e) {
   const learningUnit = document.head.querySelector('meta[name="learning-unit"]').content;
   const task = document.head.querySelector('meta[name="task-name"]').content;
-  dataLayer.push({
-    event: "vl-rating-submit",
-    "rating": e.detail.rating,
-    "rating-value": e.detail.rating,
-    "learning-unit": learningUnit ? learningUnit : "",
-    "task-name": task ? task : ""
-  });
+  if (window.dataLayer) {
+    window.dataLayer.push({
+      event: "vl-rating-submit",
+      "rating": e.detail.rating,
+      "rating-value": e.detail.rating,
+      "learning-unit": learningUnit ? learningUnit : "",
+      "task-name": task ? task : ""
+    });
+  }
   Toast.fire({
     icon: 'success',
     iconColor: "white",
diff --git a/exp_build/templates/partials/commons.handlebars b/exp_build/templates/partials/commons.handlebars
index 0108e160..f18240a7 100644
--- a/exp_build/templates/partials/commons.handlebars
+++ b/exp_build/templates/partials/commons.handlebars
@@ -12,6 +12,7 @@
 />
 <link rel="stylesheet" href="{{assets_path}}/assets/css/github-markdown.min.css" />
 <link rel="stylesheet" href="{{assets_path}}/assets/css/vlabs-style.css" />
+<link rel="stylesheet" href="{{assets_path}}/assets/css/toast.css" />
 <link rel="stylesheet" href="{{assets_path}}/assets/katex_assets/katex.min.css" />
 
 <script src="{{assets_path}}/assets/js/jquery-3.4.1.slim.min.js"></script>
diff --git a/lab_build/page-templates/navbar.handlebars b/lab_build/page-templates/navbar.handlebars
index 538a3f9d..bf0c2d1a 100644
--- a/lab_build/page-templates/navbar.handlebars
+++ b/lab_build/page-templates/navbar.handlebars
@@ -1,7 +1,7 @@
 <ul class="navbar-nav ml-auto text-center d-flex flex-md-row">
     <li class="vl-rating-display">
         <rating-display spreadsheetid="1x12nhpp0QvnsA6x-O1sV4IA9SAbfVsq_wiexWkutOmU" sheetname="Lab-Clean"
-            columnname="Lab Name" columnvalue="{{lab_display_name}}"
+            columnname="Lab Name" columnvalue="{{lab}}"
             imagesdirectory="https://virtual-labs.github.io/svc-rating/"></rating-display>
     </li>
     <li class="nav-item px-2 m-1">
diff --git a/lab_build/skeleton.html b/lab_build/skeleton.html
index d5d874a1..bb4bf0f8 100644
--- a/lab_build/skeleton.html
+++ b/lab_build/skeleton.html
@@ -15,6 +15,7 @@
   <link rel="stylesheet" href="fonts/font-awesome-4.7.0/css/font-awesome.min.css" />
   <link href="https://fonts.googleapis.com/css2?family=Open+Sans&family=Raleway&display=swap" rel="stylesheet" />
   <link href="css/vlabs-style.css" rel="stylesheet" />
+  <link href="css/toast.css" rel="stylesheet" />
   <script src="js/jquery-3.4.1.slim.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.4/dist/umd/popper.min.js"
     integrity="sha384-q2kxQ16AaE6UbzuKqyBE9/u/KzioAlnx2maXQHiDX9d4/zp8Ok3f+M7DPm+Ib6IU"