@customviews-js/customviews 1.1.4 → 1.1.5

package/dist/custom-views.core.cjs.js

@@ -370,10 +370,17 @@ const TABGROUP_SELECTOR = 'cv-tabgroup';
 const TAB_SELECTOR = 'cv-tab';
 const NAV_AUTO_SELECTOR = 'cv-tabgroup[nav="auto"], cv-tabgroup:not([nav])';
 const NAV_CONTAINER_CLASS = 'cv-tabs-nav';
-/**
- * TabManager handles discovery, visibility, and navigation for tab groups and tabs
- */
+const NAV_HIDE_ROOT_CLASS = 'cv-hide-tab-navs';
+const NAV_HIDDEN_CLASS = 'cv-tabs-nav-hidden';
 class TabManager {
+    /**
+     * Split a tab ID into multiple IDs if it contains spaces or |
+     */
+    static splitTabIds(tabId) {
+        const splitIds = tabId.split(/[\s|]+/).filter(id => id.trim() !== '');
+        const trimmedIds = splitIds.map(id => id.trim());
+        return trimmedIds;
+    }
     /**
      * Apply tab selections to all tab groups in the DOM
      */
@@ -385,22 +392,26 @@ class TabManager {
             if (!groupId)
                 return;
             // Determine the active tab for this group
-            const activeTabId = this.resolveActiveTab(groupId, tabs, cfgGroups, groupEl);
+            const activeTabId = this.resolveActiveTabForGroup(groupId, tabs, cfgGroups, groupEl);
             // Apply visibility to direct child cv-tab elements only (not nested ones)
             const tabElements = Array.from(groupEl.children).filter((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
             tabElements.forEach((tabEl) => {
                 const tabId = tabEl.getAttribute('id');
                 if (!tabId)
                     return;
-                const isActive = tabId === activeTabId;
+                // Split IDs and check if any match the active tab
+                const splitIds = this.splitTabIds(tabId);
+                const isActive = splitIds.includes(activeTabId || '');
                 this.applyTabVisibility(tabEl, isActive);
             });
         });
     }
     /**
      * Resolve the active tab for a group based on state, config, and DOM
+     *
+     * Pass in the current tabs state, config groups, and the group element
      */
-    static resolveActiveTab(groupId, tabs, cfgGroups, groupEl) {
+    static resolveActiveTabForGroup(groupId, tabs, cfgGroups, groupEl) {
         // 1. Check state
         if (tabs[groupId]) {
             return tabs[groupId];
@@ -422,7 +433,8 @@ class TabManager {
         // 3. Fallback to first direct cv-tab child in DOM
         const firstTab = Array.from(groupEl.children).find((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
         if (firstTab) {
-            return firstTab.getAttribute('id');
+            const splitIds = this.splitTabIds(firstTab.getAttribute('id') || '');
+            return splitIds[0] || null;
         }
         return null;
     }
@@ -442,7 +454,7 @@ class TabManager {
     /**
      * Build navigation for tab groups with nav="auto" (one-time setup)
      */
-    static buildNavs(rootEl, cfgGroups, onTabClick) {
+    static buildNavs(rootEl, cfgGroups, onTabClick, onTabDoubleClick) {
         // Find all cv-tabgroup elements with nav="auto" or no nav attribute
         const tabGroups = rootEl.querySelectorAll(NAV_AUTO_SELECTOR);
         // Check if any tab headers contain Font Awesome shortcodes
@@ -453,11 +465,14 @@ class TabManager {
             if (!groupId)
                 return;
             const tabElements = Array.from(groupEl.children).filter((child) => child.tagName.toLowerCase() === 'cv-tab');
+            // Check for Font Awesome shortcodes in tab headers
             tabElements.forEach((tabEl) => {
                 const tabId = tabEl.getAttribute('id');
                 if (!tabId)
                     return;
-                const header = tabEl.getAttribute('header') || this.getTabLabel(tabId, groupId, cfgGroups) || tabId;
+                const splitIds = this.splitTabIds(tabId);
+                const firstId = splitIds[0] || tabId;
+                const header = tabEl.getAttribute('header') || this.getTabLabel(firstId, groupId, cfgGroups) || firstId || '';
                 if (/:fa-[\w-]+:/.test(header)) {
                     hasFontAwesomeShortcodes = true;
                 }
@@ -483,41 +498,90 @@ class TabManager {
             navContainer = document.createElement('ul');
             navContainer.className = `${NAV_CONTAINER_CLASS} nav-tabs`;
             navContainer.setAttribute('role', 'tablist');
+            // Respect viewer preference on the root to show/hide navs
+            const showNavs = !rootEl.classList.contains(NAV_HIDE_ROOT_CLASS);
+            if (!showNavs) {
+                navContainer.classList.add(NAV_HIDDEN_CLASS);
+                navContainer.setAttribute('aria-hidden', 'true');
+            }
+            else {
+                navContainer.setAttribute('aria-hidden', 'false');
+            }
             groupEl.insertBefore(navContainer, groupEl.firstChild);
             // Build nav items
             tabElements.forEach((tabEl) => {
                 const tabId = tabEl.getAttribute('id');
                 if (!tabId)
                     return;
-                const header = tabEl.getAttribute('header') || this.getTabLabel(tabId, groupId, cfgGroups) || tabId;
-                const listItem = document.createElement('li');
-                listItem.className = 'nav-item';
-                const navLink = document.createElement('a');
-                navLink.className = 'nav-link';
-                // Replace icon shortcodes in header
-                navLink.innerHTML = replaceIconShortcodes(header);
-                navLink.href = '#';
-                navLink.setAttribute('data-tab-id', tabId);
-                navLink.setAttribute('data-group-id', groupId);
-                navLink.setAttribute('role', 'tab');
-                // Check if this tab is currently active
-                const isActive = tabEl.classList.contains('cv-visible');
-                if (isActive) {
-                    navLink.classList.add('active');
-                    navLink.setAttribute('aria-selected', 'true');
+                const splitIds = this.splitTabIds(tabId);
+                // Header demarcation: if header contains |, split and use per tab.
+                // If header attribute is present and not demarcated, use it as the fallback header.
+                const headerAttr = tabEl.getAttribute('header') || '';
+                let headerParts = [];
+                if (headerAttr && headerAttr.includes('|')) {
+                    headerParts = headerAttr.split('|').map(h => h.trim());
                 }
-                else {
-                    navLink.setAttribute('aria-selected', 'false');
+                const firstId = splitIds[0] || tabId;
+                let fallbackHeader = '';
+                if (headerAttr && !headerAttr.includes('|')) {
+                    // Single header provided on the element: use for all split IDs
+                    fallbackHeader = headerAttr;
                 }
-                // Add click handler
-                if (onTabClick) {
-                    navLink.addEventListener('click', (e) => {
-                        e.preventDefault();
-                        onTabClick(groupId, tabId);
-                    });
+                else {
+                    // No header attribute or multi-part header: use config label or id as fallback
+                    fallbackHeader = this.getTabLabel(firstId, groupId, cfgGroups) || firstId || '';
                 }
-                listItem.appendChild(navLink);
-                navContainer.appendChild(listItem);
+                // Create nav links for each split ID
+                splitIds.forEach((splitId, idx) => {
+                    const listItem = document.createElement('li');
+                    listItem.className = 'nav-item';
+                    const navLink = document.createElement('a');
+                    navLink.className = 'nav-link';
+                    // Use demarcated header if available, else prefer config label for this specific splitId
+                    let header = fallbackHeader;
+                    if (headerParts.length === splitIds.length) {
+                        header = headerParts[idx] ?? fallbackHeader;
+                    }
+                    else if (!headerAttr || headerAttr.includes('|')) {
+                        // Prefer the config label for the individual splitId over using firstId
+                        header = this.getTabLabel(splitId, groupId, cfgGroups) || splitId || '';
+                    }
+                    navLink.innerHTML = replaceIconShortcodes(header);
+                    navLink.href = '#';
+                    navLink.setAttribute('data-tab-id', splitId);
+                    navLink.setAttribute('data-group-id', groupId);
+                    navLink.setAttribute('role', 'tab');
+                    // Check if this split ID is active (same logic as applySelections)
+                    const activeTabId = this.resolveActiveTabForGroup(groupId, {}, cfgGroups, groupEl); // Pass empty tabs for initial state
+                    const isActive = splitIds.includes(activeTabId || '');
+                    if (isActive) {
+                        navLink.classList.add('active');
+                        navLink.setAttribute('aria-selected', 'true');
+                    }
+                    else {
+                        navLink.setAttribute('aria-selected', 'false');
+                    }
+                    // Add click handler for local tab switch
+                    if (onTabClick) {
+                        navLink.addEventListener('click', (e) => {
+                            e.preventDefault();
+                            // console.log("Single-click detected");
+                            onTabClick(groupId, splitId, groupEl);
+                        });
+                    }
+                    // Add double-click handler for sync
+                    if (onTabDoubleClick) {
+                        navLink.addEventListener('dblclick', (e) => {
+                            e.preventDefault();
+                            // console.log("Double-click detected");
+                            onTabDoubleClick(groupId, splitId, groupEl);
+                        });
+                    }
+                    // Add tooltip for UX feedback (use native title attribute)
+                    navLink.setAttribute('title', 'Double click to change switch tabs across all groups');
+                    listItem.appendChild(navLink);
+                    navContainer.appendChild(listItem);
+                });
             });
             // Add bottom border line at the end of the tab group
             const bottomBorder = document.createElement('div');
@@ -525,6 +589,44 @@ class TabManager {
             groupEl.appendChild(bottomBorder);
         });
     }
+    /**
+     * Toggle nav visibility for all tab groups (viewer-controlled)
+     */
+    static setNavsVisibility(rootEl, visible) {
+        if (visible) {
+            rootEl.classList.remove(NAV_HIDE_ROOT_CLASS);
+        }
+        else {
+            rootEl.classList.add(NAV_HIDE_ROOT_CLASS);
+        }
+        const navContainers = rootEl.querySelectorAll(`.${NAV_CONTAINER_CLASS}`);
+        navContainers.forEach((nav) => {
+            if (visible) {
+                nav.classList.remove(NAV_HIDDEN_CLASS);
+                nav.setAttribute('aria-hidden', 'false');
+            }
+            else {
+                nav.classList.add(NAV_HIDDEN_CLASS);
+                nav.setAttribute('aria-hidden', 'true');
+            }
+        });
+        // Also hide/show the bottom border of tab groups
+        const bottomBorders = rootEl.querySelectorAll('.cv-tabgroup-bottom-border');
+        bottomBorders.forEach((border) => {
+            if (visible) {
+                border.classList.remove('cv-hidden');
+            }
+            else {
+                border.classList.add('cv-hidden');
+            }
+        });
+    }
+    /**
+     * Read current nav visibility (viewer preference)
+     */
+    static areNavsVisible(rootEl) {
+        return !rootEl.classList.contains(NAV_HIDE_ROOT_CLASS);
+    }
     /**
      * Get tab label from config
      */
@@ -538,23 +640,25 @@ class TabManager {
         return tabCfg?.label || null;
     }
     /**
-     * Update active state in navs after selection change (single group)
+     * Update active state in navs for a specific tabgroup element only
      */
-    static updateNavActiveState(rootEl, groupId, activeTabId) {
-        const tabGroups = rootEl.querySelectorAll(`${TABGROUP_SELECTOR}[id="${groupId}"]`);
-        tabGroups.forEach((groupEl) => {
-            const navLinks = groupEl.querySelectorAll('.nav-link');
-            navLinks.forEach((link) => {
-                const tabId = link.getAttribute('data-tab-id');
-                if (tabId === activeTabId) {
-                    link.classList.add('active');
-                    link.setAttribute('aria-selected', 'true');
-                }
-                else {
-                    link.classList.remove('active');
-                    link.setAttribute('aria-selected', 'false');
-                }
-            });
+    static updateNavActiveState(groupEl, activeTabId) {
+        const navLinks = groupEl.querySelectorAll('.nav-link');
+        navLinks.forEach((link) => {
+            const linkTabId = link.getAttribute('data-tab-id');
+            if (!linkTabId)
+                return;
+            // Check if activeTabId matches or is in the split IDs of this link
+            const splitIds = this.splitTabIds(linkTabId);
+            const isActive = linkTabId === activeTabId || splitIds.includes(activeTabId);
+            if (isActive) {
+                link.classList.add('active');
+                link.setAttribute('aria-selected', 'true');
+            }
+            else {
+                link.classList.remove('active');
+                link.setAttribute('aria-selected', 'false');
+            }
         });
     }
     /**
@@ -567,14 +671,19 @@ class TabManager {
             if (!groupId)
                 return;
             // Determine the active tab for this group
-            const activeTabId = this.resolveActiveTab(groupId, tabs, cfgGroups, groupEl);
+            const activeTabId = this.resolveActiveTabForGroup(groupId, tabs, cfgGroups, groupEl);
             if (!activeTabId)
                 return;
             // Update nav links for this group
             const navLinks = groupEl.querySelectorAll('.nav-link');
             navLinks.forEach((link) => {
-                const tabId = link.getAttribute('data-tab-id');
-                if (tabId === activeTabId) {
+                const linkTabId = link.getAttribute('data-tab-id');
+                if (!linkTabId)
+                    return;
+                // Check if activeTabId matches or is in the split IDs of this link
+                const splitIds = this.splitTabIds(linkTabId);
+                const isActive = linkTabId === activeTabId || splitIds.includes(activeTabId);
+                if (isActive) {
                     link.classList.add('active');
                     link.setAttribute('aria-selected', 'true');
                 }
@@ -585,6 +694,47 @@ class TabManager {
             });
         });
     }
+    /**
+     * Apply tab selection to a specific tabgroup element only (not globally).
+     * Used for single-click behavior to update only the clicked tabgroup.
+     */
+    static applyTabLocalOnly(groupEl, activeTabId) {
+        const tabElements = Array.from(groupEl.children).filter((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
+        tabElements.forEach((tabEl) => {
+            const tabId = tabEl.getAttribute('id');
+            if (!tabId)
+                return;
+            const splitIds = this.splitTabIds(tabId);
+            const isActive = splitIds.includes(activeTabId);
+            this.applyTabVisibility(tabEl, isActive);
+        });
+    }
+    /**
+     * Check if a tabgroup element contains a specific tab ID (respects split IDs).
+     * Accepts groupEl to avoid repeated DOM queries.
+     */
+    static groupHasTab(groupEl, tabId) {
+        const tabElements = Array.from(groupEl.children).filter((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
+        return tabElements.some((tabEl) => {
+            const idAttr = tabEl.getAttribute('id') || '';
+            const splitIds = this.splitTabIds(idAttr);
+            return splitIds.includes(tabId);
+        });
+    }
+    /**
+     * Returns array of group elements to be synced (excluding source).
+     */
+    static getTabgroupsWithId(rootEl, sourceGroupId, tabId) {
+        const syncedGroupEls = [];
+        const allGroupEls = Array.from(rootEl.querySelectorAll(`${TABGROUP_SELECTOR}[id="${sourceGroupId}"]`));
+        allGroupEls.forEach((targetGroupEl) => {
+            // Only sync if target group actually contains this tab
+            if (this.groupHasTab(targetGroupEl, tabId)) {
+                syncedGroupEls.push(targetGroupEl);
+            }
+        });
+        return syncedGroupEls;
+    }
 }
 
 class AssetsManager {
@@ -839,6 +989,18 @@ cv-tabgroup {
 .cv-tab-content {
   padding: 1rem 0;
 }
+
+/* Viewer-controlled nav visibility: hide nav containers when requested */
+.cv-tabs-nav-hidden {
+  display: none !important;
+}
+
+/* Print-friendly: hide tab navigation when printing to reduce clutter */
+@media print {
+  .cv-tabs-nav {
+    display: none !important;
+  }
+}
 `;
 
 /**
@@ -906,33 +1068,51 @@ class CustomViewsCore {
     /**
      * Set active tab for a group and apply state
      */
-    setActiveTab(groupId, tabId) {
-        // Get current state
-        const currentToggles = this.getCurrentActiveToggles();
-        const currentTabs = this.getCurrentActiveTabs();
-        // Merge new tab selection
-        const newTabs = { ...currentTabs, [groupId]: tabId };
-        // Create new state
-        const newState = {
-            toggles: currentToggles,
-            tabs: newTabs
-        };
-        // Apply the state
-        this.applyState(newState);
-        // Emit custom event
-        const event = new CustomEvent('customviews:tab-change', {
-            detail: { groupId, tabId },
-            bubbles: true
-        });
-        document.dispatchEvent(event);
+    setActiveTab(groupId, tabId, groupEl) {
+        // If groupEl is provided, apply tab selection locally to just that element
+        // Single-click: only updates DOM visually, no persistence
+        if (groupEl) {
+            TabManager.applyTabLocalOnly(groupEl, tabId);
+            // Update nav active state for this group element only
+            TabManager.updateNavActiveState(groupEl, tabId);
+            // Emit custom event for local tab change
+            const event = new CustomEvent('customviews:tab-change', {
+                detail: { groupId, tabId, synced: false },
+                bubbles: true
+            });
+            document.dispatchEvent(event);
+        }
     }
     // Inject styles, setup listeners and call rendering logic
     async init() {
         injectCoreStyles();
-        // Build navigation once (with click handlers)
-        TabManager.buildNavs(this.rootEl, this.config.tabGroups, (groupId, tabId) => {
-            this.setActiveTab(groupId, tabId);
+        // Build navigation once (with click and double-click handlers)
+        TabManager.buildNavs(this.rootEl, this.config.tabGroups, 
+        // Single click: update clicked group only (local, no persistence)
+        (groupId, tabId, groupEl) => {
+            this.setActiveTab(groupId, tabId, groupEl);
+        }, 
+        // Double click: sync across all tabgroups with same id (with persistence)
+        (groupId, tabId, _groupEl) => {
+            const currentTabs = this.getCurrentActiveTabs();
+            currentTabs[groupId] = tabId;
+            const currentToggles = this.getCurrentActiveToggles();
+            const newState = {
+                toggles: currentToggles,
+                tabs: currentTabs
+            };
+            // applyState() will handle all visual updates via renderState()
+            this.applyState(newState);
         });
+        // Apply stored nav visibility preference on page load
+        try {
+            const navPref = localStorage.getItem('cv-tab-navs-visible');
+            if (navPref !== null) {
+                const visible = navPref === 'true';
+                TabManager.setNavsVisibility(this.rootEl, visible);
+            }
+        }
+        catch (e) { /* ignore */ }
         // For session history, clicks on back/forward button
         window.addEventListener("popstate", () => {
             this.loadAndCallApplyState();
@@ -1464,13 +1644,14 @@ const WIDGET_STYLES = `
 
 .cv-widget-modal {
   background: white;
-  border-radius: 8px;
-  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.2);
-  max-width: 400px;
+  border-radius: 0.75rem;
+  box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+  max-width: 32rem;
   width: 90vw;
   max-height: 80vh;
-  overflow-y: auto;
   animation: slideIn 0.2s ease;
+  display: flex;
+  flex-direction: column;
 }
 
 @keyframes slideIn {
@@ -1484,47 +1665,96 @@ const WIDGET_STYLES = `
   }
 }
 
-.cv-widget-modal-header {
+.cv-modal-header {
   display: flex;
+  align-items: center;
   justify-content: space-between;
+  padding: 0.5rem 1rem;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.cv-modal-header-content {
+  display: flex;
   align-items: center;
-  padding: 16px 20px;
-  border-bottom: 1px solid #e9ecef;
-  background: #f8f9fa;
-  border-radius: 8px 8px 0 0;
+  gap: 0.75rem;
+}
+
+.cv-modal-icon {
+  position: relative;
+  width: 1rem;
+  height: 1rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 9999px;
+}
+
+.cv-modal-icon-svg {
+  width: 100%;
+  height: 100%;
+  opacity: 1;
 }
 
-.cv-widget-modal-header h3 {
+.cv-modal-title {
+  font-size: 1.125rem;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 0.9);
   margin: 0;
-  font-size: 18px;
-  font-weight: 600;
-  color: #333;
 }
 
-.cv-widget-modal-close {
-  background: none;
-  border: none;
-  font-size: 20px;
-  cursor: pointer;
-  padding: 0;
-  width: 32px;
-  height: 32px;
+.cv-modal-close {
+  width: 2rem;
+  height: 2rem;
   display: flex;
   align-items: center;
   justify-content: center;
-  border-radius: 4px;
-  color: #666;
-  line-height: 1;
+  border-radius: 9999px;
+  background: transparent;
+  border: none;
+  color: rgba(0, 0, 0, 0.6);
+  cursor: pointer;
   transition: all 0.2s ease;
 }
 
-.cv-widget-modal-close:hover {
-  background: #e9ecef;
-  color: #333;
+.cv-modal-close:hover {
+  background: rgba(62, 132, 244, 0.1);
+  color: #3e84f4;
+}
+
+.cv-modal-close-icon {
+  width: 1.25rem;
+  height: 1.25rem;
 }
 
-.cv-widget-modal-content {
-  padding: 20px;
+.cv-modal-main {
+  padding: 1rem;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  overflow-y: auto;
+  max-height: calc(80vh - 8rem);
+}
+
+.cv-modal-description {
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.8);
+  margin: 0;
+  line-height: 1.4;
+}
+
+.cv-content-section,
+.cv-tab-groups-section {
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.cv-section-heading {
+  font-size: 1rem;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 0.9);
+  margin: 0;
 }
 
 .cv-widget-modal-actions {
@@ -1566,32 +1796,83 @@ const WIDGET_STYLES = `
   background: #0056b3;
 }
 
-/* Dark theme modal styles */
 .cv-widget-theme-dark .cv-widget-modal {
-  background: #2d3748;
+  background: #101722;
   color: #e2e8f0;
 }
 
-.cv-widget-theme-dark .cv-widget-modal-header {
-  background: #1a202c;
-  border-color: #4a5568;
+.cv-widget-theme-dark .cv-modal-header {
+  border-color: rgba(255, 255, 255, 0.1);
 }
 
-.cv-widget-theme-dark .cv-widget-modal-header h3 {
+.cv-widget-theme-dark .cv-modal-title {
   color: #e2e8f0;
 }
 
-.cv-widget-theme-dark .cv-widget-modal-close {
-  color: #a0aec0;
+.cv-widget-theme-dark .cv-modal-close {
+  color: rgba(255, 255, 255, 0.6);
 }
 
-.cv-widget-theme-dark .cv-widget-modal-close:hover {
-  background: #4a5568;
+.cv-widget-theme-dark .cv-modal-close:hover {
+  background: rgba(62, 132, 244, 0.2);
+  color: #3e84f4;
+}
+
+.cv-widget-theme-dark .cv-modal-description {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.cv-widget-theme-dark .cv-section-heading {
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-toggles-container
+.cv-widget-theme-dark .cv-tabgroups-container {
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-toggle-card,
+.cv-widget-theme-dark .cv-tabgroup-card {
+  background: #101722;
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-toggle-title,
+.cv-widget-theme-dark .cv-tabgroup-title {
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-toggle-description,
+.cv-widget-theme-dark .cv-tabgroup-description {
+  color: rgba(255, 255, 255, 0.6);
+}
+
+.cv-widget-theme-dark .cv-toggle-slider {
+  background: rgba(255, 255, 255, 0.2);
+}
+
+.cv-widget-theme-dark .cv-tab-group-description {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-select {
+  background: #101722;
+  border-color: rgba(255, 255, 255, 0.2);
   color: #e2e8f0;
 }
 
-.cv-widget-theme-dark .cv-widget-modal-actions {
-  border-color: #4a5568;
+.cv-widget-theme-dark .cv-modal-footer {
+  border-color: rgba(255, 255, 255, 0.1);
+  background: #101722;
+}
+
+.cv-widget-theme-dark .cv-reset-btn {
+  color: #e2e8f0;
+  background: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-reset-btn:hover {
+  background: rgba(255, 255, 255, 0.2);
 }
 
 /* Custom state creator styles */
@@ -1599,8 +1880,7 @@ const WIDGET_STYLES = `
   max-width: 500px;
 }
 
-.cv-custom-state-form h4 {
-  margin: 20px 0 10px 0;
+.cv-custom-state-form .cv-section-header {
   font-size: 16px;
   font-weight: 600;
   color: #333;
@@ -1642,63 +1922,89 @@ const WIDGET_STYLES = `
   box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.25);
 }
 
-.cv-custom-toggles {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
-  gap: 10px;
+/* Toggles Container */
+.cv-toggles-container {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  border-radius: 0.5rem;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  overflow: hidden;
 }
 
-.cv-custom-state-toggle {
-  display: flex;
-  align-items: center;
+.cv-toggle-card,
+.cv-tabgroup-card {
+  background: white;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.cv-toggle-card:last-child {
+  border-bottom: none;
 }
 
-.cv-custom-state-toggle label {
+.cv-toggle-content {
   display: flex;
   align-items: center;
-  cursor: pointer;
-  font-weight: normal;
+  justify-content: space-between;
+  padding: 0.75rem;
+}
+
+.cv-toggle-title {
+  font-weight: 500;
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.9);
+  margin: 0 0 0.125rem 0;
+}
+
+.cv-toggle-description {
+  font-size: 0.75rem;
+  color: rgba(0, 0, 0, 0.6);
   margin: 0;
 }
 
-.cv-toggle-switch {
+.cv-toggle-label{
   position: relative;
-  width: 44px;
-  height: 24px;
-  background: #ccc;
-  border-radius: 12px;
-  margin-right: 12px;
+  display: inline-block;
+  width: 2.75rem;
+  height: 1.5rem;
   cursor: pointer;
-  transition: background-color 0.3s ease;
-  flex-shrink: 0;
 }
 
-.cv-toggle-switch:hover {
-  background: #bbb;
+.cv-toggle-input {
+  opacity: 0;
+  width: 0;
+  height: 0;
 }
 
-.cv-toggle-switch.cv-toggle-active {
-  background: #007bff;
-}
-
-.cv-toggle-switch.cv-toggle-active:hover {
-  background: #0056b3;
+.cv-toggle-slider {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.2);
+  border-radius: 9999px;
+  transition: background-color 0.2s ease;
 }
 
-.cv-toggle-handle {
+.cv-toggle-slider:before {
   position: absolute;
-  top: 2px;
-  left: 2px;
-  width: 20px;
-  height: 20px;
+  content: "";
+  height: 1rem;
+  width: 1rem;
+  left: 0.25rem;
+  bottom: 0.25rem;
   background: white;
   border-radius: 50%;
-  transition: transform 0.3s ease;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  transition: transform 0.2s ease;
 }
 
-.cv-toggle-switch.cv-toggle-active .cv-toggle-handle {
-  transform: translateX(20px);
+.cv-toggle-input:checked + .cv-toggle-slider {
+  background: #3e84f4;
+}
+
+.cv-toggle-input:checked + .cv-toggle-slider:before {
+  transform: translateX(1.25rem);
 }
 
 /* Dark theme toggle switch styles */
@@ -1718,200 +2024,371 @@ const WIDGET_STYLES = `
   background: #4299e1;
 }
 
-.cv-tab-groups {
-  margin-top: 20px;
+/* Tab Groups Container */
+.cv-tab-groups-list {
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 0.5rem;
+  overflow: hidden;
 }
 
-.cv-tab-group-control {
-  margin-bottom: 15px;
+/* Tab Group Card - Header (Navigation Headers toggle) */
+.cv-tabgroup-card.cv-tabgroup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.75rem;
+  border-bottom: 0px;
 }
 
-.cv-tab-group-control label {
-  display: block;
-  margin-bottom: 5px;
+.cv-tabgroup-card.cv-tabgroup-header .cv-tabgroup-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  gap: 1rem;
+}
+
+/* Tab Group Card - Items */
+.cv-tabgroup-card.cv-tabgroup-item {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  padding: 0.75rem;
+  background: white;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+}
+
+.cv-tabgroup-card.cv-tabgroup-item:last-child {
+  border-bottom: none;
+}
+
+/* Tab Group Info */
+.cv-tabgroup-info {
+  flex: 1;
+}
+
+.cv-tabgroup-title {
   font-weight: 500;
-  font-size: 14px;
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.9);
+  margin: 0 0 0.25rem 0;
 }
 
-.cv-tab-group-select {
-  width: 100%;
-  padding: 8px 12px;
-  border: 1px solid #ced4da;
-  border-radius: 4px;
-  font-size: 14px;
-  background-color: white;
+.cv-tabgroup-description {
+  font-size: 0.75rem;
+  color: rgba(0, 0, 0, 0.6);
+  margin: 0;
+  line-height: 1.3;
+}
+
+/* Tab Group Label (for select dropdowns) */
+.cv-tabgroup-label {
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.8);
+  margin: 0;
+  line-height: 1.4;
+  font-weight: 500;
+  display: block;
   cursor: pointer;
 }
 
-.cv-tab-group-select:focus {
-  outline: none;
-  border-color: #007bff;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
+/* Tab Group Select */
+.cv-tabgroup-select {
+  width: 100%;
+  border-radius: 0.5rem;
+  background: white;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: rgba(0, 0, 0, 0.9);
+  padding: 0.5rem 0.75rem;
+  font-size: 0.875rem;
+  cursor: pointer;
+  transition: all 0.15s ease;
+  font-family: inherit;
 }
 
-.cv-widget-theme-dark .cv-tab-group-select {
-  background-color: #2d3748;
-  border-color: #4a5568;
-  color: #e2e8f0;
+.cv-tabgroup-select:hover {
+  border-color: rgba(0, 0, 0, 0.25);
 }
 
-.cv-custom-state-actions {
-  display: flex;
-  gap: 10px;
-  margin-top: 20px;
-  padding-top: 16px;
-  border-top: 1px solid #e9ecef;
+.cv-tabgroup-select:focus {
+  outline: none;
+  border-color: #3e84f4;
+  box-shadow: 0 0 0 2px rgba(62, 132, 244, 0.2);
 }
 
-.cv-custom-state-cancel,
-.cv-custom-state-copy-url {
-  flex: 1;
-  padding: 10px 16px;
-  border: none;
-  border-radius: 4px;
+/* Modern Toggle Switch */
+.cv-toggle-switch {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  width: 44px;
+  height: 24px;
+  background: rgba(0, 0, 0, 0.1);
+  border-radius: 9999px;
+  padding: 2px;
+  box-sizing: border-box;
   cursor: pointer;
-  font-size: 14px;
-  font-weight: 500;
+  transition: background-color 0.2s ease;
+  border: none;
 }
 
-.cv-custom-state-reset {
-  flex: 1;
-  padding: 10px 16px;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 14px;
-  font-weight: 500;
-  background: #dc3545;
-  color: white;
+.cv-toggle-switch input {
+  display: none;
 }
 
-.cv-custom-state-reset:hover {
-  background: #c82333;
+.cv-toggle-switch .cv-switch-bg {
+  position: absolute;
+  inset: 0;
+  border-radius: 9999px;
+  background: rgba(0, 0, 0, 0.1);
+  transition: background-color 0.2s ease;
+  pointer-events: none;
 }
 
-.cv-custom-state-cancel {
-  background: #6c757d;
-  color: white;
+.cv-toggle-switch .cv-switch-knob {
+  position: relative;
+  width: 20px;
+  height: 20px;
+  background: white;
+  border-radius: 50%;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+  transition: transform 0.2s ease;
+  z-index: 1;
 }
 
-.cv-custom-state-cancel:hover {
-  background: #5a6268;
+.cv-toggle-switch input:checked + .cv-switch-bg {
+  background: #3e84f4;
 }
 
-.cv-custom-state-copy-url {
-  background: #28a745;
-  color: white;
+.cv-toggle-switch input:checked ~ .cv-switch-knob {
+  transform: translateX(20px);
 }
 
-.cv-custom-state-copy-url:hover {
-  background: #218838;
+/* Dark Theme - Tab Groups */
+.cv-widget-theme-dark .cv-tabgroup-card.cv-tabgroup-header {
+  background: #101722;
+  border-bottom-color: rgba(255, 255, 255, 0.1);
 }
 
-/* Dark theme custom state styles */
-.cv-widget-theme-dark .cv-custom-state-form h4 {
+.cv-widget-theme-dark .cv-tabgroup-card.cv-tabgroup-item {
+  background: #101722;
+  border-bottom-color: rgba(255, 255, 255, 0.05);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-title {
   color: #e2e8f0;
-  border-color: #4a5568;
 }
 
-.cv-widget-theme-dark .cv-custom-state-form p {
-  color: #cbd5e0;
+.cv-widget-theme-dark .cv-tabgroup-description {
+  color: rgba(255, 255, 255, 0.6);
 }
 
-.cv-widget-theme-dark .cv-custom-state-section label {
-  color: #a0aec0;
+.cv-widget-theme-dark .cv-tabgroup-label {
+  color: rgba(255, 255, 255, 0.8);
 }
 
-.cv-widget-theme-dark .cv-custom-state-input {
-  background: #1a202c;
-  border-color: #4a5568;
+.cv-widget-theme-dark .cv-tab-groups-list {
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-select {
+  background: #101722;
+  border-color: rgba(255, 255, 255, 0.15);
   color: #e2e8f0;
 }
 
-.cv-widget-theme-dark .cv-custom-state-actions {
-  border-color: #4a5568;
+.cv-widget-theme-dark .cv-tabgroup-select:hover {
+  border-color: rgba(255, 255, 255, 0.25);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-select:focus {
+  border-color: #60a5fa;
+  box-shadow: 0 0 0 2px rgba(96, 165, 250, 0.2);
+}
+
+/* Dark Theme - Toggle Switch */
+.cv-widget-theme-dark .cv-toggle-switch .cv-switch-bg {
+  background: rgba(255, 255, 255, 0.1);
 }
 
+.cv-widget-theme-dark .cv-toggle-switch .cv-switch-knob {
+  background: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-toggle-switch input:checked + .cv-switch-bg {
+  background: #63b3ed;
+}
+
+.cv-modal-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0.75rem;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.cv-reset-btn,
+.cv-share-btn {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 0.375rem 0.75rem;
+  border-radius: 0.5rem;
+  font-weight: 600;
+  font-size: 0.875rem;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: none;
+}
+
+.cv-reset-btn {
+  color: rgba(0, 0, 0, 0.9);
+  background: rgba(0, 0, 0, 0.1);
+}
+
+.cv-reset-btn:hover {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.cv-share-btn {
+  color: white;
+  background: #3e84f4;
+}
+
+.cv-share-btn:hover {
+  background: rgba(62, 132, 244, 0.9);
+}
+
+.cv-btn-icon {
+  width: 1rem;
+  height: 1rem;
+}
+
+/* Dark theme custom state styles */
 /* Welcome modal styles */
 .cv-welcome-modal {
-  max-width: 500px;
+  max-width: 32rem;
+  width: 90vw;
+  background: white;
+  border-radius: 0.75rem;
+  box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+  animation: slideIn 0.2s ease;
+  display: flex;
+  flex-direction: column;
+}
+
+.cv-modal-main {
+  padding: 1rem;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  overflow-y: auto;
+  max-height: calc(80vh - 8rem);
 }
 
-.cv-welcome-content {
+.cv-welcome-message {
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.8);
+  margin: 0;
+  line-height: 1.4;
   text-align: center;
 }
 
-.cv-welcome-content p {
-  font-size: 15px;
-  line-height: 1.6;
-  color: #555;
-  margin-bottom: 24px;
+.cv-welcome-message a {
+  color: #3e84f4;
   text-align: justify;
+  text-decoration: none;
+}
+
+.cv-welcome-message a:hover {
+  text-decoration: underline;
 }
 
 .cv-welcome-widget-preview {
   display: flex;
-  flex-direction: column;
   align-items: center;
-  gap: 12px;
-  padding: 20px;
+  justify-content: center;
+  gap: 1rem;
+  padding: 1rem;
   background: #f8f9fa;
-  border-radius: 8px;
-  margin-bottom: 24px;
+  border-radius: 0.5rem;
+  margin: 1rem 0;
 }
 
 .cv-welcome-widget-icon {
-  width: 36px;
-  height: 36px;
-  background: white;
-  color: black;
-  border-radius: 0 18px 18px 0;
+  width: 2rem;
+  height: 2rem;
+  background: rgba(62, 132, 244, 0.1);
+  border-radius: 9999px;
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 18px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  animation: cv-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
+  color: #3e84f4;
 }
 
 .cv-welcome-widget-label {
-  font-size: 14px;
-  color: #666;
-  margin: 0;
+  font-size: 0.875rem;
   font-weight: 500;
+  color: rgba(0, 0, 0, 0.8);
+  margin: 0;
 }
 
 .cv-welcome-got-it {
   width: 100%;
-  padding: 12px 24px;
-  background: #007bff;
+  background: #3e84f4;
   color: white;
+  font-weight: 600;
+  padding: 0.75rem 1rem;
+  border-radius: 0.5rem;
   border: none;
-  border-radius: 4px;
   cursor: pointer;
-  font-size: 16px;
-  font-weight: 600;
-  transition: background 0.2s ease;
+  font-size: 0.875rem;
+  transition: background-color 0.2s ease;
+  outline: none;
 }
 
 .cv-welcome-got-it:hover {
-  background: #0056b3;
+  background: rgba(62, 132, 244, 0.9);
+}
+
+.cv-welcome-got-it:focus {
+  box-shadow: 0 0 0 2px rgba(62, 132, 244, 0.5);
 }
 
-.cv-welcome-got-it:active {
-  background: #004494;
+/* Animations */
+@keyframes cv-pulse {
+  0%, 100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.5;
+  }
 }
 
 /* Dark theme welcome modal styles */
-.cv-widget-theme-dark .cv-welcome-content p {
-  color: #cbd5e0;
+.cv-widget-theme-dark .cv-welcome-modal {
+  background: #101722;
+}
+
+.cv-widget-theme-dark .cv-welcome-message {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.cv-widget-theme-dark .cv-welcome-message a {
+  color: #60a5fa;
 }
 
 .cv-widget-theme-dark .cv-welcome-widget-preview {
-  background: #1a202c;
+  background: rgba(255, 255, 255, 0.1);
 }
 
 .cv-widget-theme-dark .cv-welcome-widget-label {
-  color: #a0aec0;
+  color: #e2e8f0;
 }
 `;
 /**
@@ -1927,6 +2404,45 @@ function injectWidgetStyles() {
     document.head.appendChild(style);
 }
 
+/**
+ * Icon utilities for CustomViews widget
+ * Centralized SVG icons for better maintainability and reusability
+ */
+/**
+ * Settings gear icon for modal header
+ */
+function getGearIcon() {
+    return `<svg class="cv-modal-icon-svg" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" d="M12 8.00002C9.79085 8.00002 7.99999 9.79088 7.99999 12C7.99999 14.2092 9.79085 16 12 16C14.2091 16 16 14.2092 16 12C16 9.79088 14.2091 8.00002 12 8.00002ZM9.99999 12C9.99999 10.8955 10.8954 10 12 10C13.1046 10 14 10.8955 14 12C14 13.1046 13.1046 14 12 14C10.8954 14 9.99999 13.1046 9.99999 12Z" fill="#0F1729"/>
+  <path xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" d="M10.7673 1.01709C10.9925 0.999829 11.2454 0.99993 11.4516 1.00001L12.5484 1.00001C12.7546 0.99993 13.0075 0.999829 13.2327 1.01709C13.4989 1.03749 13.8678 1.08936 14.2634 1.26937C14.7635 1.49689 15.1915 1.85736 15.5007 2.31147C15.7454 2.67075 15.8592 3.0255 15.9246 3.2843C15.9799 3.50334 16.0228 3.75249 16.0577 3.9557L16.1993 4.77635L16.2021 4.77788C16.2369 4.79712 16.2715 4.81659 16.306 4.8363L16.3086 4.83774L17.2455 4.49865C17.4356 4.42978 17.6693 4.34509 17.8835 4.28543C18.1371 4.2148 18.4954 4.13889 18.9216 4.17026C19.4614 4.20998 19.9803 4.39497 20.4235 4.70563C20.7734 4.95095 21.0029 5.23636 21.1546 5.4515C21.2829 5.63326 21.4103 5.84671 21.514 6.02029L22.0158 6.86003C22.1256 7.04345 22.2594 7.26713 22.3627 7.47527C22.4843 7.7203 22.6328 8.07474 22.6777 8.52067C22.7341 9.08222 22.6311 9.64831 22.3803 10.1539C22.1811 10.5554 21.9171 10.8347 21.7169 11.0212C21.5469 11.1795 21.3428 11.3417 21.1755 11.4746L20.5 12L21.1755 12.5254C21.3428 12.6584 21.5469 12.8205 21.7169 12.9789C21.9171 13.1653 22.1811 13.4446 22.3802 13.8461C22.631 14.3517 22.7341 14.9178 22.6776 15.4794C22.6328 15.9253 22.4842 16.2797 22.3626 16.5248C22.2593 16.7329 22.1255 16.9566 22.0158 17.14L21.5138 17.9799C21.4102 18.1535 21.2828 18.3668 21.1546 18.5485C21.0028 18.7637 20.7734 19.0491 20.4234 19.2944C19.9803 19.6051 19.4613 19.7901 18.9216 19.8298C18.4954 19.8612 18.1371 19.7852 17.8835 19.7146C17.6692 19.6549 17.4355 19.5703 17.2454 19.5014L16.3085 19.1623L16.306 19.1638C16.2715 19.1835 16.2369 19.2029 16.2021 19.2222L16.1993 19.2237L16.0577 20.0443C16.0228 20.2475 15.9799 20.4967 15.9246 20.7157C15.8592 20.9745 15.7454 21.3293 15.5007 21.6886C15.1915 22.1427 14.7635 22.5032 14.2634 22.7307C13.8678 22.9107 13.4989 22.9626 13.2327 22.983C13.0074 23.0002 12.7546 23.0001 12.5484 23H11.4516C11.2454 23.0001 10.9925 23.0002 10.7673 22.983C10.5011 22.9626 10.1322 22.9107 9.73655 22.7307C9.23648 22.5032 8.80849 22.1427 8.49926 21.6886C8.25461 21.3293 8.14077 20.9745 8.07542 20.7157C8.02011 20.4967 7.97723 20.2475 7.94225 20.0443L7.80068 19.2237L7.79791 19.2222C7.7631 19.2029 7.72845 19.1835 7.69396 19.1637L7.69142 19.1623L6.75458 19.5014C6.5645 19.5702 6.33078 19.6549 6.11651 19.7146C5.86288 19.7852 5.50463 19.8611 5.07841 19.8298C4.53866 19.7901 4.01971 19.6051 3.57654 19.2944C3.2266 19.0491 2.99714 18.7637 2.84539 18.5485C2.71718 18.3668 2.58974 18.1534 2.4861 17.9798L1.98418 17.14C1.87447 16.9566 1.74067 16.7329 1.63737 16.5248C1.51575 16.2797 1.36719 15.9253 1.32235 15.4794C1.26588 14.9178 1.36897 14.3517 1.61976 13.8461C1.81892 13.4446 2.08289 13.1653 2.28308 12.9789C2.45312 12.8205 2.65717 12.6584 2.82449 12.5254L3.47844 12.0054V11.9947L2.82445 11.4746C2.65712 11.3417 2.45308 11.1795 2.28304 11.0212C2.08285 10.8347 1.81888 10.5554 1.61972 10.1539C1.36893 9.64832 1.26584 9.08224 1.3223 8.52069C1.36714 8.07476 1.51571 7.72032 1.63732 7.47528C1.74062 7.26715 1.87443 7.04347 1.98414 6.86005L2.48605 6.02026C2.58969 5.84669 2.71714 5.63326 2.84534 5.45151C2.9971 5.23637 3.22655 4.95096 3.5765 4.70565C4.01966 4.39498 4.53862 4.20999 5.07837 4.17027C5.50458 4.1389 5.86284 4.21481 6.11646 4.28544C6.33072 4.34511 6.56444 4.4298 6.75451 4.49867L7.69141 4.83775L7.69394 4.8363C7.72844 4.8166 7.7631 4.79712 7.79791 4.77788L7.80068 4.77635L7.94225 3.95571C7.97723 3.7525 8.02011 3.50334 8.07542 3.2843C8.14077 3.0255 8.25461 2.67075 8.49926 2.31147C8.80849 1.85736 9.23648 1.49689 9.73655 1.26937C10.1322 1.08936 10.5011 1.03749 10.7673 1.01709ZM14.0938 4.3363C14.011 3.85634 13.9696 3.61637 13.8476 3.43717C13.7445 3.2858 13.6019 3.16564 13.4352 3.0898C13.2378 3.00002 12.9943 3.00002 12.5073 3.00002H11.4927C11.0057 3.00002 10.7621 3.00002 10.5648 3.0898C10.3981 3.16564 10.2555 3.2858 10.1524 3.43717C10.0304 3.61637 9.98895 3.85634 9.90615 4.3363L9.75012 5.24064C9.69445 5.56333 9.66662 5.72467 9.60765 5.84869C9.54975 5.97047 9.50241 6.03703 9.40636 6.13166C9.30853 6.22804 9.12753 6.3281 8.76554 6.52822C8.73884 6.54298 8.71227 6.55791 8.68582 6.57302C8.33956 6.77078 8.16643 6.86966 8.03785 6.90314C7.91158 6.93602 7.83293 6.94279 7.70289 6.93196C7.57049 6.92094 7.42216 6.86726 7.12551 6.7599L6.11194 6.39308C5.66271 6.2305 5.43809 6.14921 5.22515 6.16488C5.04524 6.17811 4.87225 6.23978 4.72453 6.34333C4.5497 6.46589 4.42715 6.67094 4.18206 7.08103L3.72269 7.84965C3.46394 8.2826 3.33456 8.49907 3.31227 8.72078C3.29345 8.90796 3.32781 9.09665 3.41141 9.26519C3.51042 9.4648 3.7078 9.62177 4.10256 9.9357L4.82745 10.5122C5.07927 10.7124 5.20518 10.8126 5.28411 10.9199C5.36944 11.036 5.40583 11.1114 5.44354 11.2504C5.47844 11.379 5.47844 11.586 5.47844 12C5.47844 12.414 5.47844 12.621 5.44354 12.7497C5.40582 12.8887 5.36944 12.9641 5.28413 13.0801C5.20518 13.1875 5.07927 13.2876 4.82743 13.4879L4.10261 14.0643C3.70785 14.3783 3.51047 14.5352 3.41145 14.7349C3.32785 14.9034 3.29349 15.0921 3.31231 15.2793C3.33461 15.501 3.46398 15.7174 3.72273 16.1504L4.1821 16.919C4.4272 17.3291 4.54974 17.5342 4.72457 17.6567C4.8723 17.7603 5.04528 17.8219 5.2252 17.8352C5.43813 17.8508 5.66275 17.7695 6.11199 17.607L7.12553 17.2402C7.42216 17.1328 7.5705 17.0791 7.7029 17.0681C7.83294 17.0573 7.91159 17.064 8.03786 17.0969C8.16644 17.1304 8.33956 17.2293 8.68582 17.427C8.71228 17.4421 8.73885 17.4571 8.76554 17.4718C9.12753 17.6719 9.30853 17.772 9.40635 17.8684C9.50241 17.963 9.54975 18.0296 9.60765 18.1514C9.66662 18.2754 9.69445 18.4367 9.75012 18.7594L9.90615 19.6637C9.98895 20.1437 10.0304 20.3837 10.1524 20.5629C10.2555 20.7142 10.3981 20.8344 10.5648 20.9102C10.7621 21 11.0057 21 11.4927 21H12.5073C12.9943 21 13.2378 21 13.4352 20.9102C13.6019 20.8344 13.7445 20.7142 13.8476 20.5629C13.9696 20.3837 14.011 20.1437 14.0938 19.6637L14.2499 18.7594C14.3055 18.4367 14.3334 18.2754 14.3923 18.1514C14.4502 18.0296 14.4976 17.963 14.5936 17.8684C14.6915 17.772 14.8725 17.6719 15.2344 17.4718C15.2611 17.4571 15.2877 17.4421 15.3141 17.427C15.6604 17.2293 15.8335 17.1304 15.9621 17.0969C16.0884 17.064 16.167 17.0573 16.2971 17.0681C16.4295 17.0791 16.5778 17.1328 16.8744 17.2402L17.888 17.607C18.3372 17.7696 18.5619 17.8509 18.7748 17.8352C18.9547 17.8219 19.1277 17.7603 19.2754 17.6567C19.4502 17.5342 19.5728 17.3291 19.8179 16.919L20.2773 16.1504C20.536 15.7175 20.6654 15.501 20.6877 15.2793C20.7065 15.0921 20.6721 14.9034 20.5885 14.7349C20.4895 14.5353 20.2921 14.3783 19.8974 14.0643L19.1726 13.4879C18.9207 13.2876 18.7948 13.1875 18.7159 13.0801C18.6306 12.9641 18.5942 12.8887 18.5564 12.7497C18.5215 12.6211 18.5215 12.414 18.5215 12C18.5215 11.586 18.5215 11.379 18.5564 11.2504C18.5942 11.1114 18.6306 11.036 18.7159 10.9199C18.7948 10.8126 18.9207 10.7124 19.1725 10.5122L19.8974 9.9357C20.2922 9.62176 20.4896 9.46479 20.5886 9.26517C20.6722 9.09664 20.7065 8.90795 20.6877 8.72076C20.6654 8.49906 20.5361 8.28259 20.2773 7.84964L19.8179 7.08102C19.5728 6.67093 19.4503 6.46588 19.2755 6.34332C19.1277 6.23977 18.9548 6.1781 18.7748 6.16486C18.5619 6.14919 18.3373 6.23048 17.888 6.39307L16.8745 6.75989C16.5778 6.86725 16.4295 6.92093 16.2971 6.93195C16.167 6.94278 16.0884 6.93601 15.9621 6.90313C15.8335 6.86965 15.6604 6.77077 15.3142 6.57302C15.2877 6.55791 15.2611 6.54298 15.2345 6.52822C14.8725 6.3281 14.6915 6.22804 14.5936 6.13166C14.4976 6.03703 14.4502 5.97047 14.3923 5.84869C14.3334 5.72467 14.3055 5.56332 14.2499 5.24064L14.0938 4.3363Z" fill="#0F1729"/>
+</svg>`;
+}
+/**
+ * Close/X icon for modal close button
+ */
+function getCloseIcon() {
+    return `<svg class="cv-modal-close-icon" fill="currentColor" height="20px" viewBox="0 0 256 256" width="20px" xmlns="http://www.w3.org/2000/svg">
+    <path d="M205.66,194.34a8,8,0,0,1-11.32,11.32L128,139.31,61.66,205.66a8,8,0,0,1-11.32-11.32L116.69,128,50.34,61.66A8,8,0,0,1,61.66,50.34L128,116.69l66.34-66.35a8,8,0,0,1,11.32,11.32L139.31,128Z"></path>
+  </svg>`;
+}
+/**
+ * Reset/refresh icon for reset button
+ */
+function getResetIcon() {
+    return `<svg class="cv-btn-icon" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M22.719 12A10.719 10.719 0 0 1 1.28 12h.838a9.916 9.916 0 1 0 1.373-5H8v1H2V2h1v4.2A10.71 10.71 0 0 1 22.719 12z"/><path fill="none" d="M0 0h24v24H0z"/>
+  </svg>`;
+}
+/**
+ * Share icon for share button
+ */
+function getShareIcon() {
+    return `<svg class="cv-btn-icon" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path xmlns="http://www.w3.org/2000/svg" d="M6 11C6 8.17157 6 6.75736 6.87868 5.87868C7.75736 5 9.17157 5 12 5H15C17.8284 5 19.2426 5 20.1213 5.87868C21 6.75736 21 8.17157 21 11V16C21 18.8284 21 20.2426 20.1213 21.1213C19.2426 22 17.8284 22 15 22H12C9.17157 22 7.75736 22 6.87868 21.1213C6 20.2426 6 18.8284 6 16V11Z" stroke="#1C274C" stroke-width="1.5"/>
+  <path xmlns="http://www.w3.org/2000/svg" opacity="0.5" d="M6 19C4.34315 19 3 17.6569 3 16V10C3 6.22876 3 4.34315 4.17157 3.17157C5.34315 2 7.22876 2 11 2H15C16.6569 2 18 3.34315 18 5" stroke="#1C274C" stroke-width="1.5"/>
+</svg>`;
+}
+
 class CustomViewsWidget {
     core;
     container;
@@ -1945,7 +2461,7 @@ class CustomViewsWidget {
             theme: options.theme || 'light',
             showReset: options.showReset ?? true,
             title: options.title || 'Customize View',
-            description: options.description || 'Toggle different content sections to customize your view. Changes are applied instantly and the URL will be updated for sharing.',
+            description: options.description || '',
             showWelcome: options.showWelcome ?? false,
             welcomeTitle: options.welcomeTitle || 'Site Customization',
             welcomeMessage: options.welcomeMessage || 'This site is powered by Custom Views. Use the widget on the side (⚙) to customize your experience. Your preferences will be saved and can be shared via URL.<br><br>Learn more at <a href="https://github.com/customviews-js/customviews" target="_blank">customviews GitHub</a>.',
@@ -2027,21 +2543,24 @@ class CustomViewsWidget {
         this.modal = document.createElement('div');
         this.modal.className = 'cv-widget-modal-overlay';
         this.applyThemeToModal();
-        const toggleControls = toggles.length
-            ? toggles.map(toggle => `
-        <div class="cv-custom-state-toggle">
-          <label>
-            <div class="cv-toggle-switch" data-toggle="${toggle}">
-              <div class="cv-toggle-handle"></div>
-            </div>
-            ${this.formatToggleName(toggle)}
+        const toggleControlsHtml = toggles.map(toggle => `
+      <div class="cv-toggle-card">
+        <div class="cv-toggle-content">
+          <div>
+            <p class="cv-toggle-title">${this.formatToggleName(toggle)}</p>
+          </div>
+          <label class="cv-toggle-label">
+            <input class="cv-toggle-input" type="checkbox" data-toggle="${toggle}"/>
+            <span class="cv-toggle-slider"></span>
           </label>
         </div>
-      `).join('')
-            : `<p class="cv-no-toggles">No configurable sections available.</p>`;
+      </div>
+    `).join('');
+        // Todo: Re-add description if needed (Line 168, add label field to toggles if needed change structure)
+        // <p class="cv-toggle-description">Show or hide the ${this.formatToggleName(toggle).toLowerCase()} area </p>
         // Get tab groups
         const tabGroups = this.core.getTabGroups();
-        let tabGroupsHTML = '';
+        let tabGroupControlsHTML = '';
         // Check if any tab group or tab labels contain Font Awesome shortcodes
         let hasFontAwesomeShortcodes = false;
         if (this.options.showTabGroups && tabGroups && tabGroups.length > 0) {
@@ -2065,47 +2584,81 @@ class CustomViewsWidget {
             ensureFontAwesomeInjected();
         }
         if (this.options.showTabGroups && tabGroups && tabGroups.length > 0) {
-            const tabGroupControls = tabGroups.map(group => {
-                const options = group.tabs.map(tab => `<option value="${tab.id}">${replaceIconShortcodes(tab.label || tab.id)}</option>`).join('');
-                return `
-          <div class="cv-tab-group-control">
-            <label for="tab-group-${group.id}">${replaceIconShortcodes(group.label || group.id)}</label>
-            <select id="tab-group-${group.id}" class="cv-tab-group-select" data-group-id="${group.id}">
-              ${options}
-            </select>
+            tabGroupControlsHTML = `
+        <div class="cv-tabgroup-card cv-tabgroup-header">
+          <div class="cv-tabgroup-row">
+            <div class="cv-tabgroup-info">
+              <p class="cv-tabgroup-title">Navigation Headers</p>
+              <p class="cv-tabgroup-description">Show or hide navigation headers</p>
+            </div>
+            <label class="cv-toggle-switch cv-nav-toggle">
+              <input class="cv-nav-pref-input" type="checkbox" aria-label="Show or hide navigation headers" />
+              <span class="cv-switch-bg"></span>
+              <span class="cv-switch-knob"></span>
+            </label>
           </div>
-        `;
-            }).join('');
-            tabGroupsHTML = `
-        <h4>Tab Groups</h4>
-        <div class="cv-tab-groups">
-          ${tabGroupControls}
+        </div>
+        <div class="cv-tab-groups-list">
+          ${tabGroups.map(group => `
+            <div class="cv-tabgroup-card cv-tabgroup-item">
+              <label class="cv-tabgroup-label" for="tab-group-${group.id}">
+                ${replaceIconShortcodes(group.label || group.id)}
+              </label>
+              <select id="tab-group-${group.id}" class="cv-tabgroup-select" data-group-id="${group.id}">
+                ${group.tabs.map(tab => `<option value="${tab.id}">${replaceIconShortcodes(tab.label || tab.id)}</option>`).join('')}
+              </select>
+            </div>
+          `).join('')}
         </div>
       `;
         }
         this.modal.innerHTML = `
       <div class="cv-widget-modal cv-custom-state-modal">
-        <div class="cv-widget-modal-header">
-          <h3>${this.options.title}</h3>
-          <button class="cv-widget-modal-close" aria-label="Close modal">×</button>
-        </div>
-        <div class="cv-widget-modal-content">
-          <div class="cv-custom-state-form">
-            <p>${this.options.description}</p>
-            
-            <h4>Content Sections</h4>
-            <div class="cv-custom-toggles">
-              ${toggleControls}
+        <header class="cv-modal-header">
+          <div class="cv-modal-header-content">
+            <div class="cv-modal-icon">
+              ${getGearIcon()}
             </div>
-            
-            ${tabGroupsHTML}
-            
-            <div class="cv-custom-state-actions">
-              ${this.options.showReset ? `<button class="cv-custom-state-reset">Reset to Default</button>` : ''}
-              <button class="cv-custom-state-copy-url">Copy Shareable URL</button>
+            <div class="cv-modal-title">${this.options.title}</div>
+          </div>
+          <button class="cv-modal-close" aria-label="Close modal">
+            ${getCloseIcon()}
+          </button>
+        </header>
+        <main class="cv-modal-main">
+          ${this.options.description ? `<p class="cv-modal-description">${this.options.description}</p>` : ''}
+          
+          ${toggles.length ? `
+          <div class="cv-content-section">
+            <div class="cv-section-heading">Toggles</div>
+            <div class="cv-toggles-container">
+              ${toggleControlsHtml}
             </div>
           </div>
-        </div>
+          ` : ''}
+          
+          ${this.options.showTabGroups && tabGroups && tabGroups.length > 0 ? `
+          <div class="cv-content-section">
+            <div class="cv-section-heading">Tab Groups</div>
+            <div class="cv-tabgroups-container">
+              ${tabGroupControlsHTML}
+            </div>
+          </div>
+          ` : ''}
+        </main>
+
+        <footer class="cv-modal-footer">
+          ${this.options.showReset ? `
+          <button class="cv-reset-btn">
+            ${getResetIcon()}
+            <span>Reset to Default</span>
+          </button>
+          ` : ''}
+          <button class="cv-share-btn">
+            ${getShareIcon()}
+            <span>Copy Shareable URL</span>
+          </button>
+        </footer>
       </div>
     `;
         document.body.appendChild(this.modal);
@@ -2120,21 +2673,21 @@ class CustomViewsWidget {
         if (!this.modal)
             return;
         // Close button
-        const closeBtn = this.modal.querySelector('.cv-widget-modal-close');
+        const closeBtn = this.modal.querySelector('.cv-modal-close');
         if (closeBtn) {
             closeBtn.addEventListener('click', () => {
                 this.closeModal();
             });
         }
         // Copy URL button
-        const copyUrlBtn = this.modal.querySelector('.cv-custom-state-copy-url');
+        const copyUrlBtn = this.modal.querySelector('.cv-share-btn');
         if (copyUrlBtn) {
             copyUrlBtn.addEventListener('click', () => {
                 this.copyShareableURL();
             });
         }
         // Reset to default button
-        const resetBtn = this.modal.querySelector('.cv-custom-state-reset');
+        const resetBtn = this.modal.querySelector('.cv-reset-btn');
         if (resetBtn) {
             resetBtn.addEventListener('click', () => {
                 this.core.resetToDefault();
@@ -2142,25 +2695,55 @@ class CustomViewsWidget {
             });
         }
         // Listen to toggle switches
-        const toggleSwitches = this.modal.querySelectorAll('.cv-toggle-switch');
-        toggleSwitches.forEach(toggleSwitch => {
-            toggleSwitch.addEventListener('click', () => {
-                toggleSwitch.classList.toggle('cv-toggle-active');
+        const toggleInputs = this.modal.querySelectorAll('.cv-toggle-input');
+        toggleInputs.forEach(toggleInput => {
+            toggleInput.addEventListener('change', () => {
                 const state = this.getCurrentCustomStateFromModal();
                 this.core.applyState(state);
             });
         });
         // Listen to tab group selects
-        const tabGroupSelects = this.modal.querySelectorAll('.cv-tab-group-select');
+        const tabGroupSelects = this.modal.querySelectorAll('.cv-tabgroup-select');
         tabGroupSelects.forEach(select => {
             select.addEventListener('change', () => {
                 const groupId = select.dataset.groupId;
                 const tabId = select.value;
                 if (groupId && tabId) {
-                    this.core.setActiveTab(groupId, tabId);
+                    // Get current state and update the tab for this group, then apply globally
+                    // This triggers sync behavior and persistence
+                    const currentTabs = this.core.getCurrentActiveTabs();
+                    currentTabs[groupId] = tabId;
+                    // Apply state globally for persistence and sync
+                    const currentToggles = this.core.getCurrentActiveToggles();
+                    const newState = {
+                        toggles: currentToggles,
+                        tabs: currentTabs
+                    };
+                    this.core.applyState(newState);
                 }
             });
         });
+        // Listener for show/hide tab navs
+        const tabNavToggle = this.modal.querySelector('.cv-nav-pref-input');
+        if (tabNavToggle) {
+            tabNavToggle.addEventListener('change', () => {
+                const visible = tabNavToggle.checked;
+                // Persist preference
+                try {
+                    localStorage.setItem('cv-tab-navs-visible', visible ? 'true' : 'false');
+                }
+                catch (e) { /* ignore */ }
+                // Apply to DOM using TabManager via core
+                try {
+                    const rootEl = document.body;
+                    TabManager.setNavsVisibility(rootEl, visible);
+                }
+                catch (e) {
+                    // ignore errors
+                    console.error('Failed to set tab nav visibility:', e);
+                }
+            });
+        }
         // Overlay click to close
         this.modal.addEventListener('click', (e) => {
             if (e.target === this.modal) {
@@ -2198,15 +2781,15 @@ class CustomViewsWidget {
         }
         // Collect toggle values
         const toggles = [];
-        const toggleSwitches = this.modal.querySelectorAll('.cv-toggle-switch');
-        toggleSwitches.forEach(toggleSwitch => {
-            const toggle = toggleSwitch.dataset.toggle;
-            if (toggle && toggleSwitch.classList.contains('cv-toggle-active')) {
+        const toggleInputs = this.modal.querySelectorAll('.cv-toggle-input');
+        toggleInputs.forEach(toggleInput => {
+            const toggle = toggleInput.dataset.toggle;
+            if (toggle && toggleInput.checked) {
                 toggles.push(toggle);
             }
         });
         // Collect tab selections
-        const tabGroupSelects = this.modal.querySelectorAll('.cv-tab-group-select');
+        const tabGroupSelects = this.modal.querySelectorAll('.cv-tabgroup-select');
         const tabs = {};
         tabGroupSelects.forEach(select => {
             const groupId = select.dataset.groupId;
@@ -2238,27 +2821,45 @@ class CustomViewsWidget {
             return;
         // Get currently active toggles (from custom state or default configuration)
         const activeToggles = this.core.getCurrentActiveToggles();
-        // First, deactivate all toggle switches
-        const allToggleSwitches = this.modal.querySelectorAll('.cv-toggle-switch');
-        allToggleSwitches.forEach(toggleSwitch => {
-            toggleSwitch.classList.remove('cv-toggle-active');
+        // First, uncheck all toggle inputs
+        const allToggleInputs = this.modal.querySelectorAll('.cv-toggle-input');
+        allToggleInputs.forEach(toggleInput => {
+            toggleInput.checked = false;
         });
-        // Then activate the ones that should be active
+        // Then check the ones that should be active
         activeToggles.forEach(toggle => {
-            const toggleSwitch = this.modal?.querySelector(`[data-toggle="${toggle}"]`);
-            if (toggleSwitch) {
-                toggleSwitch.classList.add('cv-toggle-active');
+            const toggleInput = this.modal?.querySelector(`[data-toggle="${toggle}"]`);
+            if (toggleInput) {
+                toggleInput.checked = true;
             }
         });
         // Load tab group selections
         const activeTabs = this.core.getCurrentActiveTabs();
-        const tabGroupSelects = this.modal.querySelectorAll('.cv-tab-group-select');
+        const tabGroupSelects = this.modal.querySelectorAll('.cv-tab-groupselect');
         tabGroupSelects.forEach(select => {
             const groupId = select.dataset.groupId;
             if (groupId && activeTabs[groupId]) {
                 select.value = activeTabs[groupId];
             }
         });
+        // Load tab nav visibility preference
+        const navPref = (() => {
+            try {
+                const raw = localStorage.getItem('cv-tab-navs-visible');
+                if (raw === null)
+                    return TabManager.areNavsVisible(document.body);
+                return raw === 'true';
+            }
+            catch (e) {
+                return TabManager.areNavsVisible(document.body);
+            }
+        })();
+        const tabNavToggle = this.modal.querySelector('.cv-nav-pref-input');
+        if (tabNavToggle) {
+            tabNavToggle.checked = navPref;
+            // Ensure UI matches actual visibility
+            TabManager.setNavsVisibility(document.body, navPref);
+        }
     }
     /**
      * Format toggle name for display
@@ -2294,21 +2895,25 @@ class CustomViewsWidget {
         this.applyThemeToModal();
         this.modal.innerHTML = `
       <div class="cv-widget-modal cv-welcome-modal">
-        <div class="cv-widget-modal-header">
-          <h3>${this.options.welcomeTitle}</h3>
-          <button class="cv-widget-modal-close" aria-label="Close modal">×</button>
-        </div>
-        <div class="cv-widget-modal-content">
-          <div class="cv-welcome-content">
-            <p style="text-align: justify;">${this.options.welcomeMessage}</p>
-            
-            <div class="cv-welcome-widget-preview">
-              <div class="cv-welcome-widget-icon">⚙</div>
-              <p class="cv-welcome-widget-label">Look for this widget on the side of the screen</p>
+        <header class="cv-modal-header">
+          <div class="cv-modal-header-content">
+            <div class="cv-modal-icon">
+              ${getGearIcon()}
+            </div>
+            <h1 class="cv-modal-title">${this.options.welcomeTitle}</h1>
+          </div>
+        </header>
+        <div class="cv-modal-main">
+          <p class="cv-welcome-message">${this.options.welcomeMessage}</p>
+          
+          <div class="cv-welcome-widget-preview">
+            <div class="cv-welcome-widget-icon">
+              ${getGearIcon()}
             </div>
-            
-            <button class="cv-welcome-got-it">Got it!</button>
+            <p class="cv-welcome-widget-label">Look for this widget</p>
           </div>
+          
+          <button class="cv-welcome-got-it">Got it!</button>
         </div>
       </div>
     `;
@@ -2321,13 +2926,6 @@ class CustomViewsWidget {
     attachWelcomeModalEventListeners() {
         if (!this.modal)
             return;
-        // Close button
-        const closeBtn = this.modal.querySelector('.cv-widget-modal-close');
-        if (closeBtn) {
-            closeBtn.addEventListener('click', () => {
-                this.closeModal();
-            });
-        }
         // Got it button
         const gotItBtn = this.modal.querySelector('.cv-welcome-got-it');
         if (gotItBtn) {