diff --git a/client/src/app/lineage/lineage.component.html b/client/src/app/lineage/lineage.component.html
index 6d7749b..97efde2 100644
--- a/client/src/app/lineage/lineage.component.html
+++ b/client/src/app/lineage/lineage.component.html
@@ -185,13 +185,13 @@
             <button
               (click)="limitDotDepth = true"
               type="button"
-              class="btn btn-outline"
+              class="btn btn-outline mr-5"
             >
               Limit depth
             </button>
 
             <!-- <button class="btn btn-outline" (click)='showSvg()'> Open in New Tab </button> -->
-            <div class="btn-group d-block">
+            <div class="btn-group direction d-block">
               <div
                 class="radio btn"
                 (click)="
diff --git a/client/src/app/lineage/lineage.component.scss b/client/src/app/lineage/lineage.component.scss
index 793da52..cbbddaa 100644
--- a/client/src/app/lineage/lineage.component.scss
+++ b/client/src/app/lineage/lineage.component.scss
@@ -41,6 +41,10 @@ clr-tree-node button {
     white-space: nowrap;
 }
 
+.btn-group.direction {
+    margin-left: var(--cds-global-space-6);
+}
+
 .graph-render-spinner {
     position: absolute;
     top: 0;
diff --git a/client/src/app/metadata/metadata.component.html b/client/src/app/metadata/metadata.component.html
index afac7df..9eb1524 100644
--- a/client/src/app/metadata/metadata.component.html
+++ b/client/src/app/metadata/metadata.component.html
@@ -126,12 +126,15 @@
                         [class.object-header]="!entry.count"
                         class="full-width"
                       >
-                        <clr-icon
-                          *ngIf="!entry.count"
-                          shape="rack-server"
-                        ></clr-icon>
-                        <clr-icon *ngIf="entry.count" shape="block"></clr-icon>
-                        {{ entry.display }}
+                        <div>
+                          <clr-icon
+                            *ngIf="!entry.count"
+                            shape="rack-server"
+                          ></clr-icon>
+                          <clr-icon *ngIf="entry.count" shape="block"></clr-icon>
+                          {{ entry.display }}
+                        </div>
+
                         <p class="float-right object-uri" *ngIf="!entry.count">
                           {{ entry.URI }}
                         </p>
@@ -166,12 +169,15 @@
                 [clrExpandable]="true"
               >
                 <div [class.object-header]="!entry.count" class="full-width">
-                  <clr-icon *ngIf="!entry.count" shape="rack-server"></clr-icon>
-                  <clr-icon *ngIf="entry.count" shape="block"></clr-icon>
-                  {{ entry.display }}
-                  <p class="float-right object-uri" *ngIf="!entry.count">
-                    {{ entry.URI }}
-                  </p>
+                  <div>
+                    <clr-icon *ngIf="!entry.count" shape="rack-server"></clr-icon>
+                    <clr-icon *ngIf="entry.count" shape="block"></clr-icon>
+                    {{ entry.display }}
+                  </div>
+
+                    <p class="float-right object-uri" *ngIf="!entry.count">
+                      {{ entry.URI }}
+                    </p>
                 </div>
               </clr-tree-node>
             </clr-tree>
diff --git a/client/src/app/metadata/metadata.component.scss b/client/src/app/metadata/metadata.component.scss
index 97135ae..8fb57ae 100644
--- a/client/src/app/metadata/metadata.component.scss
+++ b/client/src/app/metadata/metadata.component.scss
@@ -1,14 +1,27 @@
+::ng-deep body[cds-theme="dark"] {
+  .object-header:hover {
+    background-color: #405560;
+  }
+}
+
+::ng-deep body[cds-theme="light"] {
+  .objects-col {
+    background: white;
+  }
+
+  .object-header:hover {
+    background-color: #d8e3e9;
+  }
+}
 
 .objects-col{
   height: 75vh;
   overflow: scroll;
   border: 1px solid #cccccc;
-  background: white;
   border-radius: 4px;
 }
 
 .cols-head {
-  background: #fafafa;
   border: 1px solid #cccccc;
   padding: 10px;
   display: flex;
@@ -40,11 +53,13 @@
   margin-top: 5px;
 }
 .object-header{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
   padding-left: 3px;
   padding-right: 3px;
 }
 .object-header:hover{
-  background-color: #d8e3e9;
   border-radius: 3px;
 }
 .datagrid-host{
diff --git a/client/src/app/role/role.component.scss b/client/src/app/role/role.component.scss
index f27c478..e543f50 100644
--- a/client/src/app/role/role.component.scss
+++ b/client/src/app/role/role.component.scss
@@ -1,25 +1,59 @@
+::ng-deep body[cds-theme="dark"] {
+  .role {
+      background-color: #314351;
+      border-color: #314351;
+  }
+
+  .role-data {
+      background-color: #314351;
+      border-color: #314351;
+  }
+
+  .member-table tbody{
+    tr:hover{
+        background-color: #29404b;
+    }
+  }
+}
+
+::ng-deep body[cds-theme="light"] {
+  .role-info{
+      background-color: #f9f9f9;
+      border-color: #a7a7a7;
+      box-shadow: 0px 2px 5px #dad7d7;
+  }
+
+  .role-data {
+      background-color: #f9f9f9;
+      border-color: #a7a7a7;
+      box-shadow: 0px 2px 5px #dad7d7;
+  }
+
+  .member-table tbody{
+    tr:hover{
+          background-color: #e6e6e6;
+      }
+  }
+}
+
 .sidebar-height{
     height: 100%;
 }
 .role-info-text{
-    display: inline;    
+    display: inline;
     font-size: 20px;
 }
 .role-info{
-    background-color: #f9f9f9;
-    border: 1px solid #a7a7a7;
+    border: 1px solid;
     border-radius: 3px;
-    box-shadow: 0px 2px 5px #dad7d7;
 }
 .role-info td{
     text-align: center;
 }
 
 .role-data{
-  background-color: #f9f9f9;
-  border: 1px solid #a7a7a7;
+  border: 1px solid;
   border-radius: 3px;
-  box-shadow: 0px 2px 5px #dad7d7;
 }
 .role-data{
   min-height: unset;
@@ -28,15 +62,10 @@
   }
 }
 .member-table{
-  background-color: #f9f9f9;
   width: 100%;
 }
-.member-table thead{
-  background-color: #dadada;
-}
 .member-table tbody{
   tr:hover{
-    background-color: #e6e6e6;
     cursor: pointer;
   }
 }
diff --git a/sas/mocks/sas9/sasjs/services/public/startupservice.js b/sas/mocks/sas9/sasjs/services/public/startupservice.js
index 6e44e37..9c332d1 100644
--- a/sas/mocks/sas9/sasjs/services/public/startupservice.js
+++ b/sas/mocks/sas9/sasjs/services/public/startupservice.js
@@ -78,6 +78,23 @@ _webout=`{"SYSDATE" : "26SEP22"
 "DC_RESTRICT_EDITRECORD": "NO"
 }
 ]
+,"xlmaps": [
+  [
+      "BASEL-CR2",
+      "",
+      "DC866788.MPE_XLMAP_DATA"
+  ],
+  [
+      "BASEL-KM1",
+      "Basel 3 Key Metrics report",
+      "DC866788.MPE_XLMAP_DATA"
+  ],
+  [
+      "SAMPLE",
+      "",
+      "DC866788.MPE_XLMAP_DATA"
+  ]
+]
 ,"_DEBUG" : ""
 ,"_METAUSER": "sasdemo@SAS"
 ,"_METAPERSON": "sasdemo"