diff --git a/app/src/components/icons/ExportCommonIcons.tsx b/app/src/components/icons/ExportCommonIcons.tsx
index 4137498..5e06fed 100644
--- a/app/src/components/icons/ExportCommonIcons.tsx
+++ b/app/src/components/icons/ExportCommonIcons.tsx
@@ -844,7 +844,7 @@ export const LogTickIcon = () => {
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <g clip-path="url(#clip0_3962_4223)">
+      <g clipPath="url(#clip0_3962_4223)">
         <path
           d="M5.00065 0.835938C2.70482 0.835938 0.833984 2.70677 0.833984 5.0026C0.833984 7.29844 2.70482 9.16927 5.00065 9.16927C7.29648 9.16927 9.16732 7.29844 9.16732 5.0026C9.16732 2.70677 7.29648 0.835938 5.00065 0.835938ZM6.99232 4.04427L4.62982 6.40677C4.57148 6.4651 4.49232 6.49844 4.40898 6.49844C4.32565 6.49844 4.24648 6.4651 4.18815 6.40677L3.00898 5.2276C2.88815 5.10677 2.88815 4.90677 3.00898 4.78594C3.12982 4.6651 3.32982 4.6651 3.45065 4.78594L4.40898 5.74427L6.55065 3.6026C6.67148 3.48177 6.87148 3.48177 6.99232 3.6026C7.11315 3.72344 7.11315 3.91927 6.99232 4.04427Z"
           fill="#49B841"
@@ -939,8 +939,8 @@ export const ErrorIcon = () => {
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
+        fillRule="evenodd"
+        clipRule="evenodd"
         d="M11 6C11 8.7614 8.7614 11 6 11C3.23857 11 1 8.7614 1 6C1 3.23857 3.23857 1 6 1C8.7614 1 11 3.23857 11 6ZM4.48482 4.48483C4.63126 4.33838 4.8687 4.33838 5.01515 4.48483L6 5.46965L6.9848 4.48484C7.13125 4.33839 7.3687 4.33839 7.51515 4.48484C7.6616 4.63128 7.6616 4.86872 7.51515 5.01515L6.5303 6L7.51515 6.9848C7.6616 7.13125 7.6616 7.3687 7.51515 7.51515C7.3687 7.6616 7.13125 7.6616 6.9848 7.51515L6 6.53035L5.01515 7.51515C4.86871 7.6616 4.63127 7.6616 4.48483 7.51515C4.33838 7.3687 4.33838 7.13125 4.48483 6.98485L5.46965 6L4.48482 5.01515C4.33837 4.86871 4.33837 4.63127 4.48482 4.48483Z"
         fill="#ED5342"
       />
diff --git a/app/src/components/icons/analysis.tsx b/app/src/components/icons/analysis.tsx
index c387003..76c7f42 100644
--- a/app/src/components/icons/analysis.tsx
+++ b/app/src/components/icons/analysis.tsx
@@ -12,7 +12,7 @@ export function ThroughputSummaryIcon() {
         fillRule="evenodd"
         clipRule="evenodd"
         d="M13.9063 12.9046L14.2265 13.86L14.4378 14.5073C14.9906 16.2239 15.2594 17.2662 15.2594 17.7299C15.2594 18.8219 14.3742 19.7072 13.2822 19.7072C12.1902 19.7072 11.305 18.8219 11.305 17.7299C11.305 17.2106 11.6422 15.9654 12.3379 13.86L12.658 12.9046C12.8604 12.3082 13.704 12.3082 13.9063 12.9046ZM13.2822 7.84375C16.9222 7.84375 19.873 10.7945 19.873 14.4345C19.873 15.7565 19.4823 17.0219 18.7621 18.0974C18.5596 18.3999 18.1502 18.4809 17.8478 18.2784C17.5453 18.0758 17.4643 17.6665 17.6668 17.364C18.2428 16.5038 18.5548 15.4933 18.5548 14.4345C18.5548 11.5225 16.1942 9.16191 13.2822 9.16191C10.3702 9.16191 8.00956 11.5225 8.00956 14.4345C8.00956 15.4933 8.32153 16.5038 8.89752 17.364C9.10005 17.6665 9.01904 18.0758 8.71659 18.2784C8.41414 18.4809 8.00477 18.3999 7.80224 18.0974C7.08206 17.0219 6.69141 15.7565 6.69141 14.4345C6.69141 10.7945 9.6422 7.84375 13.2822 7.84375ZM13.2822 15.2247L13.0657 15.9238L12.9161 16.4319C12.7219 17.111 12.6231 17.5509 12.6231 17.7299C12.6231 18.0939 12.9182 18.389 13.2822 18.389C13.6462 18.389 13.9413 18.0939 13.9413 17.7299C13.9413 17.511 13.7936 16.9022 13.5044 15.9428L13.2822 15.2247Z"
-        fill="var(--text-color)"
+        fill="white"
       />
     </svg>
   );
@@ -28,12 +28,12 @@ export function ProductionCapacityIcon() {
       xmlns="http://www.w3.org/2000/svg"
     >
       <rect width="25" height="25" rx="12.5" fill="#6F42C1" />
-      <g clip-path="url(#clip0_4107_2562)">
+      <g clipPath="url(#clip0_4107_2562)">
         <path
-          fill-rule="evenodd"
-          clip-rule="evenodd"
+          fillRule="evenodd"
+          clipRule="evenodd"
           d="M13.5167 7.88281H15.3741C15.668 7.88281 15.9053 8.09496 15.9053 8.35581V13.0575H9.079L9.00279 13.0583V8.35581C9.00279 8.09417 9.24007 7.88281 9.53393 7.88281H11.3921V10.251C11.3921 10.3138 11.4204 10.3735 11.4707 10.4183C11.5226 10.4633 11.5891 10.4879 11.6577 10.4875H13.2511C13.3201 10.4881 13.3868 10.4635 13.4389 10.4183C13.4625 10.3971 13.4815 10.3713 13.4949 10.3426C13.5082 10.3138 13.5157 10.2826 13.5167 10.251V7.88281ZM9.079 14.0389H15.921C16.4243 14.0491 16.9035 14.2561 17.2559 14.6157C17.6082 14.9752 17.8056 15.4585 17.8056 15.9619C17.8056 16.4653 17.6082 16.9486 17.2559 17.3082C16.9035 17.6677 16.4243 17.8748 15.921 17.885H9.079C8.82319 17.8901 8.56892 17.8442 8.33108 17.7499C8.09324 17.6556 7.87661 17.5147 7.69387 17.3357C7.51113 17.1566 7.36596 16.9428 7.26685 16.707C7.16775 16.4711 7.1167 16.2178 7.1167 15.9619C7.1167 15.7061 7.16775 15.4528 7.26685 15.2169C7.36596 14.981 7.51113 14.7673 7.69387 14.5882C7.87661 14.4091 8.09324 14.2683 8.33108 14.174C8.56892 14.0796 8.82319 14.0337 9.079 14.0389ZM10.4626 15.956C10.4626 16.1384 10.3902 16.3132 10.2613 16.4422C10.1323 16.5711 9.95748 16.6435 9.77514 16.6435C9.59281 16.6435 9.41794 16.5711 9.28901 16.4422C9.16008 16.3132 9.08764 16.1384 9.08764 15.956C9.08764 15.7737 9.16008 15.5988 9.28901 15.4699C9.41794 15.341 9.59281 15.2685 9.77514 15.2685C9.95748 15.2685 10.1323 15.341 10.2613 15.4699C10.3902 15.5988 10.4626 15.7737 10.4626 15.956ZM13.1914 15.956C13.1914 16.1384 13.119 16.3132 12.9901 16.4422C12.8611 16.5711 12.6863 16.6435 12.5039 16.6435C12.3216 16.6435 12.1467 16.5711 12.0178 16.4422C11.8889 16.3132 11.8164 16.1384 11.8164 15.956C11.8164 15.7737 11.8889 15.5988 12.0178 15.4699C12.1467 15.341 12.3216 15.2685 12.5039 15.2685C12.6863 15.2685 12.8611 15.341 12.9901 15.4699C13.119 15.5988 13.1914 15.7737 13.1914 15.956ZM15.2319 16.6427C15.4143 16.6427 15.5891 16.5703 15.7181 16.4414C15.847 16.3124 15.9194 16.1376 15.9194 15.9552C15.9194 15.7729 15.847 15.598 15.7181 15.4691C15.5891 15.3402 15.4143 15.2677 15.2319 15.2677C15.0496 15.2677 14.8747 15.3402 14.7458 15.4691C14.6169 15.598 14.5444 15.7729 14.5444 15.9552C14.5444 16.1376 14.6169 16.3124 14.7458 16.4414C14.8747 16.5703 15.0496 16.6427 15.2319 16.6427Z"
-          fill="var(--text-color)"
+          fill="white"
         />
       </g>
       <defs>
@@ -62,12 +62,12 @@ export function ROISummaryIcon() {
       <rect y="0.515625" width="25" height="25" rx="12.5" fill="#28B9F3" />
       <path
         d="M6.00015 7.51562V19.0974H19.0002"
-        stroke="var(--text-color)"
+        stroke="white"
         strokeLinecap="round"
       />
       <path
         d="M6.50037 15.0553L10.3102 11.847C10.6984 11.52 11.2701 11.5358 11.6397 11.8837L15.0095 15.0553L19.5004 11.2734"
-        stroke="var(--text-color)"
+        stroke="white"
         strokeLinecap="round"
       />
     </svg>
@@ -83,7 +83,7 @@ export function PowerIcon() {
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <g clip-path="url(#clip0_4107_3144)">
+      <g clipPath="url(#clip0_4107_3144)">
         <path
           d="M12.1277 1.76564L10.7174 9.17535L15.8265 9.19254L8.87213 19.2375L10.2824 11.0856L5.17369 11.0678L12.1277 1.76564ZM12.1287 0.515664C12.0949 0.515664 12.0612 0.516895 12.0281 0.519375C11.8075 0.537207 11.6612 0.610957 11.4878 0.72752C11.3901 0.792624 11.3021 0.871096 11.2262 0.960645C11.2034 0.987526 11.1819 1.01547 11.1618 1.04439L4.15775 10.3141C3.88119 10.6931 3.84056 11.1935 4.05306 11.6116C4.26525 12.0297 4.69431 12.2947 5.16463 12.2982L8.77275 12.3244L7.63838 19.0079C7.53056 19.5822 7.83681 20.1547 8.37588 20.3854C8.53254 20.4527 8.70128 20.4873 8.87179 20.4872C9.26461 20.4872 9.58742 20.3035 9.82963 19.9716L16.8424 9.92658C17.119 9.5475 17.1593 9.04656 16.9471 8.62906C16.7349 8.21094 16.3059 7.94592 15.8356 7.9425L12.2274 7.93625L13.3496 2.05969C13.3734 1.96348 13.3854 1.86473 13.3853 1.76562C13.3853 1.08938 12.8468 0.538125 12.1731 0.51625C12.1581 0.515625 12.1434 0.515625 12.1287 0.515625L12.1287 0.515664Z"
           fill="#F3C64D"
@@ -119,13 +119,13 @@ export function ROISummaryProductName() {
       <path
         d="M16.9999 6.48175L9.83331 2.89844L2.66669 6.48175V13.6484L9.83331 17.2317L16.9999 13.6484V6.48175Z"
         stroke="var(--text-color)"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
       />
       <path
         d="M2.66669 6.47916L9.83331 10.0625M9.83331 10.0625V17.2291M9.83331 10.0625L16.9999 6.47916M13.4166 4.6875L6.25 8.27081"
         stroke="var(--text-color)"
-        stroke-linecap="round"
-        stroke-linejoin="round"
+        strokeLinecap="round"
+        strokeLinejoin="round"
       />
     </svg>
   );
@@ -147,8 +147,8 @@ export function SonarCrownIcon() {
       <path
         d="M5.81403 20.0469H21.7323"
         stroke="#FFCC00"
-        stroke-width="1.89503"
-        stroke-linecap="round"
+        strokeWidth="1.89503"
+        strokeLinecap="round"
       />
     </svg>
   );
@@ -166,9 +166,9 @@ export function CostBreakDownIcon() {
       <path
         d="M8.00012 12.5H11.1251C11.8126 12.5 12.3751 11.9375 12.3751 11.25C12.3751 10.5625 11.8126 10 11.1251 10H9.87512C9.18762 10 8.62512 9.4375 8.62512 8.75C8.62512 8.0625 9.18762 7.5 9.87512 7.5H13.0001M10.5001 5.625V7.08375M10.5001 11.875V14.375M18.6251 10C18.6251 12.1549 17.7691 14.2215 16.2454 15.7452C14.7216 17.269 12.655 18.125 10.5001 18.125C8.34524 18.125 6.27861 17.269 4.75488 15.7452C3.23115 14.2215 2.37512 12.1549 2.37512 10C2.37512 7.84512 3.23115 5.77849 4.75488 4.25476C6.27861 2.73102 8.34524 1.875 10.5001 1.875C12.655 1.875 14.7216 2.73102 16.2454 4.25476C17.7691 5.77849 18.6251 7.84512 18.6251 10Z"
         stroke="#FFCC00"
-        stroke-width="1.25"
-        stroke-miterlimit="10"
-        stroke-linejoin="round"
+        strokeWidth="1.25"
+        strokeMiterlimit="10"
+        strokeLinejoin="round"
       />
     </svg>
   );
diff --git a/app/src/modules/visualization/RealTimeVisulization.tsx b/app/src/modules/visualization/RealTimeVisulization.tsx
index 2e1e536..a8f44b4 100644
--- a/app/src/modules/visualization/RealTimeVisulization.tsx
+++ b/app/src/modules/visualization/RealTimeVisulization.tsx
@@ -249,7 +249,7 @@ const RealTimeVisulization: React.FC = () => {
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
       const editWidgetOptions = document.querySelector(
-        ".context-menu-options-wrapper"
+        ".editWidgetOptions-wrapper"
       );
       if (
         editWidgetOptions &&
diff --git a/app/src/styles/components/simulation/analysis.scss b/app/src/styles/components/simulation/analysis.scss
index f33fb46..44d4ba0 100644
--- a/app/src/styles/components/simulation/analysis.scss
+++ b/app/src/styles/components/simulation/analysis.scss
@@ -51,7 +51,8 @@
 
         .sub-header {
           font-size: var(--font-size-tiny);
-          color: var(--text-button-color);
+          color: var(--text-color);
+          opacity: 0.8;
         }
       }
 
@@ -233,6 +234,7 @@
               width: 100%;
               gap: 6px;
               padding-top: 3px;
+
               .shift-wrapper {
                 display: flex;
                 align-items: center;
@@ -276,6 +278,11 @@
     }
   }
 
+  .roiSummary-container {
+    max-height: 60vh;
+    overflow-y: auto;
+  }
+
   .roiSummary-wrapper {
     max-width: 470px;
     background-color: var(--background-color);
@@ -376,8 +383,8 @@
           gap: 6px;
 
           .metric-item {
-            border-radius: #{$border-radius-large};
-            background-color: var(--background-color);
+            border-radius: #{$border-radius-small};
+            background: var(--background-color);
             border: 1px solid var(--border-color);
           }
         }
@@ -385,7 +392,7 @@
     }
 
     .cost-breakdown {
-      background-color: var(--background-color);
+      background: var(--background-color);
       border: 1px solid var(--border-color);
       border-radius: #{$border-radius-extra-large};
       padding: 16px;
diff --git a/app/src/styles/layout/sidebar.scss b/app/src/styles/layout/sidebar.scss
index 01256a4..cffee1e 100644
--- a/app/src/styles/layout/sidebar.scss
+++ b/app/src/styles/layout/sidebar.scss
@@ -416,7 +416,7 @@
                 outline: none;
                 path {
                   stroke: var(--text-button-color);
-                  stroke-width: 1.3;
+                  strokeWidth: 1.3;
                 }
               }
             }
@@ -682,7 +682,7 @@
 
         path {
           stroke: var(--accent-color);
-          stroke-width: 1.5px;
+          strokeWidth: 1.5px;
         }
 
         &:hover {