diff --git a/Adaptation/FileHandlers/json/StaticSite/html/122508.html b/Adaptation/FileHandlers/json/StaticSite/html/122508.html
index c787ec2..04074e3 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/122508.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/122508.html
@@ -40,7 +40,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/html/122514.html b/Adaptation/FileHandlers/json/StaticSite/html/122514.html
index 6d771a6..b45e128 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/122514.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/122514.html
@@ -40,7 +40,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/html/122517.html b/Adaptation/FileHandlers/json/StaticSite/html/122517.html
index 5559c0f..dbfbc18 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/122517.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/122517.html
@@ -40,7 +40,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/html/123066.html b/Adaptation/FileHandlers/json/StaticSite/html/123066.html
index 8bd992d..06ea2e8 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/123066.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/123066.html
@@ -40,7 +40,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/html/123067.html b/Adaptation/FileHandlers/json/StaticSite/html/123067.html
index d187545..9b55567 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/123067.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/123067.html
@@ -40,7 +40,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/html/126169.html b/Adaptation/FileHandlers/json/StaticSite/html/126169.html
index 3eb6ed4..eacc9c8 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/126169.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/126169.html
@@ -40,7 +40,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/html/leo.html b/Adaptation/FileHandlers/json/StaticSite/html/leo.html
index a7035f7..9f22209 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/leo.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/leo.html
@@ -37,7 +37,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/html/mes.html b/Adaptation/FileHandlers/json/StaticSite/html/mes.html
index 02ead1d..ee8cbc1 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/mes.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/mes.html
@@ -37,7 +37,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/html/with-parents.html b/Adaptation/FileHandlers/json/StaticSite/html/with-parents.html
index 2ec1f08..4cbccbf 100644
--- a/Adaptation/FileHandlers/json/StaticSite/html/with-parents.html
+++ b/Adaptation/FileHandlers/json/StaticSite/html/with-parents.html
@@ -39,7 +39,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid body-content" style="margin-top: 10px;">
+    <div class="container-fluid body-content" style="margin-top: 30px;">
 
         <div style="height: 550px;" id="HeaderGridDiv">
             <table id="HeaderGrid"></table>
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/122508.js b/Adaptation/FileHandlers/json/StaticSite/js/122508.js
index 985da54..76df673 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/122508.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/122508.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -177,7 +182,6 @@ function initIndex(url) {
                 { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" },
                 { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/122514.js b/Adaptation/FileHandlers/json/StaticSite/js/122514.js
index 985da54..76df673 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/122514.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/122514.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -177,7 +182,6 @@ function initIndex(url) {
                 { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" },
                 { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/122517.js b/Adaptation/FileHandlers/json/StaticSite/js/122517.js
index 985da54..76df673 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/122517.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/122517.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -177,7 +182,6 @@ function initIndex(url) {
                 { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" },
                 { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/123066.js b/Adaptation/FileHandlers/json/StaticSite/js/123066.js
index 985da54..76df673 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/123066.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/123066.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -177,7 +182,6 @@ function initIndex(url) {
                 { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" },
                 { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/123067.js b/Adaptation/FileHandlers/json/StaticSite/js/123067.js
index 985da54..76df673 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/123067.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/123067.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -177,7 +182,6 @@ function initIndex(url) {
                 { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" },
                 { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/126169.js b/Adaptation/FileHandlers/json/StaticSite/js/126169.js
index 985da54..76df673 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/126169.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/126169.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -177,7 +182,6 @@ function initIndex(url) {
                 { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" },
                 { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/business.js b/Adaptation/FileHandlers/json/StaticSite/js/business.js
index 05f8676..d6563ef 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/business.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/business.js
@@ -113,10 +113,15 @@ function getPollValue(description, priority, priorityDisplay, pollValue) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/effort.js b/Adaptation/FileHandlers/json/StaticSite/js/effort.js
index 76a80ff..af41dff 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/effort.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/effort.js
@@ -113,10 +113,15 @@ function getPollValue(description, priority, priorityDisplay, pollValue) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/leo.js b/Adaptation/FileHandlers/json/StaticSite/js/leo.js
index 1419050..071a90a 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/leo.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/leo.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -179,7 +184,6 @@ function initIndex(url) {
                 { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" },
                 { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/mes.js b/Adaptation/FileHandlers/json/StaticSite/js/mes.js
index 1419050..071a90a 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/mes.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/mes.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -179,7 +184,6 @@ function initIndex(url) {
                 { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" },
                 { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/risk.js b/Adaptation/FileHandlers/json/StaticSite/js/risk.js
index 3b1f233..ef5999c 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/risk.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/risk.js
@@ -113,10 +113,15 @@ function getPollValue(description, priority, priorityDisplay, pollValue) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/time.js b/Adaptation/FileHandlers/json/StaticSite/js/time.js
index 5c27b58..5a4bbd7 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/time.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/time.js
@@ -113,10 +113,15 @@ function getPollValue(description, priority, priorityDisplay, pollValue) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/with-parents.js b/Adaptation/FileHandlers/json/StaticSite/js/with-parents.js
index 00a3a07..72fd4bb 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/with-parents.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/with-parents.js
@@ -79,10 +79,15 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem.Effort === null)
+            workItem.Effort = 10123;
+        if (workItem.BusinessValue === null)
+            workItem.BusinessValue = 99999;
+        if (workItem.TimeCriticality === null)
+            workItem.TimeCriticality = 99999;
+        if (workItem.RiskReductionMinusOpportunityEnablement === null)
+            workItem.RiskReductionMinusOpportunityEnablement = 99999;
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablement + workItem.TimeCriticality + workItem.BusinessValue;
     }
 }
 
@@ -171,7 +176,6 @@ function initIndex(url) {
                 { key: "State", dataType: "string" },
                 { key: "ParentTitle", dataType: "string", hidden: true },
                 { key: "AreaPath", dataType: "string", hidden: true },
-                { key: "AssignedTo", dataType: "string", hidden: true },
                 { key: "ChangedDate", dataType: "string", hidden: true },
                 { key: "CommentCount", dataType: "number", hidden: true },
                 { key: "CreatedDate", dataType: "string", hidden: true },
diff --git a/Adaptation/FileHandlers/json/StaticSite/js/wsjf.js b/Adaptation/FileHandlers/json/StaticSite/js/wsjf.js
index f69258f..83698e3 100644
--- a/Adaptation/FileHandlers/json/StaticSite/js/wsjf.js
+++ b/Adaptation/FileHandlers/json/StaticSite/js/wsjf.js
@@ -1,7 +1,23 @@
 var _apiUrl = null;
 
 function compareFunction(a, b) {
-    return a.WeightedShortestJobFirst - b.WeightedShortestJobFirst || b.ParentId - a.ParentId || a.Id - b.Id;
+    return b.WeightedShortestJobFirst - a.WeightedShortestJobFirst || b.ParentId - a.ParentId || a.Id - b.Id;
+}
+
+function compareEffortFunction(a, b) {
+    return a.Effort - b.Effort || b.ParentId - a.ParentId || a.Id - b.Id;
+}
+
+function compareBusinessValueFunction(a, b) {
+    return a.BusinessValue - b.BusinessValue || b.ParentId - a.ParentId || a.Id - b.Id;
+}
+
+function compareTimeCriticalityFunction(a, b) {
+    return a.TimeCriticality - b.TimeCriticality || b.ParentId - a.ParentId || a.Id - b.Id;
+}
+
+function compareRiskReductionMinusOpportunityEnablementFunction(a, b) {
+    return b.RiskReductionMinusOpportunityEnablement - b.RiskReductionMinusOpportunityEnablement || b.ParentId - a.ParentId || a.Id - b.Id;
 }
 
 function showOne(rowData) {
@@ -77,16 +93,63 @@ function getPriority(workItemType, priority) {
 
 function updateRecordCoD(workItem) {
     if (workItem !== null) {
-        if (workItem["RiskReductionMinusOpportunityEnablement"] === null || workItem["TimeCriticality"] === null || workItem["BusinessValue"] === null)
-            workItem["CoD"] === 0;
-        else
-            workItem["CoD"] === workItem["RiskReductionMinusOpportunityEnablement"] + workItem["TimeCriticality"] + workItem["BusinessValue"];
+        if (workItem["Effort"] === null)
+            workItem["Effort"] = 1;
+        if (workItem["BusinessValue"] === null)
+            workItem["BusinessValue"] = 99999;
+        if (workItem["TimeCriticality"] === null)
+            workItem["TimeCriticality"] = 99999;
+        if (workItem["RiskReductionMinusOpportunityEnablement"] === null)
+            workItem["RiskReductionMinusOpportunityEnablement"] = 99999;
     }
 }
 
-function updateRecordWSJF(workItem) {
-    if (workItem["WeightedShortestJobFirst"] === null)
-        workItem["WeightedShortestJobFirst"] = 9999999;
+function getFibonacci(length) {
+    var results = [];
+    var i;
+    var fib = [0, 1];
+    for (i = 2; i <= length + 1; i++) {
+        fib[i] = fib[i - 2] + fib[i - 1];
+        results.push(fib[i]);
+    }
+    return results;
+}
+
+function updateCoD(records) {
+    var workItem;
+    var fibonacci = getFibonacci(records.length);
+    records.sort(compareEffortFunction);
+    for (var i = 0; i < records.length; i++) {
+        workItem = records[i];
+        workItem.EffortRank = i + 1;
+        workItem.EffortFibonacci = fibonacci[i];
+    }
+    records.sort(compareBusinessValueFunction);
+    for (var i = 0; i < records.length; i++) {
+        workItem = records[i];
+        workItem.BusinessValueRank = i + 1;
+        workItem.BusinessValueFibonacci = fibonacci[i];
+    }
+    records.sort(compareTimeCriticalityFunction);
+    for (var i = 0; i < records.length; i++) {
+        workItem = records[i];
+        workItem.TimeCriticalityRank = i + 1;
+        workItem.TimeCriticalityFibonacci = fibonacci[i];
+    }
+    records.sort(compareRiskReductionMinusOpportunityEnablementFunction);
+    for (var i = 0; i < records.length; i++) {
+        workItem = records[i];
+        workItem.RiskReductionMinusOpportunityEnablementRank = i + 1;
+        workItem.RiskReductionMinusOpportunityEnablementFibonacci = fibonacci[i];
+    }
+    for (var i = 0; i < records.length; i++) {
+        workItem = records[i];
+        workItem.CoD = workItem.RiskReductionMinusOpportunityEnablementFibonacci + workItem.TimeCriticalityFibonacci + workItem.BusinessValueFibonacci;
+        if (workItem.Priority[0] !== '1')
+            workItem.WeightedShortestJobFirst = 0.000001;
+        else
+            workItem.WeightedShortestJobFirst = workItem.CoD / workItem.EffortFibonacci;
+    }
 }
 
 function updateRecordOther(workItem) {
@@ -118,24 +181,26 @@ function getRecords(data) {
         workItem = data[i].WorkItem;
         if (workItem.WorkItemType !== 'Feature')
             continue;
+        if (workItem.State !== 'New' && workItem.State !== 'Active')
+            continue;
         if (workItem.Tags != null && workItem.Tags.includes("Ignore"))
             continue;
         if ((window.location.href.indexOf('=LEO') > -1 && workItem.AreaPath !== 'ART SPS\\LEO') || (window.location.href.indexOf('=MES') > -1 && workItem.AreaPath !== 'ART SPS\\MES'))
             continue;
         updateRecordCoD(parent);
         updateRecordCoD(workItem);
-        updateRecordWSJF(workItem);
         updateRecordOther(workItem);
         updateRecordParent(parent, workItem);
         records.push(workItem);
     }
+    updateCoD(records);
     records.sort(compareFunction);
     return records;
 }
 
 function setRecords(workItems) {
     var record;
-    var html = "<tr><th>Parent Id</th><th>Parent Title</th><th>Id</th><th>Requester</th><th>Title</th><th>Assigned To</th><th>System(s)</th><th>WSJF</th><th>Value</th><th>Up</th><th>Down</th></tr>";
+    var html = "<tr><th>Parent Id</th><th>Parent Title</th><th>Id</th><th>Requester</th><th>Title</th><th>Assigned To</th><th>System(s)</th><th>State</th><th>Priority</th><th>Risk Reduction and/or Opportunity Enablement</th><th>Time Criticality</th><th>Business Value</th><th>CoD</th><th>Effort</th><th>WSJF</th><th>Up</th><th>Down</th></tr>";
     const element = document.getElementById("HeaderGrid");
     for (var i = 0; i < workItems.length; i++) {
         record = workItems[i];
@@ -146,8 +211,14 @@ function setRecords(workItems) {
             "</td><td>" + record.Title +
             "</td><td>" + record.AssignedTo +
             "</td><td>" + record.Tags +
+            "</td><td>" + record.State +
+            "</td><td>" + record.Priority +
+            "</td><td>" + record.RiskReductionMinusOpportunityEnablement + '-' + record.RiskReductionMinusOpportunityEnablementRank + '-' + record.RiskReductionMinusOpportunityEnablementFibonacci +
+            "</td><td>" + record.TimeCriticality + '-' + record.TimeCriticalityRank + '-' + record.TimeCriticalityFibonacci +
+            "</td><td>" + record.BusinessValue + '-' + record.BusinessValueRank + '-' + record.BusinessValueFibonacci +
+            "</td><td>" + record.CoD +
+            "</td><td>" + record.Effort + '-' + record.EffortRank + '-' + record.EffortFibonacci +
             "</td><td>" + record.WeightedShortestJobFirst +
-            "</td><td>&nbsp;" +
             "</td><td><a href='#' class='up'>Up</a></td><td><a href='#' class='down'>Down</a></td></tr>";
     }
     element.innerHTML = html.replaceAll(">null<", ">&nbsp;<");
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/122508.css b/Adaptation/FileHandlers/json/StaticSite/styles/122508.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/122508.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/122508.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/122514.css b/Adaptation/FileHandlers/json/StaticSite/styles/122514.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/122514.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/122514.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/122517.css b/Adaptation/FileHandlers/json/StaticSite/styles/122517.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/122517.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/122517.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/123066.css b/Adaptation/FileHandlers/json/StaticSite/styles/123066.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/123066.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/123066.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/123067.css b/Adaptation/FileHandlers/json/StaticSite/styles/123067.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/123067.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/123067.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/126169.css b/Adaptation/FileHandlers/json/StaticSite/styles/126169.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/126169.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/126169.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/leo.css b/Adaptation/FileHandlers/json/StaticSite/styles/leo.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/leo.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/leo.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/mes.css b/Adaptation/FileHandlers/json/StaticSite/styles/mes.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/mes.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/mes.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file
diff --git a/Adaptation/FileHandlers/json/StaticSite/styles/with-parents.css b/Adaptation/FileHandlers/json/StaticSite/styles/with-parents.css
index dbeaf02..51d8880 100644
--- a/Adaptation/FileHandlers/json/StaticSite/styles/with-parents.css
+++ b/Adaptation/FileHandlers/json/StaticSite/styles/with-parents.css
@@ -1,12 +1,26 @@
 #HeaderGridDiv,
 #DetailsGridDiv {
     font-size: 12px;
+    height: 550px;
+    min-width: 1200px;
+    max-width: 1200px;
 }
 
 #HeaderGrid {
     font-family: monospace;
 }
 
+#HeaderGrid tr td {
+    max-width: 200px;
+    padding: 5px;
+}
+
 #AllGrid {
     font-family: monospace;
+}
+
+.navbar-brand {
+    min-width: 1200px;
+    margin-left: 15px;
+    background-color: whitesmoke;
 }
\ No newline at end of file