diff --git a/Generator/DataverseService.cs b/Generator/DataverseService.cs
index 89b29c0..7da0d5c 100644
--- a/Generator/DataverseService.cs
+++ b/Generator/DataverseService.cs
@@ -362,6 +362,8 @@ await Parallel.ForEachAsync(
 
         private async Task<Dictionary<string, List<SecurityRole>>> GetSecurityRoles(List<Guid> rolesInSolution, Dictionary<string, SecurityPrivilegeMetadata[]> priviledges)
         {
+            if (rolesInSolution.Count == 0) return [];
+
             var query = new QueryExpression("role")
             {
                 ColumnSet = new ColumnSet("name"),
diff --git a/Generator/WebsiteBuilder.cs b/Generator/WebsiteBuilder.cs
index 6c5e6ca..568d87f 100644
--- a/Generator/WebsiteBuilder.cs
+++ b/Generator/WebsiteBuilder.cs
@@ -25,7 +25,11 @@ internal void AddData()
         var sb = new StringBuilder();
         sb.AppendLine("import { GroupType } from \"@/lib/Types\";");
         sb.AppendLine("");
-        sb.AppendLine($"export const LastSynched: Date = new Date('{DateTimeOffset.UtcNow:yyyy-MM-ddTHH:mm:ss.fffZ}')");
+        sb.AppendLine($"export const LastSynched: Date = new Date('{DateTimeOffset.UtcNow:yyyy-MM-ddTHH:mm:ss.fffZ}');");
+        var logoUrl = configuration.GetValue<string?>("Logo", defaultValue: null);
+        var jsValue = logoUrl != null ? $"\"{logoUrl}\"" : null;
+        sb.AppendLine($"export const Logo: string | null = {jsValue};");
+        sb.AppendLine("");
         sb.AppendLine("export let Groups: GroupType[] = [");
         var groups = records.GroupBy(x => x.Group).OrderBy(x => x.Key);
         foreach (var group in groups)
diff --git a/Website/components/AppSidebar.tsx b/Website/components/AppSidebar.tsx
index 6c0b329..19ae815 100644
--- a/Website/components/AppSidebar.tsx
+++ b/Website/components/AppSidebar.tsx
@@ -5,6 +5,8 @@ import { SidebarClose, SidebarOpen } from 'lucide-react'
 import { useIsMobile } from '@/hooks/use-mobile'
 import SidebarNavRail from './SidebarNavRail'
 import clsx from 'clsx'
+import { Logo } from '@/generated/Data'
+import { Separator } from './ui/separator'
 
 interface IAppSidebarProps {}
 
@@ -27,8 +29,8 @@ export const AppSidebar = ({}: IAppSidebarProps) => {
       {isMobile && (
         <button onClick={toggleSidebar}
           className={clsx(
-            'fixed top-4 z-50 transition-all bg-white border border-gray-300 shadow rounded-full p-2',
-            isOpen ? 'left-52' : 'left-4'
+            'fixed top-4 z-[60] transition-all bg-white border border-gray-300 shadow rounded-full p-2',
+            isOpen ? 'left-[272px]' : 'left-4'
           )}
           aria-label={isOpen ? 'Close Sidebar' : 'Open Sidebar'}
         >
@@ -39,7 +41,7 @@ export const AppSidebar = ({}: IAppSidebarProps) => {
       {/* Overlay for mobile sidebar */}
       {isMobile && isOpen && (
         <div
-          className="fixed inset-0 bg-black bg-opacity-30 z-30"
+          className="fixed inset-0 bg-black bg-opacity-30 z-[35]"
           onClick={toggleSidebar}
           aria-label="Close sidebar overlay"
         />
@@ -48,7 +50,7 @@ export const AppSidebar = ({}: IAppSidebarProps) => {
       {/* Sidebar */}
       <div
         className={clsx(
-          'h-screen bg-sidebar border-r border-sidebar-border z-40',
+          'h-screen bg-sidebar border-r border-sidebar-border z-[50]',
           'transition-all duration-300',
           isMobile
             ? [
@@ -70,12 +72,35 @@ export const AppSidebar = ({}: IAppSidebarProps) => {
         {/* Header */}
         <div className="w-full h-16 border-b border-sidebar-border p-2 flex justify-center items-center bg-white relative">
           {isMobile ? (
-            <img src="/DMVLOGO.svg" alt="Logo" className="h-full" draggable={false} />
+            <>
+              {Logo ? (
+                <div className='flex items-center align-center'>
+                  <img src={Logo} alt="Logo" className="h-10 w-10" draggable={false} />
+                  <Separator orientation="vertical" className="mx-2 h-6" />
+                  <img src="/DMVLOGOHORZ.svg" alt="Logo" className="h-10" draggable={false} />
+                </div>
+              ) : (
+                <img src="/DMVLOGOHORZ.svg" alt="Logo" className="h-10" draggable={false} />
+              )}
+            </>
           ) : (
             showElement ? (
-              <img src="/DMVLOGOHORZ.svg" alt="Logo" className="h-full" draggable={false} />
+              <div className='flex items-center justify-center h-full'>
+                {Logo ? (
+                  <div className='flex items-center align-center'>
+                    <img src={Logo} alt="Logo" className="h-10 w-10" draggable={false} />
+                    <Separator orientation="vertical" className="mx-2 h-6" />
+                    <img src="/DMVLOGOHORZ.svg" alt="Logo" className="h-10" draggable={false} />
+                  </div>
+                ) : (
+                  <img src="/DMVLOGOHORZ.svg" alt="Logo" className="h-10" draggable={false} />
+                )}
+              </div>
             ) : (
-              <img src="/DMVLOGO.svg" alt="Logo" className="h-full" draggable={false} />
+              <div className="relative w-full h-full flex items-center justify-center">
+                <img src="/DMVLOGO.svg" alt="Logo" className="h-full" draggable={false} />
+                { Logo && <img src={Logo} className='absolute rounded-md shadow-sm border border-blue-500 -bottom-1 -right-1 h-6 w-6 p-1 bg-white' /> }
+              </div>
             )
           )}
         </div>
@@ -84,7 +109,7 @@ export const AppSidebar = ({}: IAppSidebarProps) => {
         {!isMobile && (
           <button
             onClick={toggleElement}
-            className="absolute right-0 top-1/2 -translate-y-1/2 w-4 h-12 bg-gray-50 border border-gray-300 shadow rounded-sm flex items-center justify-center z-50 hover:bg-blue-50"
+            className="absolute right-0 top-1/2 -translate-y-1/2 w-4 h-12 bg-gray-50 border border-gray-300 shadow rounded-sm flex items-center justify-center z-[60] hover:bg-blue-50"
             style={{ marginRight: '-12px' }}
             aria-label={showElement ? 'Hide Details' : 'Show Details'}
           >
diff --git a/Website/components/datamodelview/TimeSlicedSearch.tsx b/Website/components/datamodelview/TimeSlicedSearch.tsx
index 3b195dd..88f2dbd 100644
--- a/Website/components/datamodelview/TimeSlicedSearch.tsx
+++ b/Website/components/datamodelview/TimeSlicedSearch.tsx
@@ -3,7 +3,9 @@
 import React, { useState, useRef, useCallback, useEffect } from 'react';
 import { createPortal } from 'react-dom';
 import { Input } from '../ui/input';
-import { Search, ChevronUp, ChevronDown } from 'lucide-react';
+import { Search, ChevronUp, ChevronDown, X } from 'lucide-react';
+import { useSidebar } from '@/contexts/SidebarContext';
+import { useIsMobile } from '@/hooks/use-mobile';
 
 interface TimeSlicedSearchProps {
   onSearch: (value: string) => void;
@@ -28,11 +30,16 @@ export const TimeSlicedSearch = ({
   const [localValue, setLocalValue] = useState('');
   const [isTyping, setIsTyping] = useState(false);
   const [portalRoot, setPortalRoot] = useState<HTMLElement | null>(null);
+  const { isOpen } = useSidebar();
+  const isMobile = useIsMobile();
   
   const searchTimeoutRef = useRef<number>();
   const typingTimeoutRef = useRef<number>();
   const frameRef = useRef<number>();
 
+  // Hide search on mobile when sidebar is open
+  const shouldHideSearch = isMobile && isOpen;
+
   // Time-sliced debouncing using requestAnimationFrame
   const scheduleSearch = useCallback((value: string) => {
     if (searchTimeoutRef.current) {
@@ -81,6 +88,22 @@ export const TimeSlicedSearch = ({
 
   }, [isTyping, onLoadingChange, scheduleSearch]);
 
+  // Handle clear button
+  const handleClear = useCallback(() => {
+    setLocalValue('');
+    onSearch(''); // Clear search immediately
+    setIsTyping(false);
+    onLoadingChange(false);
+    
+    // Clear any pending timeouts
+    if (searchTimeoutRef.current) {
+      clearTimeout(searchTimeoutRef.current);
+    }
+    if (typingTimeoutRef.current) {
+      clearTimeout(typingTimeoutRef.current);
+    }
+  }, [onSearch, onLoadingChange]);
+
   // Handle keyboard navigation
   const handleKeyDown = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {
     if (e.key === 'Enter' && !e.shiftKey) {
@@ -151,7 +174,7 @@ export const TimeSlicedSearch = ({
   }, []);
 
   const searchInput = (
-    <div className="fixed top-4 right-8 z-50 w-80">
+    <div className={`fixed top-4 right-8 z-50 w-[280px] transition-opacity duration-200 ${shouldHideSearch ? 'opacity-0 pointer-events-none' : 'opacity-100'}`}>
       {/* Search Input Container */}
       <div className="flex items-center gap-2">
         <div className="relative flex-1">
@@ -163,16 +186,26 @@ export const TimeSlicedSearch = ({
             value={localValue}
             onChange={handleChange}
             onKeyDown={handleKeyDown}
-            className="pl-10 pr-8 h-9 text-sm"
+            className="pl-10 pr-10 h-9 text-sm"
             spellCheck={false}
             autoComplete="off"
             autoCapitalize="off"
           />
-          {isTyping && (
-            <div className="absolute right-3 top-1/2 transform -translate-y-1/2">
+          {/* Clear button or loading indicator */}
+          <div className="absolute right-3 top-1/2 transform -translate-y-1/2 flex justify-center items-center">
+            {isTyping ? (
               <div className="w-4 h-4 border-2 border-blue-400 border-t-transparent rounded-full animate-spin"></div>
-            </div>
-          )}
+            ) : localValue ? (
+              <button
+                onClick={handleClear}
+                className="w-4 h-4 text-gray-400 hover:text-gray-600 transition-colors"
+                title="Clear search"
+                aria-label="Clear search"
+              >
+                <X className="w-4 h-4" />
+              </button>
+            ) : null}
+          </div>
         </div>
         
         {/* Navigation Buttons */}
diff --git a/Website/stubs/Data.ts b/Website/stubs/Data.ts
index dde1f1e..3b70258 100644
--- a/Website/stubs/Data.ts
+++ b/Website/stubs/Data.ts
@@ -2,7 +2,10 @@
 /// This file is a stub and should not be modified directly.
 
 import { GroupType } from "@/lib/Types";
-export const LastSynched: Date = new Date()
+
+export const LastSynched: Date = new Date();
+export const Logo: string | null = null;
+
 export let Groups: GroupType[] = [
   {
     "Name":"Untitled",
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 131d81b..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "DataModelViewer",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "semver": "^7.7.2"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
deleted file mode 100644
index 74e7996..0000000
--- a/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "semver": "^7.7.2"
-  }
-}