diff --git a/Server/Pages/Notification.cshtml b/Server/Pages/Notification.cshtml
index f9c9dfa..b0cb298 100644
--- a/Server/Pages/Notification.cshtml
+++ b/Server/Pages/Notification.cshtml
@@ -13,7 +13,7 @@
     <p>&nbsp;</p>
     <div class="row p-1">
         <div class="col-6">
-            <h1 style="text-align:center">Scan RDS barcode before starting BioRad</h1>
+            <h1 style="text-align:center">Scan RDS barcode before starting <span id="equipmentName">BioRad</span></h1>
         </div>
     </div>
     <p>&nbsp;</p>
@@ -40,6 +40,12 @@
             <h1 id="qaMetTests" style="text-align:center"></h1>
         </div>
     </div>
+    <p>&nbsp;</p>
+    <p>&nbsp;</p>
+    <p>&nbsp;</p>
+    <div class="row p-1">
+        <div class="col-6" id="error"></div>
+    </div>
 </div>
 <script>
     var appSettings = JSON.parse('@(Html.Raw(System.Text.Json.JsonSerializer.Serialize(this.Model.AppSettings)))');
diff --git a/Server/wwwroot/js/notification.js b/Server/wwwroot/js/notification.js
index 23a1072..fa52c5f 100644
--- a/Server/wwwroot/js/notification.js
+++ b/Server/wwwroot/js/notification.js
@@ -1,12 +1,14 @@
 "use strict";
 
 console.log(appSettings.OpenInsightApplicationProgrammingInterface);
+document.getElementById("equipmentName").innerText = appSettings.EquipmentName;
 
 var connection = new signalR.HubConnectionBuilder()
   .withUrl("/NotificationHub")
   .build();
 
 connection.on("NotifyAll", function (data) {
+  document.getElementById("error").innerHTML = "";
   if (!data.keyPressEvent || !data.lastScanServiceResultValue) {
     if (!data.httpContentBody) {
       document.getElementById("lastScanServiceResultValue").innerText = "";
@@ -25,20 +27,25 @@ connection.on("NotifyAll", function (data) {
     if (!postResult.MId) {
       document.getElementById("mId").innerText = "";
     } else {
-      document.getElementById(
-        "mId",
-      ).innerText = `Use ${postResult.MId} for the wafer and input id`;
+      var mId = postResult.MId.replace(/\r\n/g, '     ');
+      if (mId.length == postResult.MId) {
+        document.getElementById("mId").innerText = `Use ${mId} for the wafer and input id`;
+      }
+      else {
+        document.getElementById("mId").innerText = "";
+        document.getElementById("error").innerHTML = mId;
+      }
     }
     if (!postResult.QaMetTests) {
       document.getElementById("qaMetTests").innerText = data.httpContentBody;
     } else {
       var properties = [];
       var qaMetTests = "";
-      for (const property in postResult)
+      for (const property in postResult.QaMetTests)
         properties.push(property);
       for (var i = 0; i < properties.length; i++) {
-        for (var j = 0; j < postResult[properties[i]].length; j++) {
-          qaMetTests += properties[i] + " - [" + postResult[properties[i]][j].recipe + "] - [" + postResult[properties[i]][j].recipePattern + "]<br />";
+        for (var j = 0; j < postResult.QaMetTests[properties[i]].length; j++) {
+          qaMetTests += properties[i] + " - [" + postResult.QaMetTests[properties[i]][j].recipe + "] - [" + postResult.QaMetTests[properties[i]][j].recipePattern + "]<br />";
         }
       }
       document.getElementById("qaMetTests").innerText = qaMetTests;