diff --git a/backend/device_registry/templates/actions.html b/backend/device_registry/templates/actions.html
index 48a1fdafb..e5a623f4b 100644
--- a/backend/device_registry/templates/actions.html
+++ b/backend/device_registry/templates/actions.html
@@ -190,7 +190,7 @@ <h1 class="mb-0" id="wott-popover-title">All Nodes</h1>
       </div>
       <hr class="popover-title-line">
     </div>
-    <div class="wott-popover-body w-100">
+    <div class="wott-popover-body d-flex flex-wrap w-100">
     </div>
   </div>
 </div>
@@ -198,6 +198,24 @@ <h1 class="mb-0" id="wott-popover-title">All Nodes</h1>
 
   <style>
 
+    .popover-box::-webkit-scrollbar {
+      -webkit-appearance: none;
+    }
+
+    .popover-box::-webkit-scrollbar:vertical {
+     width: 10px;
+    }
+
+    .popover-box::-webkit-scrollbar:horizontal {
+     height: 50px;
+    }
+
+    .popover-box::-webkit-scrollbar-thumb {
+      border-radius: 100px;
+      border: 2px solid white; /* should match background, can't be transparent */
+      background-color: #dde4f9;
+    }
+
     .btn-img-text {
       font-size: .6rem !important;
     }
@@ -260,6 +278,7 @@ <h1 class="mb-0" id="wott-popover-title">All Nodes</h1>
 
     .wott-node-list {
       color: #2460c8 !important;
+      word-break: break-all;
     }
 
     /* MODAL */
@@ -300,7 +319,7 @@ <h1 class="mb-0" id="wott-popover-title">All Nodes</h1>
     }
 
     #all-nodes .wott-popover-body {
-      padding: 2.5rem 0rem 2rem 4rem;
+      padding: 3.1rem 0rem 2rem 3.7rem;
       word-wrap: break-word;
     }
 
@@ -317,6 +336,7 @@ <h1 class="mb-0" id="wott-popover-title">All Nodes</h1>
       margin-bottom: 0 !important;
       display: flex;
       justify-content: space-between;
+      align-items: center;
     }
 
     #all-nodes .wott-scroll-y {
@@ -327,17 +347,30 @@ <h1 class="mb-0" id="wott-popover-title">All Nodes</h1>
       overflow-x: scroll;
     }
 
+  
     #all-nodes .wott-node-list {
       display: inline-block;
       width: 100px;
       white-space: normal;
       margin: 0;
-      margin-bottom: 2rem;
-      margin-right: 7%;
-      min-width: 17%;
-      max-width: 17%;
+      margin-bottom: .7rem;
+      margin-right: .7rem;
+      width: 10.1rem;
+      height: 5.3rem;
       font-size: .9rem;
       font-weight: 600;
+      padding: 12px;
+      background-color: #f7f9ff;
+      border-radius: 4px;
+      overflow: hidden;
+    }
+
+    #all-nodes .wott-node-list:hover {
+      overflow: visible;
+      min-width: 10.1rem;
+      min-height: 5.3rem;
+      height: auto;
+      background-color: #e9edf8;
     }
 
     #all-nodes .popover-title {
@@ -355,7 +388,7 @@ <h1 class="mb-0" id="wott-popover-title">All Nodes</h1>
 
     #all-nodes .popover-title-line {
       width: 100%;
-      margin-left: 0;
+      margin: 0;
     }
 
   </style>
diff --git a/backend/device_registry/templates/cve.html b/backend/device_registry/templates/cve.html
index a4d781398..79d337e73 100644
--- a/backend/device_registry/templates/cve.html
+++ b/backend/device_registry/templates/cve.html
@@ -164,7 +164,7 @@ <h1 class="mb-0" id="wott-popover-title">TEXT GO HERE</h1>
         </div>
         <hr class="popover-title-line">
       </div>
-      <div class="wott-popover-body"><!--nodeList include w-100 | instructions include w-auto-->
+      <div class="wott-popover-body"><!--nodeList include w-100, d-flex and flex-wrap| instructions include w-auto-->
       </div>
     </div>
 
@@ -219,7 +219,7 @@ <h1 class="mb-0" id="wott-popover-title">TEXT GO HERE</h1>
       if(!show)
           return;
       $('.popover-box').toggleClass('wott-scroll-x', box_scroll_x).toggleClass('wott-scroll-y', box_scroll_y);
-      $('.wott-popover-body').html(html).toggleClass('w-100', body_w100).toggleClass('w-auto', !body_w100);
+      $('.wott-popover-body').html(html).toggleClass('w-100 d-flex flex-wrap', body_w100).toggleClass('w-auto', !body_w100);
       $('#wott-popover-title').text(title);
   }