diff --git a/.gitignore b/.gitignore
index 6fad4cde..05e2a5ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ nul
 /artifacts/tmp
 scripts/agent.json
 scripts/me.json
+.github/instructions/python-venv-path.instructions.md
\ No newline at end of file
diff --git a/application/single_app/app.py b/application/single_app/app.py
index c1afa7c6..42213365 100644
--- a/application/single_app/app.py
+++ b/application/single_app/app.py
@@ -952,8 +952,9 @@ def list_semantic_kernel_plugins():
 # ------------------- API Thoughts Routes ----------------
 register_route_backend_thoughts(app)
 
-# ------------------- Extenral Health Routes ----------
+# ------------------- External Health Routes ----------
 register_route_external_health(app)
+register_no_auth_health(app)
 
 if __name__ == '__main__':
     debug_mode = os.environ.get("FLASK_DEBUG", "0") == "1"
diff --git a/application/single_app/config.py b/application/single_app/config.py
index 7958b14a..f1672023 100644
--- a/application/single_app/config.py
+++ b/application/single_app/config.py
@@ -115,6 +115,7 @@
         #"font-src 'self' https://cdn.jsdelivr.net https://stackpath.bootstrapcdn.com; "
         "connect-src 'self' https: wss: ws:; "
         "media-src 'self' blob:; "
+        "frame-src 'self' blob:; "
         "object-src 'none'; "
         "frame-ancestors 'self'; "
         "base-uri 'self';"
diff --git a/application/single_app/functions_activity_logging.py b/application/single_app/functions_activity_logging.py
index f5337562..92c78dfb 100644
--- a/application/single_app/functions_activity_logging.py
+++ b/application/single_app/functions_activity_logging.py
@@ -14,6 +14,24 @@
 from config import cosmos_activity_logs_container
 
 
+def coerce_activity_log_user_id(user_id: Any) -> str:
+    """Extract a stable string user id from a scalar or session-style identity payload."""
+    if user_id is None:
+        return ''
+
+    if isinstance(user_id, str):
+        return user_id.strip()
+
+    if isinstance(user_id, dict):
+        for key in ('oid', 'sub', 'id', 'user_id'):
+            candidate = user_id.get(key)
+            if isinstance(candidate, str) and candidate.strip():
+                return candidate.strip()
+        return ''
+
+    return str(user_id).strip()
+
+
 USER_LOGIN_ACTIVITY_SESSION_KEY = 'last_user_login_activity_epoch'
 USER_LOGIN_ACTIVITY_MIN_INTERVAL_SECONDS = 15 * 60
 
@@ -1725,14 +1743,15 @@ def log_general_admin_action(
     """
 
     try:
+        normalized_admin_user_id = coerce_activity_log_user_id(admin_user_id)
         activity_record = {
             'id': str(uuid.uuid4()),
-            'user_id': admin_user_id,
+            'user_id': normalized_admin_user_id,
             'activity_type': 'admin_action',
             'timestamp': datetime.utcnow().isoformat(),
             'created_at': datetime.utcnow().isoformat(),
             'admin': {
-                'user_id': admin_user_id,
+                'user_id': normalized_admin_user_id,
                 'email': admin_email
             },
             'action': action,
@@ -1759,7 +1778,7 @@ def log_general_admin_action(
         log_event(
             message=f"Error logging admin action: {str(e)}",
             extra={
-                'admin_user_id': admin_user_id,
+                'admin_user_id': normalized_admin_user_id,
                 'admin_email': admin_email,
                 'action': action,
                 'error': str(e)
diff --git a/application/single_app/functions_appinsights.py b/application/single_app/functions_appinsights.py
index c81d17f9..14c013ce 100644
--- a/application/single_app/functions_appinsights.py
+++ b/application/single_app/functions_appinsights.py
@@ -75,18 +75,60 @@ def is_debug_enabled() -> bool:
     return bool(settings.get('enable_debug_logging', False))
 
 
+def _get_appinsights_debug_logger() -> Optional[logging.Logger]:
+    """Return a logger that can emit DEBUG traces without widening parent logger levels."""
+    base_logger = get_appinsights_logger()
+    if not base_logger:
+        return None
+
+    base_name = base_logger.name or 'root'
+    debug_logger_name = 'appinsights.debug' if base_name == 'root' else f"{base_name}.debug"
+    debug_logger = logging.getLogger(debug_logger_name)
+    debug_logger.setLevel(logging.DEBUG)
+    return debug_logger
+
+
+def _emit_appinsights_debug_trace(
+    message: str,
+    category: str,
+    details: Optional[Dict[str, Any]] = None,
+) -> None:
+    """Send a tagged debug trace to App Insights when Azure Monitor logging is configured."""
+    if not _azure_monitor_configured:
+        return
+
+    debug_logger = _get_appinsights_debug_logger()
+    if not debug_logger:
+        return
+
+    trace_properties = dict(details or {})
+    trace_properties.setdefault('debug_tag', '[debug]')
+    trace_properties.setdefault('debug_category', category)
+    trace_message = f"[debug] [{category}] {message}"
+
+    try:
+        # Use a child logger so DEBUG traces can flow to App Insights even when the
+        # parent logger stays at INFO to avoid broad third-party debug noise.
+        if trace_properties:
+            debug_logger.debug(trace_message, extra=trace_properties, stacklevel=3)
+        else:
+            debug_logger.debug(trace_message, stacklevel=3)
+    except Exception:
+        pass
+
+
 def debug_print(message: Any, *args: Any, category: str = "INFO", **kwargs: Any) -> None:
-    """Emit a debug-only console message using the unified logging implementation."""
+    """Emit debug-only console output and forward a tagged App Insights trace when available."""
     flush = kwargs.pop('flush', False)
     details = kwargs or None
-    log_event(
-        message,
-        extra=details,
-        debug_only=True,
-        category=category,
-        flush=flush,
-        message_args=args,
-    )
+    formatted_message = _format_message(message, args)
+    settings = _load_logging_settings()
+
+    _emit_debug_message(settings, formatted_message, category, flush, details)
+    if not settings.get('enable_debug_logging', False):
+        return
+
+    _emit_appinsights_debug_trace(formatted_message, category, details)
 
 
 def get_appinsights_logger():
diff --git a/application/single_app/functions_settings.py b/application/single_app/functions_settings.py
index 304660f4..0091d0a3 100644
--- a/application/single_app/functions_settings.py
+++ b/application/single_app/functions_settings.py
@@ -70,7 +70,8 @@ def get_settings(use_cosmos=False, include_source=False):
     import secrets
     default_settings = {
         # External health check
-        'enable_external_healthcheck': True,
+        'enable_external_healthcheck': False,
+        'enable_no_auth_external_healthcheck': False,
         # Security settings
         'enable_appinsights_global_logging': False,
         'enable_debug_logging': False,
@@ -390,8 +391,6 @@ def get_settings(use_cosmos=False, include_source=False):
         'file_timer_value': 1,
         'file_timer_unit': 'hours',
         'file_processing_logs_turnoff_time': None,
-        'enable_external_healthcheck': False,
-        
         # Streaming settings
         'streamingEnabled': True,
         
diff --git a/application/single_app/requirements.txt b/application/single_app/requirements.txt
index 48aa0877..ec681756 100644
--- a/application/single_app/requirements.txt
+++ b/application/single_app/requirements.txt
@@ -56,4 +56,4 @@ pyyaml==6.0.2
 aiohttp==3.13.4
 html2text==2025.4.15
 matplotlib==3.10.7
-azure-cognitiveservices-speech==1.47.0
\ No newline at end of file
+azure-cognitiveservices-speech==1.48.2
\ No newline at end of file
diff --git a/application/single_app/route_backend_control_center.py b/application/single_app/route_backend_control_center.py
index b74508ac..a6df9289 100644
--- a/application/single_app/route_backend_control_center.py
+++ b/application/single_app/route_backend_control_center.py
@@ -1,5 +1,13 @@
 # route_backend_control_center.py
 
+import csv
+import logging
+import math
+import time
+from io import StringIO
+
+from flask import make_response
+
 from config import *
 from functions_authentication import *
 from functions_settings import *
@@ -15,6 +23,10 @@
 from functions_debug import debug_print
 
 
+ACTIVITY_LOGS_DEFAULT_PER_PAGE = 50
+ACTIVITY_LOGS_MAX_PER_PAGE = 200
+
+
 def normalize_token_filter_value(value):
     """Normalize optional token filter values from query params or request JSON."""
     if value is None:
@@ -125,6 +137,284 @@ def get_distinct_token_filter_values(query):
         debug_print(f"[Token Filters] Error loading distinct values: {ex}")
         return []
 
+
+def validate_activity_logs_pagination(request_args):
+    """Validate pagination parameters for the interactive activity logs API."""
+    page_raw = request_args.get('page', 1)
+    per_page_raw = request_args.get('per_page', ACTIVITY_LOGS_DEFAULT_PER_PAGE)
+
+    try:
+        page = int(page_raw)
+        per_page = int(per_page_raw)
+    except (TypeError, ValueError) as ex:
+        raise ValueError('page and per_page must be integers.') from ex
+
+    if page < 1:
+        raise ValueError('page must be greater than or equal to 1.')
+
+    if per_page < 1:
+        raise ValueError('per_page must be greater than or equal to 1.')
+
+    if per_page > ACTIVITY_LOGS_MAX_PER_PAGE:
+        raise ValueError(
+            f'per_page must be less than or equal to {ACTIVITY_LOGS_MAX_PER_PAGE} for activity log browsing.'
+        )
+
+    return page, per_page
+
+
+def build_activity_logs_query_context(activity_type_filter='all', search_term=''):
+    """Build the shared Cosmos WHERE clause and parameters for activity log queries."""
+    query_conditions = []
+    parameters = []
+
+    if activity_type_filter and activity_type_filter != 'all':
+        query_conditions.append("c.activity_type = @activity_type")
+        parameters.append({"name": "@activity_type", "value": activity_type_filter})
+
+    normalized_search_term = (search_term or '').strip().lower()
+    if normalized_search_term:
+        query_conditions.append(
+            "(" + " OR ".join([
+                "(IS_DEFINED(c.activity_type) AND CONTAINS(LOWER(c.activity_type), @activity_search_term))",
+                "(IS_DEFINED(c.user_id) AND CONTAINS(LOWER(c.user_id), @activity_search_term))",
+                "(IS_DEFINED(c.admin_email) AND CONTAINS(LOWER(c.admin_email), @activity_search_term))",
+                "(IS_DEFINED(c.requester_email) AND CONTAINS(LOWER(c.requester_email), @activity_search_term))",
+                "(IS_DEFINED(c.added_by_email) AND CONTAINS(LOWER(c.added_by_email), @activity_search_term))",
+                "(IS_DEFINED(c.approver_email) AND CONTAINS(LOWER(c.approver_email), @activity_search_term))",
+                "(IS_DEFINED(c.member_email) AND CONTAINS(LOWER(c.member_email), @activity_search_term))",
+                "(IS_DEFINED(c.member_name) AND CONTAINS(LOWER(c.member_name), @activity_search_term))",
+                "(IS_DEFINED(c.group_name) AND CONTAINS(LOWER(c.group_name), @activity_search_term))",
+                "(IS_DEFINED(c.workspace_name) AND CONTAINS(LOWER(c.workspace_name), @activity_search_term))",
+                "(IS_DEFINED(c.public_workspace_name) AND CONTAINS(LOWER(c.public_workspace_name), @activity_search_term))",
+                "(IS_DEFINED(c.login_method) AND CONTAINS(LOWER(c.login_method), @activity_search_term))",
+                "(IS_DEFINED(c.token_type) AND CONTAINS(LOWER(c.token_type), @activity_search_term))",
+                "(IS_DEFINED(c.workspace_type) AND CONTAINS(LOWER(c.workspace_type), @activity_search_term))",
+                "(IS_DEFINED(c.description) AND CONTAINS(LOWER(c.description), @activity_search_term))",
+                "(IS_DEFINED(c.conversation.title) AND CONTAINS(LOWER(c.conversation.title), @activity_search_term))",
+                "(IS_DEFINED(c.document.file_name) AND CONTAINS(LOWER(c.document.file_name), @activity_search_term))",
+                "(IS_DEFINED(c.usage.model) AND CONTAINS(LOWER(c.usage.model), @activity_search_term))",
+                "(IS_DEFINED(c.workspace_context.group_id) AND CONTAINS(LOWER(c.workspace_context.group_id), @activity_search_term))",
+                "(IS_DEFINED(c.workspace_context.public_workspace_id) AND CONTAINS(LOWER(c.workspace_context.public_workspace_id), @activity_search_term))"
+            ]) + ")"
+        )
+        parameters.append({"name": "@activity_search_term", "value": normalized_search_term})
+
+    where_clause = " WHERE " + " AND ".join(query_conditions) if query_conditions else ""
+    return where_clause, parameters
+
+
+def normalize_activity_log_value(value):
+    """Recursively coerce Cosmos activity log values into JSON-safe data."""
+    if value is None or isinstance(value, (str, bool, int)):
+        return value
+
+    if isinstance(value, float):
+        if math.isnan(value) or math.isinf(value):
+            return None
+        return value
+
+    if isinstance(value, datetime):
+        return value.isoformat()
+
+    if isinstance(value, bytes):
+        return value.decode('utf-8', errors='replace')
+
+    if isinstance(value, dict):
+        return {
+            str(key): normalize_activity_log_value(nested_value)
+            for key, nested_value in value.items()
+        }
+
+    if isinstance(value, (list, tuple, set)):
+        return [normalize_activity_log_value(item) for item in value]
+
+    return str(value)
+
+
+def normalize_activity_log_record(log_record):
+    """Return a browser-safe activity log document with stable core fields."""
+    normalized_record = normalize_activity_log_value(log_record)
+    if not isinstance(normalized_record, dict):
+        normalized_record = {'raw_value': normalized_record}
+
+    for field_name in ('user_id', 'admin_user_id', 'added_by_user_id'):
+        if field_name in normalized_record:
+            normalized_record[field_name] = coerce_activity_log_user_id(normalized_record.get(field_name))
+
+    admin_payload = normalized_record.get('admin')
+    if isinstance(admin_payload, dict):
+        admin_payload['user_id'] = coerce_activity_log_user_id(admin_payload.get('user_id'))
+        if not normalized_record.get('user_id') and admin_payload.get('user_id'):
+            normalized_record['user_id'] = admin_payload.get('user_id')
+
+    normalized_record.setdefault('id', '')
+    normalized_record.setdefault('activity_type', 'unknown')
+    normalized_record.setdefault('timestamp', '')
+    normalized_record.setdefault('workspace_type', '')
+    return normalized_record
+
+
+def get_activity_log_user_details(user_id, user_cache):
+    """Resolve a user display payload once and reuse it across pagination or export."""
+    user_id = coerce_activity_log_user_id(user_id)
+    if not user_id:
+        return {'email': '', 'display_name': ''}
+
+    if user_id in user_cache:
+        return user_cache[user_id]
+
+    try:
+        user_doc = cosmos_user_settings_container.read_item(item=user_id, partition_key=user_id)
+        user_cache[user_id] = {
+            'email': user_doc.get('email', ''),
+            'display_name': user_doc.get('display_name', '')
+        }
+    except Exception as ex:
+        user_cache[user_id] = {'email': '', 'display_name': ''}
+        log_event(
+            '[ControlCenter][ActivityLogs] Failed to resolve activity log user details.',
+            extra={
+                'activity_log_user_id': user_id,
+                'error_type': type(ex).__name__
+            },
+            debug_only=True,
+            category='CONTROL_CENTER'
+        )
+
+    return user_cache[user_id]
+
+
+def build_activity_log_user_map(logs):
+    """Build a user map keyed by user_id for the current activity log payload."""
+    user_cache = {}
+    for log_record in logs:
+        user_id = (
+            log_record.get('user_id')
+            or (log_record.get('admin') or {}).get('user_id')
+            or log_record.get('admin_user_id')
+            or log_record.get('added_by_user_id')
+        )
+        user_id = coerce_activity_log_user_id(user_id)
+        if user_id:
+            get_activity_log_user_details(user_id, user_cache)
+    return user_cache
+
+
+def format_activity_log_details_for_csv(log_record):
+    """Format activity log details as a plain string suitable for CSV export."""
+    activity_type = log_record.get('activity_type', '')
+
+    if activity_type == 'user_login':
+        return f"Login method: {log_record.get('login_method') or log_record.get('details', {}).get('login_method', 'N/A')}"
+
+    if activity_type == 'conversation_creation':
+        conversation = log_record.get('conversation', {})
+        return f"Title: {conversation.get('title', 'Untitled')}, ID: {conversation.get('conversation_id', 'N/A')}"
+
+    if activity_type == 'conversation_deletion':
+        conversation = log_record.get('conversation', {})
+        return f"Deleted: {conversation.get('title', 'Untitled')}, ID: {conversation.get('conversation_id', 'N/A')}"
+
+    if activity_type == 'conversation_archival':
+        conversation = log_record.get('conversation', {})
+        return f"Archived: {conversation.get('title', 'Untitled')}, ID: {conversation.get('conversation_id', 'N/A')}"
+
+    if activity_type == 'document_creation':
+        document = log_record.get('document', {})
+        return f"File: {document.get('file_name', 'Unknown')}, Type: {document.get('file_type', '')}"
+
+    if activity_type == 'document_deletion':
+        document = log_record.get('document', {})
+        return f"Deleted: {document.get('file_name', 'Unknown')}, Type: {document.get('file_type', '')}"
+
+    if activity_type == 'document_metadata_update':
+        updated_fields = ', '.join((log_record.get('updated_fields') or {}).keys()) or 'N/A'
+        document = log_record.get('document', {})
+        return f"File: {document.get('file_name', 'Unknown')}, Updated: {updated_fields}"
+
+    if activity_type == 'token_usage':
+        usage = log_record.get('usage', {})
+        scope_details = []
+        workspace_type = log_record.get('workspace_type')
+        if workspace_type:
+            scope_details.append(f"Workspace: {workspace_type}")
+        workspace_context = log_record.get('workspace_context', {})
+        if workspace_context.get('group_id'):
+            scope_details.append(f"Group: {workspace_context.get('group_id')}")
+        if workspace_context.get('public_workspace_id'):
+            scope_details.append(f"Public Workspace: {workspace_context.get('public_workspace_id')}")
+        scope_suffix = f"; {' | '.join(scope_details)}" if scope_details else ''
+        return (
+            f"Type: {log_record.get('token_type', 'unknown')}, "
+            f"Tokens: {usage.get('total_tokens', 0)}, "
+            f"Model: {usage.get('model', 'N/A')}{scope_suffix}"
+        )
+
+    if activity_type in {'group_status_change', 'public_workspace_status_change'}:
+        status_change = log_record.get('status_change', {})
+        entity_name = (
+            log_record.get('group', {}).get('group_name')
+            or log_record.get('public_workspace', {}).get('workspace_name')
+            or log_record.get('workspace_context', {}).get('public_workspace_name')
+            or log_record.get('group_name')
+            or log_record.get('workspace_name')
+            or log_record.get('public_workspace_name')
+            or 'Unknown'
+        )
+        return (
+            f"Name: {entity_name}, "
+            f"Status: {status_change.get('old_status', 'N/A')} -> {status_change.get('new_status', 'N/A')}"
+        )
+
+    if activity_type in {
+        'group_member_deleted',
+        'add_member_directly',
+        'admin_add_member_csv',
+        'add_workspace_member_directly',
+        'admin_add_workspace_member_csv'
+    }:
+        member_name = (
+            log_record.get('member_name')
+            or log_record.get('removed_member', {}).get('name')
+            or log_record.get('removed_member', {}).get('email')
+            or log_record.get('member_email')
+            or 'Unknown'
+        )
+        target_name = (
+            log_record.get('group_name')
+            or log_record.get('group', {}).get('group_name')
+            or log_record.get('workspace_name')
+            or log_record.get('public_workspace_name')
+            or 'Unknown'
+        )
+        role = log_record.get('member_role', '')
+        role_suffix = f" ({role})" if role else ''
+        return f"Member: {member_name}, Target: {target_name}{role_suffix}"
+
+    if activity_type in {
+        'admin_take_ownership_approved',
+        'transfer_ownership_approved',
+        'delete_group_approved',
+        'delete_all_documents_approved',
+        'admin_take_workspace_ownership_approved',
+        'transfer_workspace_ownership_approved',
+        'delete_workspace_documents_approved',
+        'delete_workspace_approved'
+    }:
+        return log_record.get('description') or 'Administrative approval activity'
+
+    return log_record.get('description') or 'N/A'
+
+
+def create_activity_log_csv_response(csv_content):
+    """Create a CSV download response for activity log exports."""
+    timestamp = datetime.utcnow().strftime('%Y%m%d_%H%M%S')
+    response = make_response(csv_content)
+    response.headers['Content-Type'] = 'text/csv; charset=utf-8'
+    response.headers['Content-Disposition'] = f'attachment; filename="activity_logs_{timestamp}.csv"'
+    return response
+
 def enhance_user_with_activity(user, force_refresh=False):
     """
     Enhance user data with activity information and computed fields.
@@ -5751,103 +6041,80 @@ def api_get_activity_logs():
         Supports search and filtering by activity type.
         """
         try:
-            # Get query parameters
-            page = int(request.args.get('page', 1))
-            per_page = int(request.args.get('per_page', 50))
+            page, per_page = validate_activity_logs_pagination(request.args)
             search_term = request.args.get('search', '').strip().lower()
             activity_type_filter = request.args.get('activity_type_filter', 'all').strip()
-            
-            # Build query conditions
-            query_conditions = []
-            parameters = []
-            
-            # Filter by activity type if not 'all'
-            if activity_type_filter and activity_type_filter != 'all':
-                query_conditions.append("c.activity_type = @activity_type")
-                parameters.append({"name": "@activity_type", "value": activity_type_filter})
-            
-            # Build WHERE clause (empty if no conditions)
-            where_clause = " WHERE " + " AND ".join(query_conditions) if query_conditions else ""
-            
-            # Get total count for pagination
+
+            request_started = time.perf_counter()
+            where_clause, parameters = build_activity_logs_query_context(activity_type_filter, search_term)
+
+            log_event(
+                '[ControlCenter][ActivityLogs] Loading activity logs page.',
+                extra={
+                    'page': page,
+                    'per_page': per_page,
+                    'has_search': bool(search_term),
+                    'search_length': len(search_term),
+                    'activity_type_filter': activity_type_filter or 'all'
+                },
+                debug_only=True,
+                category='CONTROL_CENTER'
+            )
+
+            count_started = time.perf_counter()
             count_query = f"SELECT VALUE COUNT(1) FROM c{where_clause}"
             total_items_result = list(cosmos_activity_logs_container.query_items(
                 query=count_query,
                 parameters=parameters,
                 enable_cross_partition_query=True
             ))
+            count_duration_ms = int((time.perf_counter() - count_started) * 1000)
             total_items = total_items_result[0] if total_items_result and isinstance(total_items_result[0], int) else 0
-            
-            # Calculate pagination
-            offset = (page - 1) * per_page
+
             total_pages = (total_items + per_page - 1) // per_page if total_items > 0 else 1
-            
-            # Get paginated results
+            offset = (page - 1) * per_page
             logs_query = f"""
                 SELECT * FROM c{where_clause}
                 ORDER BY c.timestamp DESC
                 OFFSET {offset} LIMIT {per_page}
             """
-            
-            debug_print(f"Activity logs query: {logs_query}")
-            debug_print(f"Query parameters: {parameters}")
-            
-            logs = list(cosmos_activity_logs_container.query_items(
-                query=logs_query,
-                parameters=parameters,
-                enable_cross_partition_query=True
-            ))
-            
-            # Apply search filter in Python (after fetching from Cosmos)
-            if search_term:
-                filtered_logs = []
-                for log in logs:
-                    # Search in various fields
-                    usage = log.get('usage', {})
-                    workspace_context = log.get('workspace_context', {})
-                    searchable_text = ' '.join([
-                        str(log.get('activity_type', '')),
-                        str(log.get('user_id', '')),
-                        str(log.get('login_method', '')),
-                        str(log.get('conversation', {}).get('title', '')),
-                        str(log.get('document', {}).get('file_name', '')),
-                        str(log.get('token_type', '')),
-                        str(log.get('workspace_type', '')),
-                        str(usage.get('model', '')),
-                        str(workspace_context.get('group_id', '')),
-                        str(workspace_context.get('public_workspace_id', ''))
-                    ]).lower()
-                    
-                    if search_term in searchable_text:
-                        filtered_logs.append(log)
-                
-                logs = filtered_logs
-                # Recalculate total_items for filtered results
-                total_items = len(logs)
-                total_pages = (total_items + per_page - 1) // per_page if total_items > 0 else 1
-            
-            # Get unique user IDs from logs
-            user_ids = set(log.get('user_id') for log in logs if log.get('user_id'))
-            
-            # Fetch user information for display names/emails
-            user_map = {}
-            if user_ids:
-                for user_id in user_ids:
-                    try:
-                        user_doc = cosmos_user_settings_container.read_item(
-                            item=user_id,
-                            partition_key=user_id
-                        )
-                        user_map[user_id] = {
-                            'email': user_doc.get('email', ''),
-                            'display_name': user_doc.get('display_name', '')
-                        }
-                    except Exception as ex:
-                        user_map[user_id] = {
-                            'email': '',
-                            'display_name': ''
-                        }
-            
+
+            query_started = time.perf_counter()
+            logs = [
+                normalize_activity_log_record(log_record)
+                for log_record in cosmos_activity_logs_container.query_items(
+                    query=logs_query,
+                    parameters=parameters,
+                    enable_cross_partition_query=True
+                )
+            ]
+            query_duration_ms = int((time.perf_counter() - query_started) * 1000)
+
+            user_lookup_started = time.perf_counter()
+            user_map = build_activity_log_user_map(logs)
+            user_lookup_duration_ms = int((time.perf_counter() - user_lookup_started) * 1000)
+            total_duration_ms = int((time.perf_counter() - request_started) * 1000)
+
+            log_event(
+                '[ControlCenter][ActivityLogs] Activity logs page loaded.',
+                extra={
+                    'page': page,
+                    'per_page': per_page,
+                    'returned_items': len(logs),
+                    'total_items': total_items,
+                    'total_pages': total_pages,
+                    'unique_user_count': len(user_map),
+                    'count_duration_ms': count_duration_ms,
+                    'query_duration_ms': query_duration_ms,
+                    'user_lookup_duration_ms': user_lookup_duration_ms,
+                    'total_duration_ms': total_duration_ms,
+                    'has_search': bool(search_term),
+                    'activity_type_filter': activity_type_filter or 'all'
+                },
+                debug_only=True,
+                category='CONTROL_CENTER'
+            )
+
             return jsonify({
                 'logs': logs,
                 'user_map': user_map,
@@ -5860,13 +6127,127 @@ def api_get_activity_logs():
                     'has_next': page < total_pages
                 }
             }), 200
-            
-        except Exception as e:
-            debug_print(f"Error getting activity logs: {e}")
-            import traceback
-            traceback.print_exc()
+
+        except ValueError as ex:
+            log_event(
+                '[ControlCenter][ActivityLogs] Invalid activity logs request.',
+                extra={
+                    'page': request.args.get('page'),
+                    'per_page': request.args.get('per_page'),
+                    'error_message': str(ex)
+                },
+                level=logging.WARNING
+            )
+            return jsonify({'error': str(ex)}), 400
+
+        except Exception as ex:
+            log_event(
+                '[ControlCenter][ActivityLogs] Failed to fetch activity logs.',
+                extra={
+                    'page': request.args.get('page'),
+                    'per_page': request.args.get('per_page'),
+                    'search': request.args.get('search', ''),
+                    'activity_type_filter': request.args.get('activity_type_filter', 'all'),
+                    'error_type': type(ex).__name__,
+                    'error_message': str(ex)
+                },
+                level=logging.ERROR,
+                exceptionTraceback=True
+            )
             return jsonify({'error': 'Failed to fetch activity logs'}), 500
 
+    @app.route('/api/admin/control-center/activity-logs/export', methods=['GET'])
+    @swagger_route(security=get_auth_security())
+    @login_required
+    @control_center_required('admin')
+    def api_export_activity_logs():
+        """Export all matching activity logs as CSV without relying on the paged JSON endpoint."""
+        try:
+            search_term = request.args.get('search', '').strip().lower()
+            activity_type_filter = request.args.get('activity_type_filter', 'all').strip()
+            export_started = time.perf_counter()
+            where_clause, parameters = build_activity_logs_query_context(activity_type_filter, search_term)
+
+            log_event(
+                '[ControlCenter][ActivityLogs] Starting activity log export.',
+                extra={
+                    'has_search': bool(search_term),
+                    'search_length': len(search_term),
+                    'activity_type_filter': activity_type_filter or 'all'
+                },
+                debug_only=True,
+                category='CONTROL_CENTER'
+            )
+
+            logs_query = f"""
+                SELECT * FROM c{where_clause}
+                ORDER BY c.timestamp DESC
+            """
+
+            output = StringIO()
+            writer = csv.writer(output)
+            writer.writerow(['Timestamp', 'Activity Type', 'User ID', 'User Email', 'User Name', 'Details', 'Workspace Type'])
+
+            exported_count = 0
+            user_cache = {}
+            for log_record in cosmos_activity_logs_container.query_items(
+                query=logs_query,
+                parameters=parameters,
+                enable_cross_partition_query=True
+            ):
+                normalized_log = normalize_activity_log_record(log_record)
+                resolved_user_id = (
+                    normalized_log.get('user_id')
+                    or normalized_log.get('admin_user_id')
+                    or normalized_log.get('added_by_user_id')
+                    or ''
+                )
+                user_details = get_activity_log_user_details(resolved_user_id, user_cache)
+                writer.writerow([
+                    normalized_log.get('timestamp', ''),
+                    normalized_log.get('activity_type', ''),
+                    resolved_user_id,
+                    user_details.get('email')
+                    or normalized_log.get('admin_email')
+                    or normalized_log.get('requester_email')
+                    or normalized_log.get('added_by_email')
+                    or normalized_log.get('member_email', ''),
+                    user_details.get('display_name') or normalized_log.get('member_name', ''),
+                    format_activity_log_details_for_csv(normalized_log),
+                    normalized_log.get('workspace_type', '')
+                ])
+                exported_count += 1
+
+            export_duration_ms = int((time.perf_counter() - export_started) * 1000)
+            log_event(
+                '[ControlCenter][ActivityLogs] Activity log export completed.',
+                extra={
+                    'exported_count': exported_count,
+                    'unique_user_count': len(user_cache),
+                    'duration_ms': export_duration_ms,
+                    'has_search': bool(search_term),
+                    'activity_type_filter': activity_type_filter or 'all'
+                },
+                debug_only=True,
+                category='CONTROL_CENTER'
+            )
+
+            return create_activity_log_csv_response(output.getvalue())
+
+        except Exception as ex:
+            log_event(
+                '[ControlCenter][ActivityLogs] Failed to export activity logs.',
+                extra={
+                    'search': request.args.get('search', ''),
+                    'activity_type_filter': request.args.get('activity_type_filter', 'all'),
+                    'error_type': type(ex).__name__,
+                    'error_message': str(ex)
+                },
+                level=logging.ERROR,
+                exceptionTraceback=True
+            )
+            return jsonify({'error': 'Failed to export activity logs'}), 500
+
     # ============================================================================
     # APPROVAL WORKFLOW ENDPOINTS
     # ============================================================================
diff --git a/application/single_app/route_enhanced_citations.py b/application/single_app/route_enhanced_citations.py
index ca1b9e48..b3c90f96 100644
--- a/application/single_app/route_enhanced_citations.py
+++ b/application/single_app/route_enhanced_citations.py
@@ -3,16 +3,19 @@
 
 from flask import jsonify, request, Response
 from datetime import datetime, timedelta
+import logging
 import os
 import tempfile
 import requests
 import mimetypes
 import io
 import pandas
+import fitz
 
 from functions_authentication import login_required, user_required, get_current_user_id
+from functions_appinsights import log_event
 from functions_settings import get_settings, enabled_required
-from functions_documents import get_document_metadata
+from functions_documents import get_document_metadata, get_document_blob_storage_info
 from functions_group import get_user_groups
 from functions_public_workspaces import get_user_visible_public_workspace_ids_from_settings
 from swagger_wrapper import swagger_route, get_auth_security
@@ -62,6 +65,28 @@ def _serialize_tabular_preview_table(df_preview):
     ]
     return columns, rows
 
+
+def _log_enhanced_citations_debug(message, **details):
+    """Write debug-gated enhanced citations diagnostics."""
+    log_event(
+        f"[EnhancedCitations] {message}",
+        extra=details or None,
+        debug_only=True,
+        category="EnhancedCitations",
+    )
+
+
+def _log_enhanced_citations_error(message, error, **details):
+    """Write structured error diagnostics for enhanced citations failures."""
+    error_details = dict(details)
+    error_details["error"] = str(error)
+    log_event(
+        f"[EnhancedCitations] {message}",
+        extra=error_details,
+        level=logging.ERROR,
+        exceptionTraceback=True,
+    )
+
 def register_enhanced_citations_routes(app):
     """Register enhanced citations routes"""
 
@@ -234,7 +259,13 @@ def get_enhanced_citation_pdf():
         if not doc_id:
             return jsonify({"error": "doc_id is required"}), 400
 
-        debug_print(f"Enhanced citations PDF request - doc_id: {doc_id}, page: {page_number}, show_all: {show_all}")
+        _log_enhanced_citations_debug(
+            "PDF request received",
+            doc_id=doc_id,
+            page=page_number,
+            show_all=show_all,
+            download=download,
+        )
 
         user_id = get_current_user_id()
         if not user_id:
@@ -263,6 +294,14 @@ def get_enhanced_citation_pdf():
             return serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all)
 
         except Exception as e:
+            _log_enhanced_citations_error(
+                "PDF request failed",
+                e,
+                doc_id=doc_id,
+                page=page_number,
+                show_all=show_all,
+                download=download,
+            )
             return jsonify({"error": str(e)}), 500
 
     @app.route("/api/enhanced_citations/tabular", methods=["GET"])
@@ -607,35 +646,60 @@ def get_blob_name(raw_doc, workspace_type):
     """
     _, blob_name = get_document_blob_storage_info(raw_doc)
     if blob_name:
+        _log_enhanced_citations_debug(
+            "Using stored blob path for citation content",
+            doc_id=raw_doc.get('id'),
+            workspace_type=workspace_type,
+            blob_name=blob_name,
+        )
         return blob_name
 
     if workspace_type == 'public':
-        return f"{raw_doc['public_workspace_id']}/{raw_doc['file_name']}"
+        fallback_blob_name = f"{raw_doc['public_workspace_id']}/{raw_doc['file_name']}"
     elif workspace_type == 'group':
-        return f"{raw_doc['group_id']}/{raw_doc['file_name']}"
+        fallback_blob_name = f"{raw_doc['group_id']}/{raw_doc['file_name']}"
     else:
-        return f"{raw_doc['user_id']}/{raw_doc['file_name']}"
+        fallback_blob_name = f"{raw_doc['user_id']}/{raw_doc['file_name']}"
+
+    _log_enhanced_citations_debug(
+        "Using legacy blob path fallback for citation content",
+        doc_id=raw_doc.get('id'),
+        workspace_type=workspace_type,
+        blob_name=fallback_blob_name,
+    )
+    return fallback_blob_name
 
 def serve_enhanced_citation_content(raw_doc, content_type=None, force_download=False):
     """
     Server-side rendering: Serve enhanced citation file content directly
     Based on the logic from the existing view_pdf function but serves content directly
     """
-    settings = get_settings()
-    
     # Get blob storage client
     blob_service_client = CLIENTS.get("storage_account_office_docs_client")
     if not blob_service_client:
         raise Exception("Blob storage client not available")
-    
-    # Determine workspace type and container
-    workspace_type, container_name = determine_workspace_type_and_container(raw_doc)
-    container_client = blob_service_client.get_container_client(container_name)
-    
-    # Build blob name based on workspace type
-    blob_name = get_blob_name(raw_doc, workspace_type)
-    
+
+    doc_id = raw_doc.get('id')
+    file_name = raw_doc.get('file_name')
+    workspace_type = None
+    container_name = None
+    blob_name = None
+
     try:
+        workspace_type, container_name = determine_workspace_type_and_container(raw_doc)
+        blob_name = get_blob_name(raw_doc, workspace_type)
+        container_client = blob_service_client.get_container_client(container_name)
+
+        _log_enhanced_citations_debug(
+            "Downloading citation content from blob storage",
+            doc_id=doc_id,
+            file_name=file_name,
+            workspace_type=workspace_type,
+            container_name=container_name,
+            blob_name=blob_name,
+            force_download=force_download,
+        )
+
         # Download blob content directly
         blob_client = container_client.get_blob_client(blob_name)
         blob_data = blob_client.download_blob()
@@ -659,6 +723,18 @@ def serve_enhanced_citation_content(raw_doc, content_type=None, force_download=F
                     content_type = 'audio/mpeg'
                 else:
                     content_type = 'application/octet-stream'
+
+        _log_enhanced_citations_debug(
+            "Citation content downloaded successfully",
+            doc_id=doc_id,
+            file_name=file_name,
+            workspace_type=workspace_type,
+            container_name=container_name,
+            blob_name=blob_name,
+            content_type=content_type,
+            content_length=len(content),
+            force_download=force_download,
+        )
         
         # Set content disposition based on force_download parameter
         disposition = 'attachment' if force_download else 'inline'
@@ -678,8 +754,17 @@ def serve_enhanced_citation_content(raw_doc, content_type=None, force_download=F
         return response
         
     except Exception as e:
-        print(f"Error serving enhanced citation content: {e}")
-        raise Exception(f"Failed to load content: {str(e)}")
+        _log_enhanced_citations_error(
+            "Failed to serve citation content",
+            e,
+            doc_id=doc_id,
+            file_name=file_name,
+            workspace_type=workspace_type,
+            container_name=container_name,
+            blob_name=blob_name,
+            force_download=force_download,
+        )
+        raise Exception(f"Failed to load content: {str(e)}") from e
 
 def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False):
     """
@@ -691,25 +776,40 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False):
         page_number: Current page number
         show_all: If True, show all pages instead of just ±1 pages around current
     """
-    debug_print(f"serve_enhanced_citation_pdf_content called with show_all: {show_all}")
-    
-    import io
-    import uuid
-    import tempfile
-    import fitz  # PyMuPDF
+    _log_enhanced_citations_debug(
+        "Preparing PDF citation content",
+        doc_id=raw_doc.get('id'),
+        file_name=raw_doc.get('file_name'),
+        page=page_number,
+        show_all=show_all,
+    )
     
     blob_service_client = CLIENTS.get("storage_account_office_docs_client")
     if not blob_service_client:
         raise Exception("Blob storage client not available")
-    
-    # Determine workspace type and container
-    workspace_type, container_name = determine_workspace_type_and_container(raw_doc)
-    container_client = blob_service_client.get_container_client(container_name)
-    
-    # Build blob name based on workspace type
-    blob_name = get_blob_name(raw_doc, workspace_type)
-    
+
+    doc_id = raw_doc.get('id')
+    file_name = raw_doc.get('file_name')
+    workspace_type = None
+    container_name = None
+    blob_name = None
+
     try:
+        workspace_type, container_name = determine_workspace_type_and_container(raw_doc)
+        blob_name = get_blob_name(raw_doc, workspace_type)
+        container_client = blob_service_client.get_container_client(container_name)
+
+        _log_enhanced_citations_debug(
+            "Downloading PDF citation blob",
+            doc_id=doc_id,
+            file_name=file_name,
+            workspace_type=workspace_type,
+            container_name=container_name,
+            blob_name=blob_name,
+            page=page_number,
+            show_all=show_all,
+        )
+
         # Download blob content directly
         blob_client = container_client.get_blob_client(blob_name)
         blob_data = blob_client.download_blob()
@@ -727,6 +827,13 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False):
             current_idx = page_number - 1  # zero-based
 
             if current_idx < 0 or current_idx >= total_pages:
+                _log_enhanced_citations_debug(
+                    "Requested PDF page was out of range",
+                    doc_id=doc_id,
+                    file_name=file_name,
+                    page=page_number,
+                    total_pages=total_pages,
+                )
                 pdf_document.close()
                 os.remove(temp_pdf_path)
                 return jsonify({"error": "Requested page out of range"}), 400
@@ -778,6 +885,19 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False):
             extracted_pdf.close()
             pdf_document.close()
 
+            _log_enhanced_citations_debug(
+                "Built PDF citation sub-document",
+                doc_id=doc_id,
+                file_name=file_name,
+                page=page_number,
+                show_all=show_all,
+                total_pages=total_pages,
+                start_idx=start_idx,
+                end_idx=end_idx,
+                viewer_page=new_page_number,
+                content_length=len(extracted_content),
+            )
+
             # Return the extracted PDF
             headers = {
                 'Content-Length': str(len(extracted_content)),
@@ -789,7 +909,12 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False):
             
             # When show_all is True, allow iframe embedding
             if show_all:
-                debug_print(f"Setting CSP headers for iframe embedding (show_all={show_all})")
+                _log_enhanced_citations_debug(
+                    "Setting CSP headers for iframe embedding",
+                    doc_id=doc_id,
+                    file_name=file_name,
+                    show_all=show_all,
+                )
                 headers['Content-Security-Policy'] = (
                     "default-src 'self'; "
                     "frame-ancestors 'self'; "  # Allow embedding in same origin
@@ -797,7 +922,12 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False):
                 )
                 headers['X-Frame-Options'] = 'SAMEORIGIN'  # Allow same-origin framing
             else:
-                debug_print(f"NOT setting CSP headers for iframe embedding (show_all={show_all})")
+                _log_enhanced_citations_debug(
+                    "Skipping iframe embedding headers for sub-document response",
+                    doc_id=doc_id,
+                    file_name=file_name,
+                    show_all=show_all,
+                )
             
             response = Response(
                 extracted_content,
@@ -812,5 +942,15 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False):
                 os.remove(temp_pdf_path)
         
     except Exception as e:
-        print(f"Error serving PDF citation content: {e}")
-        raise Exception(f"Failed to load PDF content: {str(e)}")
+        _log_enhanced_citations_error(
+            "Failed to serve PDF citation content",
+            e,
+            doc_id=doc_id,
+            file_name=file_name,
+            workspace_type=workspace_type,
+            container_name=container_name,
+            blob_name=blob_name,
+            page=page_number,
+            show_all=show_all,
+        )
+        raise Exception(f"Failed to load PDF content: {str(e)}") from e
diff --git a/application/single_app/route_external_health.py b/application/single_app/route_external_health.py
index ce4508d0..3da829c3 100644
--- a/application/single_app/route_external_health.py
+++ b/application/single_app/route_external_health.py
@@ -16,4 +16,15 @@ def external_health_check():
         """External health check endpoint for monitoring."""
         now = datetime.now()
         time_string = now.strftime("%Y-%m-%d %H:%M:%S")
-        return time_string, 200
\ No newline at end of file
+        return time_string, 200
+
+
+def register_no_auth_health(app):
+    @app.route('/external/healthcheckz', methods=['GET'])
+    @swagger_route()
+    @enabled_required("enable_no_auth_external_healthcheck")
+    def no_auth_external_healthcheck():
+        return {
+            "status": "ok",
+            "time": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        }, 200
\ No newline at end of file
diff --git a/application/single_app/route_frontend_admin_settings.py b/application/single_app/route_frontend_admin_settings.py
index 0dc5cdd8..435134c6 100644
--- a/application/single_app/route_frontend_admin_settings.py
+++ b/application/single_app/route_frontend_admin_settings.py
@@ -154,6 +154,10 @@ def admin_settings():
         # --- Add default for swagger documentation ---
         if 'enable_swagger' not in settings:
             settings['enable_swagger'] = True  # Default enabled for development/testing
+        if 'enable_external_healthcheck' not in settings:
+            settings['enable_external_healthcheck'] = False
+        if 'enable_no_auth_external_healthcheck' not in settings:
+            settings['enable_no_auth_external_healthcheck'] = False
         if 'release_notifications_registered' not in settings:
             settings['release_notifications_registered'] = False
         if 'release_notifications_name' not in settings:
@@ -709,7 +713,7 @@ def parse_admin_int(raw_value, fallback_value, field_name="unknown", hard_defaul
                     level=logging.INFO,
                 )
                 log_general_admin_action(
-                    admin_user_id=admin_user,
+                    admin_user_id=user_id,
                     admin_email=admin_email,
                     action='Enabled and migrated multi-model endpoints',
                     description=f'Migrated {len(migrated_models)} models to multi-endpoint configuration.'
@@ -1101,6 +1105,7 @@ def is_valid_url(url):
                 'release_notifications_registered_at': form_data.get('release_notifications_registered_at', settings.get('release_notifications_registered_at', '')).strip(),
                 'release_notifications_updated_at': form_data.get('release_notifications_updated_at', settings.get('release_notifications_updated_at', '')).strip(),
                 'enable_external_healthcheck': form_data.get('enable_external_healthcheck') == 'on',
+                'enable_no_auth_external_healthcheck': form_data.get('enable_no_auth_external_healthcheck') == 'on',
                 'enable_swagger': form_data.get('enable_swagger') == 'on',
                 'enable_semantic_kernel': form_data.get('enable_semantic_kernel') == 'on',
                 'per_user_semantic_kernel': form_data.get('per_user_semantic_kernel') == 'on',
diff --git a/application/single_app/semantic_kernel_loader.py b/application/single_app/semantic_kernel_loader.py
index 14dcc0d3..7bdddda2 100644
--- a/application/single_app/semantic_kernel_loader.py
+++ b/application/single_app/semantic_kernel_loader.py
@@ -56,6 +56,7 @@
 from functions_agent_payload import can_agent_use_default_multi_endpoint_model
 from semantic_kernel_plugins.plugin_loader import discover_plugins
 from semantic_kernel_plugins.openapi_plugin_factory import OpenApiPluginFactory
+from config import cognitive_services_scope
 from functions_agent_scope import find_agent_by_scope, is_selected_agent_scope_enabled
 import app_settings_cache
 
@@ -287,6 +288,9 @@ def resolve_authority(auth_settings):
             return custom_authority
         return AzureAuthorityHosts.AZURE_PUBLIC_CLOUD
 
+    def resolve_aoai_scope():
+        return str(cognitive_services_scope or "").strip()
+
     def resolve_foundry_scope(auth_settings, endpoint=None):
         custom_scope = (auth_settings.get("foundry_scope") or "").strip()
         if custom_scope:
@@ -326,9 +330,10 @@ def build_token_provider(auth_settings, provider="aoai", endpoint=None):
                 authority=authority,
             )
 
-        scope = "https://cognitiveservices.azure.com/.default"
         if provider in ("aifoundry", "new_foundry"):
             scope = resolve_foundry_scope(auth_settings, endpoint=endpoint)
+        else:
+            scope = resolve_aoai_scope()
 
         return get_bearer_token_provider(credential, scope)
 
diff --git a/application/single_app/static/css/chats.css b/application/single_app/static/css/chats.css
index 1ab7b282..6474185b 100644
--- a/application/single_app/static/css/chats.css
+++ b/application/single_app/static/css/chats.css
@@ -13,11 +13,67 @@
     margin: 0 !important;
 }
 /* Fix for document dropdown visibility */
+#scope-dropdown .dropdown-menu.show,
+#tags-dropdown .dropdown-menu.show,
 #document-dropdown .dropdown-menu.show {
   display: block !important;
   opacity: 1 !important;
   visibility: visible !important;
-  z-index: 1050 !important; /* Ensure it's above other elements */
+  z-index: 1060 !important; /* Ensure it's above other elements */
+}
+
+.chat-shell-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.75rem;
+}
+
+.chat-shell-header-content {
+  gap: 0.25rem;
+  min-width: 0;
+}
+
+.chat-shell-title-row {
+  gap: 0.5rem;
+  justify-content: space-between;
+  min-width: 0;
+}
+
+.chat-shell-title-actions {
+  align-items: center;
+  display: flex;
+  flex: 0 0 auto;
+}
+
+.chat-shell-icon-button {
+  align-items: center;
+  border-radius: 999px;
+  display: inline-flex;
+  height: 2.25rem;
+  justify-content: center;
+  padding: 0;
+  width: 2.25rem;
+}
+
+.chat-shell-status-row {
+  min-height: 1.5rem;
+}
+
+.chat-shell-classifications {
+  min-width: 0;
+}
+
+#chat-sidebar-inline-toggle {
+  border-radius: 999px;
+  flex: 0 0 auto;
+  height: 2.25rem;
+  padding: 0;
+  width: 2.25rem;
+}
+
+body.sidebar-collapsed #chat-sidebar-inline-toggle {
+  color: var(--bs-primary);
 }
 
 .chat-searchable-select .dropdown-menu.show {
@@ -27,6 +83,10 @@
   z-index: 1050 !important;
 }
 
+.chat-toolbar-mobile-panel .chat-searchable-select .dropdown-menu.show {
+  z-index: 1060 !important;
+}
+
 /* Handle dropdown positioning at the edge of viewport */
 #document-dropdown.dropup .dropdown-menu {
   bottom: 100% !important;
@@ -46,21 +106,78 @@
   right: auto !important; /* Prevent right positioning */
 }
 
+.chat-search-panel {
+  border-radius: 0.5rem;
+}
+
+.chat-search-panel-grid {
+  align-items: flex-end;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+}
+
+.chat-search-panel-field {
+  min-width: 0;
+}
+
+.chat-search-dropdown-button-content {
+  align-items: center;
+  display: inline-flex;
+  gap: 0.5rem;
+  min-width: 0;
+}
+
+.chat-search-dropdown-loading-spinner {
+  flex: 0 0 auto;
+  height: 0.875rem;
+  width: 0.875rem;
+}
+
+@media (min-width: 992px) {
+  .chat-search-panel .offcanvas-header {
+    display: none;
+  }
+}
+
 .chat-searchable-select {
   min-width: 120px;
 }
 
 .chat-toolbar {
   display: flex;
-  flex-wrap: nowrap;
+  flex-wrap: wrap;
   align-items: flex-end;
   gap: 0.75rem;
 }
 
+.chat-toolbar-primary-row {
+  align-items: center;
+  display: flex;
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
+#chat-toolbar-desktop-tools-slot,
+.chat-toolbar-selectors-slot {
+  display: flex;
+  min-width: 0;
+}
+
+#chat-toolbar-desktop-tools-slot {
+  flex: 1 1 auto;
+}
+
+.chat-toolbar-action-rail {
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
 .chat-toolbar-actions,
 .chat-toolbar-controls,
 .chat-toolbar-toggles,
-.chat-toolbar-selectors {
+.chat-toolbar-selectors,
+.chat-toolbar-secondary-panel {
   display: flex;
   align-items: center;
   gap: 0.5rem;
@@ -69,7 +186,13 @@
 
 .chat-toolbar-actions {
   flex: 1 1 auto;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
+  overflow-x: auto;
+  padding-bottom: 0.125rem;
+}
+
+.chat-toolbar-actions .btn {
+  flex: 0 0 auto;
 }
 
 .chat-toolbar-controls {
@@ -77,9 +200,57 @@
   flex-wrap: nowrap;
   justify-content: flex-end;
   align-items: flex-end;
+  gap: 0.75rem;
   margin-left: auto;
 }
 
+.chat-toolbar-primary-selector {
+  flex: 0 1 230px;
+  max-width: 230px;
+  min-width: 180px;
+}
+
+.chat-toolbar-primary-selector .chat-toolbar-selector {
+  flex: 1 1 auto;
+  max-width: none;
+  min-width: 0;
+}
+
+.chat-toolbar-primary-surface {
+  align-items: center;
+  display: flex;
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
+.chat-toolbar-primary-surface .chat-toolbar-selector {
+  flex: 1 1 auto;
+  max-width: none;
+  min-width: 0;
+}
+
+.chat-toolbar-tools-surface {
+  flex: 1 1 auto;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+}
+
+.chat-toolbar-selectors-slot {
+  flex: 0 1 auto;
+}
+
+.chat-toolbar-mobile-panel {
+  --bs-offcanvas-height: min(26rem, 70vh);
+}
+
+.chat-mobile-tools-toggle {
+  align-items: center;
+  border-radius: 999px;
+  flex: 0 0 auto;
+  gap: 0.35rem;
+  white-space: nowrap;
+}
+
 .chat-toolbar-toggles {
   flex: 0 0 auto;
   flex-wrap: nowrap;
@@ -188,21 +359,22 @@
     align-items: center;
   }
 
-  .chat-toolbar-actions {
-    flex: 1 1 100%;
-  }
-
   .chat-toolbar-controls {
     flex: 1 1 100%;
     flex-wrap: wrap;
-    justify-content: flex-start;
+    justify-content: space-between;
     margin-left: 0;
   }
 
+  .chat-toolbar-primary-selector {
+    flex: 1 1 220px;
+    max-width: 280px;
+  }
+
   .chat-toolbar-selectors {
     flex: 1 1 auto;
     flex-wrap: wrap;
-    justify-content: flex-start;
+    justify-content: flex-end;
   }
 
   .chat-toolbar-toggles {
@@ -210,33 +382,202 @@
   }
 }
 
-@media (max-width: 768px) {
-  .chat-toolbar {
+@media (min-width: 992px) {
+  .chat-toolbar-mobile-panel {
+    display: none !important;
+  }
+}
+
+@media (max-width: 991.98px) {
+  .chat-search-panel {
+    border-radius: 0;
+    height: 100vh;
+    margin-bottom: 0 !important;
+    max-width: min(92vw, 24rem);
+  }
+
+  .chat-search-panel .offcanvas-header {
+    border-bottom: 1px solid var(--bs-border-color);
+  }
+
+  .chat-search-panel .offcanvas-body {
+    padding: 1rem;
+  }
+
+  .chat-search-panel-mobile-footer {
+    align-items: center;
+    border-top: 1px solid var(--bs-border-color);
+    display: flex;
+    justify-content: flex-end;
+    padding: 0.75rem 1rem calc(env(safe-area-inset-bottom, 0px) + 1rem);
+  }
+
+  .chat-search-panel-mobile-footer .btn-close {
+    margin-left: auto;
+  }
+
+  .chat-search-panel-grid {
+    align-items: stretch;
+    display: grid;
+    gap: 0.75rem;
+  }
+
+  #document-dropdown .dropdown-menu,
+  #scope-dropdown-menu,
+  #tags-dropdown-menu {
+    max-width: none;
+    min-width: 0;
+    width: 100% !important;
+  }
+
+  .chat-shell-header {
+    padding: 0.875rem 1rem !important;
+  }
+
+  .chat-shell-title-row {
+    align-items: flex-start;
+  }
+
+  .chat-shell-status-row {
     flex-wrap: wrap;
+  }
+
+  .chat-toolbar {
     align-items: center;
+    gap: 0.75rem;
+  }
+
+  .chat-toolbar-primary-row,
+  #chat-toolbar-desktop-tools-slot,
+  #chat-toolbar-desktop-primary-slot,
+  #chat-toolbar-desktop-selectors-slot {
+    display: none;
+  }
+
+  .chat-toolbar-mobile-panel.offcanvas-bottom {
+    border-top-left-radius: 1rem;
+    border-top-right-radius: 1rem;
+    box-shadow: 0 -0.75rem 2rem rgba(0, 0, 0, 0.2);
   }
 
   .chat-toolbar-controls {
-    flex-basis: 100%;
-    flex-wrap: wrap;
-    justify-content: flex-start;
+    display: flex;
+    justify-content: flex-end;
     margin-left: 0;
+    width: 100%;
   }
 
-  .chat-toolbar-selectors {
-    flex-basis: 100%;
-    flex-wrap: wrap;
+  .chat-mobile-tools-toggle {
+    margin-left: auto;
   }
 
-  .chat-toolbar-toggles {
+  .chat-toolbar-mobile-panel .offcanvas-header {
+    border-bottom: 1px solid var(--bs-border-color);
+    padding: 1rem 1rem 0.875rem;
+  }
+
+  .chat-toolbar-mobile-panel .offcanvas-body {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    padding: 1rem;
+  }
+
+  .chat-toolbar-mobile-tools-slot,
+  .chat-toolbar-mobile-primary-slot,
+  .chat-toolbar-mobile-selectors-slot {
+    width: 100%;
+  }
+
+  .chat-toolbar-mobile-primary-slot .chat-toolbar-primary-surface {
+    width: 100%;
+  }
+
+  .chat-toolbar-mobile-tools-slot .chat-toolbar-tools-surface {
+    align-items: stretch;
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+  }
+
+  .chat-toolbar-mobile-tools-slot .chat-toolbar-actions {
+    display: grid;
+    gap: 0.625rem;
+    grid-template-columns: minmax(0, 1fr);
+    overflow: visible;
+    padding-bottom: 0;
+  }
+
+  .chat-toolbar-mobile-tools-slot .chat-toolbar-actions .btn {
+    align-items: center;
+    border-radius: 0.85rem;
+    display: flex;
+    gap: 0.625rem;
+    justify-content: flex-start;
+    min-height: 2.75rem;
+    padding: 0.75rem 1rem;
     width: 100%;
+  }
+
+  .chat-toolbar-mobile-tools-slot .search-btn-text,
+  .chat-toolbar-mobile-tools-slot .file-btn-text {
+    display: inline !important;
+    margin-left: 0.375rem;
+    opacity: 1;
+    width: auto;
+  }
+
+  .chat-toolbar-mobile-tools-slot .search-btn:not(.active) i,
+  .chat-toolbar-mobile-tools-slot .search-btn:not(.active) .search-btn-text,
+  .chat-toolbar-mobile-tools-slot .file-btn:not(.active) i,
+  .chat-toolbar-mobile-tools-slot .file-btn:not(.active) .file-btn-text {
+    color: var(--bs-emphasis-color);
+  }
+
+  .chat-toolbar-mobile-tools-slot .chat-toolbar-toggles {
     flex-wrap: wrap;
+    justify-content: flex-start;
+    width: 100%;
+  }
+
+  .chat-toolbar-mobile-selectors-slot .chat-toolbar-selectors {
+    align-items: stretch;
+    flex-direction: column;
+    width: 100%;
   }
 
+  .chat-toolbar-mobile-primary-slot .chat-toolbar-selector,
+  .chat-toolbar-mobile-selectors-slot .chat-toolbar-selector,
   .chat-toolbar-selector {
     flex: 1 1 100%;
-    min-width: 0;
     max-width: none;
+    min-width: 0;
+    width: 100%;
+  }
+
+  #search-documents-container .flex-shrink-0,
+  #search-documents-container .flex-grow-1 {
+    max-width: none !important;
+    min-width: 0 !important;
+    width: 100%;
+  }
+
+  #search-documents-container .dropdown,
+  #search-documents-container .form-select {
+    width: 100%;
+  }
+
+  .chat-mobile-tools-toggle[aria-expanded="true"] {
+    background-color: rgba(var(--bs-primary-rgb), 0.08);
+    border-color: rgba(var(--bs-primary-rgb), 0.35);
+    color: var(--bs-primary);
+  }
+
+  .chat-toolbar-actions,
+  .chat-toolbar-controls,
+  .chat-toolbar-selectors,
+  .chat-toolbar-toggles {
+    gap: 0.35rem;
   }
 }
 
@@ -513,6 +854,11 @@
     --bs-tooltip-zindex: 1115;
   }
 
+  #chat-toast-container {
+    top: 16px;
+    z-index: 1100;
+  }
+
   .conversation-dropdown.tutorial-force-visible {
     opacity: 1 !important;
   }
@@ -1288,6 +1634,22 @@ a.citation-link:hover {
   color: #000; /* Black text color */
 }
 
+@media (max-width: 991.98px) {
+  #chat-toolbar-mobile-tools-slot .search-btn .search-btn-text,
+  #chat-toolbar-mobile-tools-slot .file-btn .file-btn-text {
+    display: inline !important;
+    margin-left: 0.375rem;
+    opacity: 1 !important;
+    overflow: visible;
+    width: auto !important;
+  }
+
+  #chat-toolbar-mobile-tools-slot .search-btn:not(.active) .search-btn-text,
+  #chat-toolbar-mobile-tools-slot .file-btn:not(.active) .file-btn-text {
+    color: var(--bs-emphasis-color);
+  }
+}
+
 /* Message container */
 .message {
   display: flex;
@@ -1665,6 +2027,13 @@ ol {
   /* Ensures elements align nicely at their bottom edges */
   align-items: flex-end;
 }
+
+@media (max-width: 991.98px) {
+  .chat-input-container {
+    margin-top: 0.25rem;
+  }
+}
+
 #prompt-selection-container {
   align-self: auto;
 }
diff --git a/application/single_app/static/css/navigation.css b/application/single_app/static/css/navigation.css
index c561b19e..3b17d9dc 100644
--- a/application/single_app/static/css/navigation.css
+++ b/application/single_app/static/css/navigation.css
@@ -1,18 +1,212 @@
 /* Top Navigation Styles */
 
+:root {
+  --top-nav-height: 66px;
+  --classification-banner-height: 40px;
+}
+
 /* Base body padding for top navigation */
 body {
-  /* Default: navbar height only */
-  padding-top: 56px;
+  padding-top: var(--top-nav-height);
   overflow-x: hidden;
   height: 100%;
 }
 
+.top-nav-bar {
+  -webkit-backdrop-filter: blur(14px);
+  backdrop-filter: blur(14px);
+  box-shadow: 0 0.35rem 1.25rem rgba(15, 23, 42, 0.08);
+  z-index: 1046;
+}
+
+.top-nav-shell {
+  align-items: center;
+  display: flex;
+  gap: 1rem;
+  min-height: var(--top-nav-height);
+}
+
+.top-nav-brand {
+  flex: 0 1 auto;
+  min-width: 0;
+}
+
+.top-nav-brand-link {
+  margin-right: 0;
+  max-width: 100%;
+}
+
+.top-nav-brand-title {
+  display: inline-block;
+  max-width: min(24rem, 45vw);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.top-nav-primary-nav {
+  align-items: center;
+  flex-wrap: nowrap;
+  gap: 0.15rem;
+  min-width: 0;
+  overflow-x: auto;
+}
+
+.top-nav-primary-nav .nav-link {
+  border-radius: 999px;
+  padding-left: 0.9rem;
+  padding-right: 0.9rem;
+  white-space: nowrap;
+}
+
+.top-nav-chat-nav {
+  flex: 1 1 auto;
+}
+
+.top-nav-chat-nav .nav-link {
+  padding-left: 0.75rem;
+  padding-right: 0.75rem;
+}
+
+.top-nav-actions {
+  align-items: center;
+  display: flex;
+  flex: 0 0 auto;
+  gap: 0.75rem;
+  margin-left: auto;
+}
+
+.top-nav-mobile-toggle {
+  align-items: center;
+  border-radius: 999px;
+  display: inline-flex;
+  font-size: 1.15rem;
+  height: 2.5rem;
+  justify-content: center;
+  padding: 0;
+  width: 2.5rem;
+}
+
+.top-nav-mobile-drawer {
+  max-width: min(88vw, 22rem);
+}
+
+@media (max-width: 991.98px) {
+  .top-nav-mobile-drawer.offcanvas-start {
+    height: calc(100vh - var(--top-nav-height));
+    top: var(--top-nav-height);
+  }
+
+  body.has-classification-banner .top-nav-mobile-drawer.offcanvas-start {
+    height: calc(100vh - var(--top-nav-height) - var(--classification-banner-height));
+    top: calc(var(--top-nav-height) + var(--classification-banner-height));
+  }
+}
+
+.top-nav-mobile-drawer .offcanvas-header {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+}
+
+.top-nav-mobile-section-label {
+  color: var(--bs-secondary-color, #6c757d);
+  font-size: 0.72rem;
+  font-weight: 700;
+  letter-spacing: 0.08em;
+  margin: 1rem 0 0.5rem;
+  text-transform: uppercase;
+}
+
+.top-nav-mobile-section-label:first-child {
+  margin-top: 0;
+}
+
+.top-nav-mobile-list .list-group-item {
+  align-items: center;
+  border: 0;
+  border-radius: 0.85rem;
+  display: flex;
+  font-weight: 500;
+  margin-bottom: 0.25rem;
+  padding: 0.85rem 0.95rem;
+}
+
+.top-nav-mobile-list .list-group-item:hover,
+.top-nav-mobile-list .list-group-item:focus-visible {
+  background: rgba(13, 110, 253, 0.08);
+}
+
+.top-nav-user-nav {
+  align-items: center;
+  flex-direction: row;
+}
+
+.top-nav-user-trigger {
+  align-items: center;
+  border-radius: 999px;
+  display: flex;
+  gap: 0.6rem;
+}
+
+.top-nav-profile-avatar {
+  height: 28px;
+  position: relative;
+  width: 28px;
+}
+
+.top-nav-profile-image {
+  height: 28px;
+  object-fit: cover;
+  width: 28px;
+}
+
+.top-nav-initials {
+  font-size: 1rem;
+}
+
+.top-nav-notification-badge {
+  border: 2px solid white;
+  bottom: -2px;
+  display: none;
+  font-size: 0.6rem;
+  font-weight: 700;
+  height: 18px;
+  line-height: 1;
+  padding: 0;
+  right: -2px;
+  width: 18px;
+}
+
+.top-nav-user-meta {
+  flex-direction: column;
+  justify-content: center;
+  line-height: 1;
+  min-width: 0;
+}
+
+.top-nav-user-name {
+  font-size: 1rem;
+}
+
+.top-nav-user-role {
+  font-size: 0.75rem;
+}
+
+.top-nav-user-menu {
+  min-width: 17rem;
+}
+
+.top-nav-menu-section {
+  font-size: 0.75rem;
+  font-weight: 600;
+  letter-spacing: 0.02em;
+  text-transform: uppercase;
+}
+
 /* Navigation layout toggle styles */
 .nav-layout-toggle {
+  align-items: center;
   cursor: pointer;
   display: flex;
-  align-items: center;
   height: 100%;
 }
 
@@ -22,27 +216,27 @@ body {
 
 /* Ensure nav-link containing nav layout toggle is aligned with other nav links */
 .nav-item .nav-link.nav-layout-toggle {
-  display: flex;
   align-items: center;
+  display: flex;
   height: 100%;
-  padding-top: 0;
   padding-bottom: 0;
   padding-left: 1rem;
   padding-right: 1rem;
+  padding-top: 0;
 }
 
 /* Ensure dropdown nav layout toggle aligns with other dropdown items */
 .dropdown-item.nav-layout-toggle {
-  display: flex;
   align-items: center;
+  display: flex;
   text-align: left;
 }
 
 /* Dark mode toggle styles within navigation */
 .dark-mode-toggle {
+  align-items: center;
   cursor: pointer;
   display: flex;
-  align-items: center;
   height: 100%;
 }
 
@@ -52,38 +246,84 @@ body {
 
 /* Ensure nav-link containing dark mode toggle is aligned with other nav links */
 .nav-item .nav-link.dark-mode-toggle {
-  display: flex;
   align-items: center;
+  display: flex;
   height: 100%;
-  padding-top: 0;
   padding-bottom: 0;
   padding-left: 1rem;
   padding-right: 1rem;
+  padding-top: 0;
 }
 
 /* Ensure dropdown dark mode toggle aligns with other dropdown items */
 .dropdown-item.dark-mode-toggle {
-  display: flex;
   align-items: center;
+  display: flex;
   text-align: left;
 }
 
 /* Classification banner adjustments */
 #classification-banner + nav.navbar.fixed-top {
-  top: 40px; /* Height of the banner */
+  top: var(--classification-banner-height);
 }
 
 #classification-banner {
-  height: 40px;
-  line-height: 40px;
+  height: var(--classification-banner-height);
+  line-height: var(--classification-banner-height);
 }
 
 /* Dark mode navbar styling */
 [data-bs-theme="dark"] .navbar-light {
-  background-color: #343a40 !important;
+  background-color: rgba(33, 37, 41, 0.94) !important;
 }
 
 [data-bs-theme="dark"] .navbar-light .navbar-brand,
 [data-bs-theme="dark"] .navbar-light .nav-link {
   color: #e9ecef;
 }
+
+[data-bs-theme="dark"] .top-nav-mobile-drawer {
+  background: #212529;
+  color: #f8f9fa;
+}
+
+[data-bs-theme="dark"] .top-nav-mobile-drawer .offcanvas-header {
+  border-bottom-color: rgba(255, 255, 255, 0.08);
+}
+
+[data-bs-theme="dark"] .top-nav-mobile-list .list-group-item {
+  background: transparent;
+  color: #f8f9fa;
+}
+
+[data-bs-theme="dark"] .top-nav-mobile-list .list-group-item:hover,
+[data-bs-theme="dark"] .top-nav-mobile-list .list-group-item:focus-visible {
+  background: rgba(255, 255, 255, 0.08);
+}
+
+@media (max-width: 991.98px) {
+  :root {
+    --top-nav-height: 64px;
+  }
+
+  .top-nav-shell {
+    gap: 0.5rem;
+  }
+
+  .top-nav-brand-link {
+    max-width: calc(100vw - 8.5rem);
+  }
+
+  .top-nav-brand-title {
+    max-width: min(14rem, 54vw);
+  }
+
+  .top-nav-user-trigger {
+    padding-left: 0.15rem;
+    padding-right: 0.15rem;
+  }
+
+  .top-nav-user-menu {
+    min-width: 15rem;
+  }
+}
diff --git a/application/single_app/static/css/sidebar.css b/application/single_app/static/css/sidebar.css
index 1b3f7eb8..ab7e652c 100644
--- a/application/single_app/static/css/sidebar.css
+++ b/application/single_app/static/css/sidebar.css
@@ -15,12 +15,21 @@ body.sidebar-nav-enabled {
 /* Sidebar container */
 #sidebar-nav {
   display: none;
+  transition: transform 0.3s ease;
+}
+
+#sidebar-nav.sidebar-collapsed {
+  transform: translateX(-100%);
 }
 
 body.sidebar-nav-enabled #sidebar-nav {
   display: flex !important;
 }
 
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav {
+  display: flex !important;
+}
+
 /* Hide top navbar when sidebar is enabled */
 body.sidebar-nav-enabled nav.navbar {
   display: none !important;
@@ -53,14 +62,95 @@ body.has-classification-banner #sidebar-nav {
 
 /* Chats top-nav layout: align the fixed sidebar just below the navbar */
 nav.navbar.fixed-top + #sidebar-nav {
-  top: 66px !important;
-  height: calc(100vh - 66px);
+  top: var(--top-nav-height) !important;
+  height: calc(100vh - var(--top-nav-height));
 }
 
 /* Account for classification banner when present */
 body.has-classification-banner nav.navbar + #sidebar-nav {
-  top: 98px !important;
-  height: calc(100vh - 98px);
+  top: calc(var(--top-nav-height) + var(--classification-banner-height)) !important;
+  height: calc(100vh - var(--top-nav-height) - var(--classification-banner-height));
+}
+
+body.chat-top-nav-shell {
+  --chat-sidebar-top: var(--top-nav-height);
+}
+
+body.chat-top-nav-shell.has-classification-banner {
+  --chat-sidebar-top: calc(var(--top-nav-height) + var(--classification-banner-height));
+}
+
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav {
+  width: var(--sidebar-width, 260px);
+  min-width: var(--sidebar-min-width, 220px);
+}
+
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav #sidebar-user-account {
+  min-width: 0;
+  width: 100%;
+}
+
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav.show {
+  transform: none !important;
+}
+
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .offcanvas-header {
+  border-bottom: 1px solid var(--bs-border-color, #dee2e6);
+}
+
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .chat-sidebar-mobile-header {
+  display: none;
+}
+
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .chat-sidebar-user-account {
+  background-color: inherit;
+}
+
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .chat-sidebar-mobile-sections {
+  background-color: inherit;
+}
+
+body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .chat-sidebar-mobile-section + .chat-sidebar-mobile-section {
+  margin-top: 1rem;
+}
+
+@media (min-width: 992px) {
+  body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav {
+    height: calc(100vh - var(--chat-sidebar-top));
+    left: 0;
+    max-width: none;
+    position: fixed;
+    top: var(--chat-sidebar-top);
+    z-index: 1040;
+  }
+
+  body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .offcanvas-header {
+    display: none;
+  }
+}
+
+@media (max-width: 991.98px) {
+  body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav {
+    height: calc(100vh - var(--chat-sidebar-top));
+    max-width: min(88vw, 22rem);
+    top: var(--chat-sidebar-top);
+    z-index: 1045;
+  }
+
+  body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .chat-sidebar-mobile-header {
+    display: flex;
+  }
+
+  body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .sidebar-short-header,
+  body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav #sidebar-resize-handle {
+    display: none;
+  }
+
+  body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav #sidebar-user-account {
+    -webkit-backdrop-filter: none;
+    backdrop-filter: none;
+    position: static;
+  }
 }
 
 /* Floating expand button positioning when classification banner is present */
@@ -68,6 +158,49 @@ body.has-classification-banner #floating-expand-btn {
   top: calc(0.5rem + 40px) !important; /* Start below the classification banner */
 }
 
+#floating-expand-btn {
+  position: fixed;
+  left: 0.5rem;
+  top: 0.5rem;
+  z-index: 1050;
+  min-height: 36px;
+  padding: 0.35rem 0.55rem;
+  border-radius: 999px;
+  align-items: center;
+  justify-content: center;
+  gap: 0.375rem;
+  background-color: var(--bs-body-bg, #fff) !important;
+  border: 1px solid var(--bs-border-color, #dee2e6) !important;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15) !important;
+  color: var(--bs-body-color, #212529) !important;
+}
+
+#floating-expand-btn.sidebar-floating-expand-visible {
+  display: inline-flex !important;
+}
+
+[data-bs-theme="dark"] #floating-expand-btn {
+  background-color: var(--bs-dark, #212529) !important;
+  border: 1px solid var(--bs-border-color-translucent, rgba(255, 255, 255, 0.15)) !important;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.5) !important;
+  color: var(--bs-body-color, #fff) !important;
+}
+
+#floating-expand-btn:hover {
+  background-color: var(--bs-gray-100, #f8f9fa) !important;
+  transform: scale(1.05);
+  transition: all 0.2s ease;
+}
+
+[data-bs-theme="dark"] #floating-expand-btn:hover {
+  background-color: var(--bs-gray-800, #343a40) !important;
+}
+
+.floating-expand-label {
+  display: none;
+  font-weight: 600;
+}
+
 /* When the banner is present, add padding to the top of the main content */
 body.sidebar-nav-enabled.has-classification-banner .main-content,
 body.sidebar-nav-enabled.has-classification-banner .container,
@@ -75,6 +208,13 @@ body.sidebar-nav-enabled.has-classification-banner .container-fluid {
   padding-top: 2rem !important; /* Increased spacing when banner is present */
 }
 
+.main-content,
+.container,
+.container-fluid,
+#main-content {
+  transition: margin-left 0.3s ease-in-out, max-width 0.3s ease-in-out !important;
+}
+
 /* Sidebar Conversations List Styles */
 #conversations-section {
   display: flex;
@@ -173,6 +313,56 @@ body.sidebar-nav-enabled.has-classification-banner .container-fluid {
   font-size: 0.9rem;
 }
 
+.sidebar-header,
+.sidebar-short-header {
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.sidebar-brand-link {
+  display: flex !important;
+  align-items: center;
+  gap: 0.75rem;
+  min-width: 0;
+  margin-bottom: 0 !important;
+}
+
+.sidebar-brand-link img {
+  flex-shrink: 0;
+}
+
+.sidebar-brand-text {
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
+.sidebar-title-truncate {
+  display: block;
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  max-width: 100%;
+}
+
+.sidebar-toggle-row {
+  display: flex;
+}
+
+.sidebar-toggle-control {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+  min-height: 38px;
+  border-radius: 0.5rem;
+}
+
+.sidebar-toggle-control i {
+  font-size: 0.95rem;
+}
+
 .sidebar-conversation-item {
   cursor: pointer;
   padding: 8px 12px;
@@ -513,9 +703,48 @@ body.sidebar-nav-enabled.has-classification-banner .container-fluid {
 /* Ensure navbar-brand font size matches top nav */
 #sidebar-nav .navbar-brand {
   font-size: 20px !important; /* Match top navbar font size */
+  min-width: 0;
 }
 
 #sidebar-nav .navbar-brand .fw-bold,
 #sidebar-nav .navbar-brand span {
   font-size: 20px !important; /* Ensure child elements also use correct size */
+}
+
+#sidebar-user-account {
+  width: var(--sidebar-width, 260px);
+  min-width: var(--sidebar-min-width, 220px);
+  transition: inherit;
+  -webkit-backdrop-filter: blur(10px);
+  backdrop-filter: blur(10px);
+  background-color: var(--bs-light, #f8f9fa) !important;
+}
+
+[data-bs-theme="dark"] #sidebar-user-account {
+  background-color: var(--bs-dark, #212529) !important;
+  border-color: var(--bs-border-color-translucent, rgba(255,255,255,0.15)) !important;
+}
+
+@media (max-width: 575.98px) {
+  #sidebar-nav {
+    max-width: calc(100vw - 0.75rem);
+  }
+
+  #sidebar-user-account {
+    max-width: calc(100vw - 0.75rem);
+  }
+
+  .sidebar-toggle-control {
+    min-height: 42px;
+  }
+
+  #floating-expand-btn {
+    min-height: 42px;
+    padding: 0.5rem 0.75rem;
+  }
+
+  .floating-expand-label {
+    display: inline;
+    font-size: 0.875rem;
+  }
 }
\ No newline at end of file
diff --git a/application/single_app/static/css/workspace-responsive.css b/application/single_app/static/css/workspace-responsive.css
new file mode 100644
index 00000000..cf624e7f
--- /dev/null
+++ b/application/single_app/static/css/workspace-responsive.css
@@ -0,0 +1,437 @@
+/* Shared responsive workspace styles */
+
+.workspace-page {
+    padding-bottom: 2rem;
+}
+
+.workspace-page-header {
+    align-items: flex-start;
+    display: flex;
+    gap: 1rem;
+    justify-content: space-between;
+    margin-bottom: 1rem;
+}
+
+.workspace-page-title {
+    margin-bottom: 0;
+}
+
+.workspace-page-subtitle {
+    color: var(--bs-secondary-color, #6c757d);
+    margin-bottom: 0;
+}
+
+.workspace-section-switcher {
+    display: none;
+    flex: 0 0 clamp(13rem, 30vw, 18rem);
+    min-width: 13rem;
+}
+
+.workspace-section-switcher--persistent {
+    display: flex;
+}
+
+.workspace-section-switcher .form-label {
+    color: var(--bs-secondary-color, #6c757d);
+    font-size: 0.82rem;
+    font-weight: 600;
+    margin-bottom: 0.35rem;
+}
+
+.workspace-page .nav-tabs {
+    flex-wrap: nowrap;
+    gap: 0.35rem;
+    margin-bottom: 0;
+    overflow-x: auto;
+    overflow-y: hidden;
+    scrollbar-width: thin;
+}
+
+.workspace-page .nav-tabs .nav-link {
+    white-space: nowrap;
+}
+
+.document-item-card {
+    border-color: rgba(15, 23, 42, 0.08);
+}
+
+.document-item-card.is-selected {
+    border-color: rgba(13, 110, 253, 0.45);
+    box-shadow: 0 0 0 0.2rem rgba(13, 110, 253, 0.12);
+}
+
+.document-item-card__header {
+    align-items: flex-start;
+    display: flex;
+    gap: 0.75rem;
+    margin-bottom: 0.85rem;
+}
+
+.document-item-card__check {
+    align-items: center;
+    display: flex;
+    justify-content: center;
+    padding-top: 0.15rem;
+}
+
+.document-item-card__check .document-checkbox {
+    margin: 0;
+}
+
+.document-item-card__title-wrap {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.document-item-card__eyebrow {
+    color: var(--bs-secondary-color, #6c757d);
+    font-size: 0.72rem;
+    font-weight: 700;
+    letter-spacing: 0.04em;
+    margin-bottom: 0.2rem;
+    text-transform: uppercase;
+}
+
+.document-item-card__subtitle {
+    color: var(--bs-secondary-color, #6c757d);
+    font-size: 0.8rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.document-item-card__status {
+    flex: 0 0 auto;
+}
+
+.document-item-card__summary {
+    color: var(--bs-secondary-color, #6c757d);
+    font-size: 0.8rem;
+    line-height: 1.45;
+    margin-bottom: 0.85rem;
+}
+
+.document-item-card__meta {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.4rem;
+    margin-bottom: 0.75rem;
+}
+
+.document-meta-pill {
+    align-items: center;
+    background: rgba(13, 110, 253, 0.08);
+    border-radius: 999px;
+    color: var(--bs-body-color, #212529);
+    display: inline-flex;
+    font-size: 0.76rem;
+    font-weight: 500;
+    gap: 0.3rem;
+    padding: 0.28rem 0.6rem;
+}
+
+.document-item-card__badges {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.35rem;
+    margin-bottom: 0.75rem;
+}
+
+.document-item-card__tags {
+    margin-bottom: 0.85rem;
+}
+
+.document-item-card__progress {
+    margin-bottom: 0.85rem;
+}
+
+.document-item-card__progress-label {
+    color: var(--bs-secondary-color, #6c757d);
+    display: block;
+    font-size: 0.76rem;
+    margin-top: 0.35rem;
+    text-align: right;
+}
+
+.document-item-card .item-card-buttons {
+    align-items: center;
+}
+
+.document-item-card .item-card-buttons .btn {
+    align-items: center;
+    display: inline-flex;
+    justify-content: center;
+}
+
+[data-bs-theme="dark"] .document-meta-pill {
+    background: rgba(110, 168, 254, 0.16);
+    color: #e9ecef;
+}
+
+.workspace-toolbar-actions {
+    align-items: center;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.5rem;
+}
+
+.workspace-page .filter-buttons-col {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.5rem;
+    justify-content: flex-end;
+}
+
+.workspace-page .action-dropdown .dropdown-toggle::after {
+    display: none;
+}
+
+.workspace-page .table-loading-row td {
+    color: #6c757d;
+    padding: 1.5rem;
+    text-align: center;
+}
+
+@media (max-width: 991.98px) {
+    .workspace-page-header {
+        flex-direction: column;
+    }
+
+    .workspace-section-switcher {
+        display: flex;
+        min-width: 0;
+        width: 100%;
+    }
+
+    .workspace-page .nav-tabs {
+        display: none !important;
+    }
+
+    .workspace-toolbar-actions {
+        display: grid;
+        width: 100%;
+    }
+
+    .workspace-toolbar-actions .btn {
+        width: 100%;
+    }
+
+    .workspace-page .filter-buttons-col {
+        justify-content: stretch;
+        width: 100%;
+    }
+
+    .workspace-page .filter-buttons-col .btn {
+        flex: 1 1 100%;
+    }
+
+    #documents-table,
+    #group-documents-table,
+    #prompts-table,
+    #group-prompts-table,
+    #agents-table,
+    #group-agents-table,
+    #plugins-table,
+    #group-plugins-table {
+        table-layout: auto !important;
+    }
+
+    #documents-table thead,
+    #group-documents-table thead,
+    #prompts-table thead,
+    #group-prompts-table thead,
+    #agents-table thead,
+    #group-agents-table thead,
+    #plugins-table thead,
+    #group-plugins-table thead {
+        display: none;
+    }
+
+    #documents-table,
+    #group-documents-table,
+    #prompts-table,
+    #group-prompts-table,
+    #agents-table,
+    #group-agents-table,
+    #plugins-table,
+    #group-plugins-table,
+    #documents-table tbody,
+    #group-documents-table tbody,
+    #prompts-table tbody,
+    #group-prompts-table tbody,
+    #agents-table tbody,
+    #group-agents-table tbody,
+    #plugins-table tbody,
+    #group-plugins-table tbody {
+        display: block;
+        width: 100%;
+    }
+
+    #documents-table tr.document-row,
+    #group-documents-table tr.document-row,
+    #prompts-table tbody tr,
+    #group-prompts-table tbody tr,
+    #agents-table tbody tr,
+    #group-agents-table tbody tr,
+    #plugins-table tbody tr,
+    #group-plugins-table tbody tr {
+        background: var(--bs-body-bg, #fff);
+        border: 1px solid rgba(15, 23, 42, 0.08);
+        border-radius: 0.9rem;
+        box-shadow: 0 0.35rem 1rem rgba(15, 23, 42, 0.06);
+        display: block;
+        margin-bottom: 0.85rem;
+        overflow: hidden;
+        padding: 0.85rem 0.95rem;
+    }
+
+    #documents-table tr.document-row td,
+    #group-documents-table tr.document-row td,
+    #prompts-table tbody tr td,
+    #group-prompts-table tbody tr td,
+    #agents-table tbody tr td,
+    #group-agents-table tbody tr td,
+    #plugins-table tbody tr td,
+    #group-plugins-table tbody tr td {
+        border: 0;
+        display: block;
+        max-width: none !important;
+        overflow: visible !important;
+        padding: 0.2rem 0;
+        text-align: left !important;
+        white-space: normal !important;
+        width: 100% !important;
+    }
+
+    #documents-table tr.document-row td::before,
+    #group-documents-table tr.document-row td::before,
+    #prompts-table tbody tr td::before,
+    #group-prompts-table tbody tr td::before,
+    #agents-table tbody tr td::before,
+    #group-agents-table tbody tr td::before,
+    #plugins-table tbody tr td::before,
+    #group-plugins-table tbody tr td::before {
+        color: var(--bs-secondary-color, #6c757d);
+        display: block;
+        font-size: 0.72rem;
+        font-weight: 700;
+        letter-spacing: 0.04em;
+        margin-bottom: 0.15rem;
+        text-transform: uppercase;
+    }
+
+    #documents-table tr.document-row td:nth-child(1)::before,
+    #group-documents-table tr.document-row td:nth-child(1)::before {
+        content: "Status";
+    }
+
+    #documents-table tr.document-row td:nth-child(2)::before,
+    #group-documents-table tr.document-row td:nth-child(2)::before {
+        content: "File";
+    }
+
+    #documents-table tr.document-row td:nth-child(3)::before,
+    #group-documents-table tr.document-row td:nth-child(3)::before {
+        content: "Title";
+    }
+
+    #documents-table tr.document-row td:nth-child(4)::before,
+    #group-documents-table tr.document-row td:nth-child(4)::before {
+        content: "Actions";
+    }
+
+    #documents-table tr.document-row td:nth-child(4),
+    #group-documents-table tr.document-row td:nth-child(4) {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 0.5rem;
+        margin-top: 0.35rem;
+        padding-top: 0.55rem;
+    }
+
+    #documents-table tr.document-row td:nth-child(4) .btn,
+    #group-documents-table tr.document-row td:nth-child(4) .btn {
+        flex: 1 1 8rem;
+        justify-content: center;
+    }
+
+    #documents-table tr.document-row td:nth-child(4) .action-dropdown,
+    #group-documents-table tr.document-row td:nth-child(4) .action-dropdown {
+        margin-left: auto;
+    }
+
+    #documents-table tr.document-details-row,
+    #documents-table tr.document-status-row,
+    #group-documents-table tr.document-details-row,
+    #group-documents-table tr.document-status-row {
+        display: block;
+        margin-bottom: 0.85rem;
+        margin-top: -0.55rem;
+    }
+
+    #documents-table tr.document-details-row td,
+    #documents-table tr.document-status-row td,
+    #group-documents-table tr.document-details-row td,
+    #group-documents-table tr.document-status-row td {
+        background: rgba(13, 110, 253, 0.04);
+        border: 1px solid rgba(15, 23, 42, 0.08);
+        border-radius: 0 0 0.9rem 0.9rem;
+        display: block;
+        padding: 0.85rem 0.95rem;
+        width: 100%;
+    }
+
+    #prompts-table tbody tr td:nth-child(1)::before,
+    #group-prompts-table tbody tr td:nth-child(1)::before {
+        content: "Prompt";
+    }
+
+    #agents-table tbody tr td:nth-child(1)::before,
+    #group-agents-table tbody tr td:nth-child(1)::before {
+        content: "Name";
+    }
+
+    #plugins-table tbody tr td:nth-child(1)::before,
+    #group-plugins-table tbody tr td:nth-child(1)::before {
+        content: "Name";
+    }
+
+    #agents-table tbody tr td:nth-child(2)::before,
+    #group-agents-table tbody tr td:nth-child(2)::before,
+    #plugins-table tbody tr td:nth-child(2)::before,
+    #group-plugins-table tbody tr td:nth-child(2)::before {
+        content: "Description";
+    }
+
+    #prompts-table tbody tr td:nth-child(2)::before,
+    #group-prompts-table tbody tr td:nth-child(2)::before,
+    #agents-table tbody tr td:nth-child(3)::before,
+    #group-agents-table tbody tr td:nth-child(3)::before,
+    #plugins-table tbody tr td:nth-child(3)::before,
+    #group-plugins-table tbody tr td:nth-child(3)::before {
+        content: "Actions";
+    }
+
+    #prompts-table tbody tr td:nth-child(2),
+    #group-prompts-table tbody tr td:nth-child(2),
+    #agents-table tbody tr td:nth-child(3),
+    #group-agents-table tbody tr td:nth-child(3),
+    #plugins-table tbody tr td:nth-child(3),
+    #group-plugins-table tbody tr td:nth-child(3) {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 0.5rem;
+        margin-top: 0.35rem;
+        padding-top: 0.45rem;
+    }
+
+    #agents-table tbody tr td:nth-child(3) .btn,
+    #group-agents-table tbody tr td:nth-child(3) .btn,
+    #plugins-table tbody tr td:nth-child(3) .btn,
+    #group-plugins-table tbody tr td:nth-child(3) .btn,
+    #prompts-table tbody tr td:nth-child(2) .btn,
+    #group-prompts-table tbody tr td:nth-child(2) .btn {
+        flex: 1 1 7rem;
+        justify-content: center;
+    }
+}
\ No newline at end of file
diff --git a/application/single_app/static/js/chat/chat-agents.js b/application/single_app/static/js/chat/chat-agents.js
index 22dffc6c..8a67354c 100644
--- a/application/single_app/static/js/chat/chat-agents.js
+++ b/application/single_app/static/js/chat/chat-agents.js
@@ -22,12 +22,39 @@ const agentDropdownText = agentDropdownButton
 const agentSearchInput = document.getElementById('agent-search-input');
 const agentDropdownItems = document.getElementById('agent-dropdown-items');
 
+const FLOATING_SELECTOR_DROPDOWN_CONFIG = {
+    boundary: 'viewport',
+    reference: 'toggle',
+    autoClose: 'outside',
+    popperConfig: {
+        strategy: 'fixed',
+        modifiers: [
+            {
+                name: 'preventOverflow',
+                options: {
+                    boundary: 'viewport',
+                    padding: 12,
+                },
+            },
+        ],
+    },
+};
+
 let agentSelectorController = null;
 let scopeChangeListenerInitialized = false;
 let pendingScopeNarrowingAgent = null;
 let scopeClearActionInitialized = false;
 let dropdownHideListenerInitialized = false;
 
+function notifyMobileSelectorActivated(selectorId, dropdownButtonId) {
+    window.dispatchEvent(new CustomEvent('chat:toolbar-selector-activated', {
+        detail: {
+            selectorId,
+            dropdownButtonId,
+        },
+    }));
+}
+
 function initializeAgentSelector() {
     if (agentSelectorController || !agentSelect) {
         return agentSelectorController;
@@ -44,6 +71,7 @@ function initializeAgentSelector() {
         placeholderText: 'Select an Agent',
         emptyMessage: 'No agents available',
         emptySearchMessage: 'No matching agents found',
+        dropdownConfig: FLOATING_SELECTOR_DROPDOWN_CONFIG,
     });
 
     return agentSelectorController;
@@ -440,6 +468,7 @@ export async function initializeAgentInteractions() {
                 if (modelSelectContainer) modelSelectContainer.style.display = "none";
                 // Populate agent dropdown
                 await populateAgentDropdown();
+                notifyMobileSelectorActivated('agent-select-container', 'agent-dropdown-button');
             } else {
                 agentSelectContainer.style.display = "none";
                 if (modelSelectContainer) modelSelectContainer.style.display = "block";
diff --git a/application/single_app/static/js/chat/chat-conversation-info-button.js b/application/single_app/static/js/chat/chat-conversation-info-button.js
index dfb5e0b7..4dcac532 100644
--- a/application/single_app/static/js/chat/chat-conversation-info-button.js
+++ b/application/single_app/static/js/chat/chat-conversation-info-button.js
@@ -1,4 +1,6 @@
 // chat-conversation-info-button.js
+// chat-conversation-info-button.js
+
 /**
  * Module for handling the conversation info button in the title bar
  */
@@ -36,7 +38,8 @@ export function toggleConversationInfoButton(hasActiveConversation) {
   const infoButton = document.getElementById('conversation-info-btn');
   
   if (infoButton) {
-    infoButton.style.display = hasActiveConversation ? 'inline-block' : 'none';
+    infoButton.classList.toggle('d-none', !hasActiveConversation);
+    infoButton.setAttribute('aria-hidden', String(!hasActiveConversation));
   }
 }
 
diff --git a/application/single_app/static/js/chat/chat-documents.js b/application/single_app/static/js/chat/chat-documents.js
index b1fab7f0..40be40e6 100644
--- a/application/single_app/static/js/chat/chat-documents.js
+++ b/application/single_app/static/js/chat/chat-documents.js
@@ -7,6 +7,7 @@ export const docScopeSelect = document.getElementById("doc-scope-select");
 const searchDocumentsBtn = document.getElementById("search-documents-btn");
 const docSelectEl = document.getElementById("document-select"); // Hidden select element
 const searchDocumentsContainer = document.getElementById("search-documents-container"); // Container for scope/doc/class
+const searchDocumentsMobileClose = document.getElementById("search-documents-mobile-close");
 
 // Custom dropdown elements
 const docDropdown = document.getElementById("document-dropdown");
@@ -22,6 +23,8 @@ const tagsDropdownButton = document.getElementById("tags-dropdown-button");
 const tagsDropdownMenu = document.getElementById("tags-dropdown-menu");
 const tagsDropdownItems = document.getElementById("tags-dropdown-items");
 const tagsSearchInput = document.getElementById("tags-search-input");
+const tagsDropdownLoadingSpinner = document.getElementById("tags-dropdown-loading-spinner");
+const tagsDropdownText = tagsDropdownButton ? tagsDropdownButton.querySelector('.selected-tags-text') : null;
 
 // Scope dropdown elements
 const scopeDropdown = document.getElementById("scope-dropdown");
@@ -55,6 +58,8 @@ const publicWorkspaceIdToName = {};
 let selectedPersonal = true;
 let selectedGroupIds = (window.userGroups || []).map(g => g.id);
 let selectedPublicWorkspaceIds = (window.userVisiblePublicWorkspaces || []).map(ws => ws.id);
+let hasResolvedTagsState = false;
+let tagsDropdownState = 'loading';
 
 const documentSearchController = initializeFilterableDropdownSearch({
   dropdownEl: docDropdown,
@@ -83,6 +88,273 @@ const tagsSearchController = initializeFilterableDropdownSearch({
   isAlwaysVisibleItem: item => item.getAttribute('data-search-role') === 'action',
 });
 
+const SEARCH_DOCUMENTS_MOBILE_MEDIA_QUERY = '(max-width: 991.98px)';
+
+function isSearchDocumentsMobileDrawerViewport() {
+  return typeof window !== 'undefined' && window.matchMedia(SEARCH_DOCUMENTS_MOBILE_MEDIA_QUERY).matches;
+}
+
+function setSearchDocumentsButtonActiveState(isActive) {
+  if (!searchDocumentsBtn) {
+    return;
+  }
+
+  searchDocumentsBtn.classList.toggle('active', isActive);
+  searchDocumentsBtn.setAttribute('aria-expanded', String(isActive));
+}
+
+function setTagsDropdownButtonState({ state, message, enabled }) {
+  tagsDropdownState = state;
+  hasResolvedTagsState = state !== 'loading';
+
+  if (tagsDropdownButton) {
+    tagsDropdownButton.disabled = !enabled;
+    tagsDropdownButton.setAttribute('aria-disabled', String(!enabled));
+    tagsDropdownButton.classList.toggle('is-loading', state === 'loading');
+    tagsDropdownButton.classList.toggle('is-empty', state === 'empty');
+
+    if (!enabled && typeof bootstrap !== 'undefined' && bootstrap.Dropdown) {
+      bootstrap.Dropdown.getInstance(tagsDropdownButton)?.hide();
+    }
+  }
+
+  if (tagsDropdownLoadingSpinner) {
+    tagsDropdownLoadingSpinner.classList.toggle('d-none', state !== 'loading');
+  }
+
+  if (tagsDropdownText && typeof message === 'string') {
+    tagsDropdownText.textContent = message;
+  }
+}
+
+function setTagsDropdownLoadingState(message = 'Loading tags...') {
+  tagsSearchController?.resetFilter();
+  setTagsDropdownButtonState({
+    state: 'loading',
+    message,
+    enabled: false,
+  });
+}
+
+function setTagsDropdownReadyState() {
+  setTagsDropdownButtonState({
+    state: 'ready',
+    message: 'All Tags',
+    enabled: true,
+  });
+  syncTagsDropdownButtonText();
+}
+
+function setTagsDropdownEmptyState(message = 'No tags available for this scope') {
+  tagsSearchController?.resetFilter();
+  setTagsDropdownButtonState({
+    state: 'empty',
+    message,
+    enabled: false,
+  });
+}
+
+function getSearchDocumentsOffcanvasInstance() {
+  if (!searchDocumentsContainer || !isSearchDocumentsMobileDrawerViewport()) {
+    return null;
+  }
+
+  if (typeof bootstrap === 'undefined' || !bootstrap.Offcanvas) {
+    return null;
+  }
+
+  return bootstrap.Offcanvas.getOrCreateInstance(searchDocumentsContainer, { toggle: false });
+}
+
+function closeSearchDocumentsDropdowns() {
+  if (typeof bootstrap === 'undefined' || !bootstrap.Dropdown) {
+    return;
+  }
+
+  [scopeDropdownButton, tagsDropdownButton, docDropdownButton].forEach((buttonEl) => {
+    if (!buttonEl) {
+      return;
+    }
+
+    bootstrap.Dropdown.getInstance(buttonEl)?.hide();
+  });
+}
+
+function refreshDocumentsAndTags({ source = null, showLoading = true } = {}) {
+  if (showLoading) {
+    setTagsDropdownLoadingState();
+  }
+
+  return loadAllDocs()
+    .then(() => loadTagsForScope())
+    .then(() => {
+      if (source) {
+        dispatchScopeChanged(source);
+      }
+    });
+}
+
+function getSearchDocumentsDropdownConfig() {
+  return {
+    boundary: 'viewport',
+    reference: 'toggle',
+    autoClose: 'outside',
+    popperConfig: {
+      strategy: 'fixed',
+      modifiers: [
+        {
+          name: 'preventOverflow',
+          options: {
+            boundary: 'viewport',
+            padding: 10,
+          },
+        },
+      ],
+    },
+  };
+}
+
+function sizeSearchFilterDropdown(buttonEl, menuEl, itemsContainerEl) {
+  if (!buttonEl || !menuEl) {
+    return;
+  }
+
+  const fieldContainer = buttonEl.closest('.chat-search-panel-field');
+  const containerWidth = fieldContainer ? fieldContainer.offsetWidth : buttonEl.offsetWidth || 280;
+
+  menuEl.style.width = `${containerWidth}px`;
+  menuEl.style.maxWidth = `${containerWidth}px`;
+  menuEl.style.zIndex = '1060';
+
+  const menuRect = menuEl.getBoundingClientRect();
+  const viewportHeight = window.innerHeight;
+  const maxPossibleHeight = Math.max(180, viewportHeight - menuRect.top - 10);
+
+  menuEl.style.maxHeight = `${maxPossibleHeight}px`;
+
+  if (!itemsContainerEl) {
+    return;
+  }
+
+  const searchContainer = menuEl.querySelector('.chat-dropdown-search, .document-search-container');
+  const searchHeight = searchContainer ? searchContainer.offsetHeight : 40;
+  itemsContainerEl.style.maxHeight = `${Math.max(120, maxPossibleHeight - searchHeight - 16)}px`;
+  itemsContainerEl.style.overflowY = 'auto';
+}
+
+function resetSearchFilterDropdownStyles(menuEl, itemsContainerEl) {
+  if (menuEl) {
+    menuEl.style.maxHeight = '';
+    menuEl.style.maxWidth = '';
+    menuEl.style.width = '';
+    menuEl.style.zIndex = '';
+  }
+
+  if (itemsContainerEl) {
+    itemsContainerEl.style.maxHeight = '';
+    itemsContainerEl.style.overflowY = '';
+  }
+}
+
+function initializeSearchFilterDropdown({
+  dropdownEl,
+  buttonEl,
+  menuEl,
+  itemsContainerEl,
+  searchInputEl,
+  searchController,
+  onShown,
+}) {
+  if (!dropdownEl || !buttonEl || !menuEl) {
+    return;
+  }
+
+  new bootstrap.Dropdown(buttonEl, getSearchDocumentsDropdownConfig());
+
+  dropdownEl.addEventListener('show.bs.dropdown', function() {
+    if (searchInputEl) {
+      searchInputEl.value = '';
+    }
+
+    searchController?.applyFilter('');
+  });
+
+  dropdownEl.addEventListener('shown.bs.dropdown', function() {
+    sizeSearchFilterDropdown(buttonEl, menuEl, itemsContainerEl);
+    onShown?.();
+
+    if (searchInputEl) {
+      setTimeout(() => searchInputEl.focus(), 50);
+    }
+  });
+
+  dropdownEl.addEventListener('hidden.bs.dropdown', function() {
+    searchController?.resetFilter();
+    resetSearchFilterDropdownStyles(menuEl, itemsContainerEl);
+  });
+}
+
+export async function showSearchDocumentsPanel() {
+  if (!searchDocumentsContainer) {
+    return false;
+  }
+
+  setSearchDocumentsButtonActiveState(true);
+  searchDocumentsContainer.style.display = 'block';
+
+  const offcanvasInstance = getSearchDocumentsOffcanvasInstance();
+  if (!offcanvasInstance || searchDocumentsContainer.classList.contains('show')) {
+    return true;
+  }
+
+  await new Promise((resolve) => {
+    searchDocumentsContainer.addEventListener('shown.bs.offcanvas', () => resolve(), { once: true });
+    offcanvasInstance.show();
+  });
+
+  return true;
+}
+
+export function hideSearchDocumentsPanel() {
+  if (!searchDocumentsContainer) {
+    return false;
+  }
+
+  closeSearchDocumentsDropdowns();
+
+  const offcanvasInstance = getSearchDocumentsOffcanvasInstance();
+  if (offcanvasInstance && searchDocumentsContainer.classList.contains('show')) {
+    offcanvasInstance.hide();
+    return true;
+  }
+
+  setSearchDocumentsButtonActiveState(false);
+  searchDocumentsContainer.style.display = 'none';
+  return true;
+}
+
+if (searchDocumentsContainer) {
+  searchDocumentsContainer.addEventListener('shown.bs.offcanvas', () => {
+    setSearchDocumentsButtonActiveState(true);
+  });
+
+  searchDocumentsContainer.addEventListener('hidden.bs.offcanvas', () => {
+    closeSearchDocumentsDropdowns();
+
+    if (isSearchDocumentsMobileDrawerViewport()) {
+      searchDocumentsContainer.style.display = 'none';
+    }
+
+    setSearchDocumentsButtonActiveState(false);
+  });
+}
+
+searchDocumentsMobileClose?.addEventListener('click', (event) => {
+  event.preventDefault();
+  event.stopPropagation();
+  hideSearchDocumentsPanel();
+});
+
 /* ---------------------------------------------------------------------------
    Get Effective Scopes — used by chat-messages.js and internally
 --------------------------------------------------------------------------- */
@@ -161,7 +433,7 @@ export async function toggleScopeLock(conversationId, newState) {
   updateHeaderLockIcon();
 
   // Reload docs for the new scope
-  loadAllDocs().then(() => { loadTagsForScope(); });
+  refreshDocumentsAndTags();
 }
 
 /**
@@ -180,7 +452,7 @@ export function restoreScopeLockState(lockState, contexts) {
 
     rebuildScopeDropdownWithLock();
     // Reload docs for the locked scope
-    loadAllDocs().then(() => { loadTagsForScope(); });
+    refreshDocumentsAndTags();
   } else {
     // Not locked (null or false) — rebuild dropdown normally
     buildScopeDropdown();
@@ -218,7 +490,7 @@ export function resetScopeLock(options = {}) {
   updateHeaderLockIcon();
 
   // Reload documents for the full "All" scope
-  loadAllDocs().then(() => { loadTagsForScope(); });
+  refreshDocumentsAndTags();
 }
 
 /* ---------------------------------------------------------------------------
@@ -573,11 +845,7 @@ function dispatchScopeChanged(source = 'workspace') {
 }
 
 function runScopeRefreshPipeline(source = 'workspace') {
-  return loadAllDocs()
-    .then(() => loadTagsForScope())
-    .then(() => {
-      dispatchScopeChanged(source);
-    });
+  return refreshDocumentsAndTags({ source });
 }
 
 export function setEffectiveScopes(nextScopes = {}, options = {}) {
@@ -1155,8 +1423,6 @@ export async function loadTagsForScope() {
     const hasItems = allTags.length > 0 || classificationItems.length > 0;
 
     if (hasItems) {
-      showTagsDropdown();
-
       // Populate hidden select with tags and classifications
       allTags.forEach(tag => {
         const option = document.createElement('option');
@@ -1263,24 +1529,23 @@ export async function loadTagsForScope() {
 
         tagsSearchController?.applyFilter(tagsSearchInput ? tagsSearchInput.value : '');
       }
+
+      showTagsDropdown();
     } else {
       hideTagsDropdown();
     }
   } catch (error) {
     console.error('Error loading tags:', error);
-    hideTagsDropdown();
+    hideTagsDropdown('Unable to load tags');
   }
 }
 
 function showTagsDropdown() {
-  if (tagsDropdown) tagsDropdown.style.display = 'block';
+  setTagsDropdownReadyState();
 }
 
-function hideTagsDropdown() {
-  if (tagsDropdown) tagsDropdown.style.display = 'none';
-  if (tagsSearchController) {
-    tagsSearchController.resetFilter();
-  }
+function hideTagsDropdown(message = 'No tags available for this scope') {
+  setTagsDropdownEmptyState(message);
 }
 
 function resetTagSelectionState() {
@@ -1305,7 +1570,7 @@ function resetTagSelectionState() {
    Sync Tags Dropdown Button Text with Selection State
 --------------------------------------------------------------------------- */
 function syncTagsDropdownButtonText() {
-  if (!tagsDropdownButton || !tagsDropdownItems) return;
+  if (!tagsDropdownButton || !tagsDropdownItems || tagsDropdownState !== 'ready') return;
 
   const checkedItems = tagsDropdownItems.querySelectorAll('.tag-checkbox:checked');
   const count = checkedItems.length;
@@ -1329,8 +1594,7 @@ export async function ensureSearchDocumentsVisible() {
     return false;
   }
 
-  searchDocumentsBtn.classList.add('active');
-  searchDocumentsContainer.style.display = 'block';
+  await showSearchDocumentsPanel();
 
   if (scopeLocked === true) {
     rebuildScopeDropdownWithLock();
@@ -1338,8 +1602,7 @@ export async function ensureSearchDocumentsVisible() {
     buildScopeDropdown();
   }
 
-  await loadAllDocs();
-  await loadTagsForScope();
+  await refreshDocumentsAndTags({ showLoading: !hasResolvedTagsState });
 
   try {
     const dropdownInstance = bootstrap.Dropdown.getInstance(docDropdownButton);
@@ -1383,11 +1646,10 @@ export function openTagsDropdown() {
     return false;
   }
 
-  if (tagsDropdown.style.display === 'none' && (!tagsDropdownItems || !tagsDropdownItems.children.length)) {
+  if (tagsDropdownState !== 'ready' || !tagsDropdownItems || !tagsDropdownItems.children.length) {
     return false;
   }
 
-  showTagsDropdown();
   return openDropdown(tagsDropdownButton);
 }
 
@@ -1396,8 +1658,6 @@ export function openTagsDropdown() {
 --------------------------------------------------------------------------- */
 export function getSelectedTags() {
   if (!chatTagsFilter) return [];
-  // Check if the tags dropdown is visible (the hidden select is always display:none via d-none class)
-  if (tagsDropdown && tagsDropdown.style.display === 'none') return [];
   return Array.from(chatTagsFilter.selectedOptions).map(opt => opt.value);
 }
 
@@ -1604,14 +1864,12 @@ if (tagsDropdownItems) {
 
 if (searchDocumentsBtn) {
   searchDocumentsBtn.addEventListener("click", function () {
-    this.classList.toggle("active");
-
     if (!searchDocumentsContainer) return;
 
     if (this.classList.contains("active")) {
-      ensureSearchDocumentsVisible();
+      hideSearchDocumentsPanel();
     } else {
-      searchDocumentsContainer.style.display = "none";
+      ensureSearchDocumentsVisible();
     }
   });
 }
@@ -1716,8 +1974,13 @@ document.addEventListener('DOMContentLoaded', function() {
     try {
       const scopeDropdownEl = document.getElementById('scope-dropdown');
       if (scopeDropdownEl) {
-        new bootstrap.Dropdown(scopeDropdownButton, {
-          autoClose: 'outside'
+        initializeSearchFilterDropdown({
+          dropdownEl: scopeDropdownEl,
+          buttonEl: scopeDropdownButton,
+          menuEl: scopeDropdownMenu,
+          itemsContainerEl: scopeDropdownItems,
+          searchInputEl: scopeSearchInput,
+          searchController: scopeSearchController,
         });
       }
     } catch (err) {
@@ -1725,58 +1988,33 @@ document.addEventListener('DOMContentLoaded', function() {
     }
   }
 
+  if (tagsDropdown && tagsDropdownButton) {
+    try {
+      initializeSearchFilterDropdown({
+        dropdownEl: tagsDropdown,
+        buttonEl: tagsDropdownButton,
+        menuEl: tagsDropdownMenu,
+        itemsContainerEl: tagsDropdownItems,
+        searchInputEl: tagsSearchInput,
+        searchController: tagsSearchController,
+      });
+    } catch (err) {
+      console.error("Error initializing tags dropdown:", err);
+    }
+  }
+
   // If search documents button exists, it needs to be clicked to show controls
   if (searchDocumentsBtn && docDropdownButton) {
     try {
       if (docDropdown) {
-        // Initialize Bootstrap dropdown with the right configuration
-        new bootstrap.Dropdown(docDropdownButton, {
-          boundary: 'viewport',
-          reference: 'toggle',
-          autoClose: 'outside',
-          popperConfig: {
-            strategy: 'fixed',
-            modifiers: [
-              {
-                name: 'preventOverflow',
-                options: {
-                  boundary: 'viewport',
-                  padding: 10
-                }
-              }
-            ]
-          }
-        });
-
-        // Clear search when opening
-        docDropdown.addEventListener('show.bs.dropdown', function() {
-          if (docSearchInput) {
-            docSearchInput.value = '';
-          }
-          documentSearchController?.applyFilter('');
-        });
-
-        // Adjust sizing and focus search when shown
-        docDropdown.addEventListener('shown.bs.dropdown', function() {
-          initializeDocumentDropdown();
-          if (docSearchInput) {
-            setTimeout(() => docSearchInput.focus(), 50);
-          }
-        });
-
-        // Clean up inline styles and reset state when hidden
-        docDropdown.addEventListener('hidden.bs.dropdown', function() {
-          documentSearchController?.resetFilter();
-          // Clear inline styles set by initializeDocumentDropdown so they
-          // don't interfere with Bootstrap's positioning on next open
-          if (docDropdownMenu) {
-            docDropdownMenu.style.maxHeight = '';
-            docDropdownMenu.style.maxWidth = '';
-            docDropdownMenu.style.width = '';
-          }
-          if (docDropdownItems) {
-            docDropdownItems.style.maxHeight = '';
-          }
+        initializeSearchFilterDropdown({
+          dropdownEl: docDropdown,
+          buttonEl: docDropdownButton,
+          menuEl: docDropdownMenu,
+          itemsContainerEl: docDropdownItems,
+          searchInputEl: docSearchInput,
+          searchController: documentSearchController,
+          onShown: initializeDocumentDropdown,
         });
       }
     } catch (err) {
diff --git a/application/single_app/static/js/chat/chat-enhanced-citations.js b/application/single_app/static/js/chat/chat-enhanced-citations.js
index 561a7831..789e7821 100644
--- a/application/single_app/static/js/chat/chat-enhanced-citations.js
+++ b/application/single_app/static/js/chat/chat-enhanced-citations.js
@@ -60,7 +60,7 @@ export async function showEnhancedCitationModal(docId, pageNumberOrTimestamp, ci
             showImageModal(docId, docMetadata.file_name);
             break;
         case 'pdf':
-            showPdfModal(docId, pageNumberOrTimestamp, citationId);
+            await showPdfModal(docId, pageNumberOrTimestamp, citationId);
             break;
         case 'video':
             // For video/audio files, pageNumberOrTimestamp is actually the chunk_sequence (seconds offset)
@@ -127,13 +127,65 @@ export function showImageModal(docId, fileName) {
     modalInstance.show();
 }
 
+function fallBackToTextCitation(citationId) {
+    if (!citationId) {
+        return;
+    }
+
+    import('./chat-citations.js').then(module => {
+        module.fetchCitedText(citationId);
+    }).catch(error => {
+        console.error('Failed to fall back to text citation:', error);
+    });
+}
+
+function revokePdfFrameObjectUrl(pdfFrame) {
+    const currentObjectUrl = pdfFrame.dataset.objectUrl;
+    if (!currentObjectUrl) {
+        return;
+    }
+
+    URL.revokeObjectURL(currentObjectUrl);
+    delete pdfFrame.dataset.objectUrl;
+}
+
+function bindPdfModalCleanup(pdfModal, pdfFrame) {
+    if (pdfModal.dataset.cleanupBound === 'true') {
+        return;
+    }
+
+    pdfModal.addEventListener('hidden.bs.modal', () => {
+        revokePdfFrameObjectUrl(pdfFrame);
+        pdfFrame.removeAttribute('src');
+    });
+    pdfModal.dataset.cleanupBound = 'true';
+}
+
+async function getResponseErrorMessage(response, fallbackMessage) {
+    const contentType = response.headers.get('Content-Type') || '';
+
+    if (contentType.includes('application/json')) {
+        const errorData = await response.json().catch(() => null);
+        if (errorData && errorData.error) {
+            return errorData.error;
+        }
+    }
+
+    const errorText = await response.text().catch(() => '');
+    if (errorText) {
+        return errorText;
+    }
+
+    return fallbackMessage;
+}
+
 /**
  * Show PDF modal using server-side rendering
  * @param {string} docId - Document ID  
  * @param {string|number} pageNumber - Page number
  * @param {string} citationId - Citation ID for fallback
  */
-export function showPdfModal(docId, pageNumber, citationId) {
+export async function showPdfModal(docId, pageNumber, citationId) {
     console.log(`Showing PDF modal for docId: ${docId}, page: ${pageNumber}`);
     showLoadingIndicator();
     
@@ -149,31 +201,53 @@ export function showPdfModal(docId, pageNumber, citationId) {
     
     const pdfFrame = pdfModal.querySelector('#pdfFrame');
     const pdfTitle = pdfModal.querySelector('#pdfModalTitle');
-    
-    // Set the PDF source directly to our server-side rendering endpoint
-    pdfFrame.src = pdfUrl;
+    bindPdfModalCleanup(pdfModal, pdfFrame);
+    revokePdfFrameObjectUrl(pdfFrame);
+    pdfFrame.removeAttribute('src');
     pdfTitle.textContent = `PDF Document - Page ${pageNumber}`;
-    
-    // Handle loading and error states
-    pdfFrame.onload = function() {
-        hideLoadingIndicator();
-        console.log('PDF loaded successfully');
-    };
-    
-    pdfFrame.onerror = function() {
-        hideLoadingIndicator();
-        console.error('Failed to load PDF');
-        showToast('Failed to load PDF document', 'error');
-        
-        // Fall back to text citation
-        import('./chat-citations.js').then(module => {
-            module.fetchCitedText(citationId);
+
+    try {
+        const response = await fetch(pdfUrl, {
+            credentials: 'same-origin',
         });
-    };
-    
-    // Show the modal
-    const modalInstance = new bootstrap.Modal(pdfModal);
-    modalInstance.show();
+
+        if (!response.ok) {
+            const errorMessage = await getResponseErrorMessage(
+                response,
+                `Failed to load PDF document (${response.status}).`
+            );
+            throw new Error(errorMessage);
+        }
+
+        const pdfBlob = await response.blob();
+        const pdfObjectUrl = URL.createObjectURL(pdfBlob);
+        const viewerPage = response.headers.get('X-Sub-PDF-Page') || '1';
+
+        pdfFrame.dataset.objectUrl = pdfObjectUrl;
+        pdfFrame.onload = function() {
+            hideLoadingIndicator();
+            console.log(`PDF loaded successfully for docId: ${docId}, page: ${pageNumber}`);
+        };
+
+        pdfFrame.onerror = function() {
+            hideLoadingIndicator();
+            revokePdfFrameObjectUrl(pdfFrame);
+            console.error(`Failed to render PDF frame for docId: ${docId}, page: ${pageNumber}`);
+            showToast('Failed to render PDF document.', 'danger');
+            fallBackToTextCitation(citationId);
+        };
+
+        pdfFrame.src = `${pdfObjectUrl}#page=${encodeURIComponent(viewerPage)}`;
+
+        const modalInstance = bootstrap.Modal.getOrCreateInstance(pdfModal);
+        modalInstance.show();
+    } catch (error) {
+        hideLoadingIndicator();
+        revokePdfFrameObjectUrl(pdfFrame);
+        console.error('Failed to load PDF document:', error);
+        showToast(error.message || 'Failed to load PDF document.', 'danger');
+        fallBackToTextCitation(citationId);
+    }
 }
 
 /**
@@ -350,21 +424,10 @@ async function downloadTabularFile(downloadUrl, fallbackFilename, downloadBtn) {
         });
 
         if (!response.ok) {
-            let errorMessage = `Could not download file (${response.status}).`;
-            const contentType = response.headers.get('Content-Type') || '';
-
-            if (contentType.includes('application/json')) {
-                const errorData = await response.json().catch(() => null);
-                if (errorData && errorData.error) {
-                    errorMessage = errorData.error;
-                }
-            } else {
-                const errorText = await response.text().catch(() => '');
-                if (errorText) {
-                    errorMessage = errorText;
-                }
-            }
-
+            const errorMessage = await getResponseErrorMessage(
+                response,
+                `Could not download file (${response.status}).`
+            );
             throw new Error(errorMessage);
         }
 
diff --git a/application/single_app/static/js/chat/chat-mobile-toolbar.js b/application/single_app/static/js/chat/chat-mobile-toolbar.js
new file mode 100644
index 00000000..3bec4506
--- /dev/null
+++ b/application/single_app/static/js/chat/chat-mobile-toolbar.js
@@ -0,0 +1,163 @@
+// chat-mobile-toolbar.js
+
+function isMobileToolbarViewport() {
+    return window.matchMedia('(max-width: 991.98px)').matches;
+}
+
+function getMobileToolsOffcanvas(panelElement) {
+    if (!panelElement || typeof bootstrap === 'undefined' || !bootstrap.Offcanvas) {
+        return null;
+    }
+
+    return bootstrap.Offcanvas.getOrCreateInstance(panelElement, { toggle: false });
+}
+
+function hideMobileSelectorDropdown(dropdownButtonId) {
+    if (!dropdownButtonId || typeof bootstrap === 'undefined' || !bootstrap.Dropdown) {
+        return;
+    }
+
+    const dropdownButton = document.getElementById(dropdownButtonId);
+    if (!dropdownButton) {
+        return;
+    }
+
+    bootstrap.Dropdown.getInstance(dropdownButton)?.hide();
+}
+
+function closeOpenMobileSelectorDropdowns() {
+    hideMobileSelectorDropdown('model-dropdown-button');
+    hideMobileSelectorDropdown('prompt-dropdown-button');
+    hideMobileSelectorDropdown('agent-dropdown-button');
+}
+
+function revealSelectorInMobileDrawer({ selectorId, dropdownButtonId }) {
+    if (!isMobileToolbarViewport() || !selectorId) {
+        return;
+    }
+
+    const selectorElement = document.getElementById(selectorId);
+    if (!selectorElement || window.getComputedStyle(selectorElement).display === 'none') {
+        return;
+    }
+
+    selectorElement.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+
+    if (!dropdownButtonId || typeof bootstrap === 'undefined' || !bootstrap.Dropdown) {
+        return;
+    }
+
+    const dropdownButton = document.getElementById(dropdownButtonId);
+    if (!dropdownButton) {
+        return;
+    }
+
+    window.setTimeout(() => {
+        dropdownButton.focus({ preventScroll: true });
+        bootstrap.Dropdown.getOrCreateInstance(dropdownButton, {
+            autoClose: 'outside',
+        }).show();
+    }, 140);
+}
+
+function moveSurfaceToSlot(surfaceElement, slotElement) {
+    if (!surfaceElement || !slotElement || surfaceElement.parentElement === slotElement) {
+        return;
+    }
+
+    slotElement.appendChild(surfaceElement);
+}
+
+function hideMobileToolsPanel(panelElement) {
+    if (!isMobileToolbarViewport()) {
+        return;
+    }
+
+    getMobileToolsOffcanvas(panelElement)?.hide();
+}
+
+function initializeChatMobileToolbar() {
+    const mobileToolsToggle = document.getElementById('chat-mobile-tools-toggle');
+    const mobileToolsClose = document.getElementById('chat-mobile-tools-close');
+    const mobileToolsPanel = document.getElementById('chat-mobile-tools-panel');
+    const primarySurface = document.getElementById('chat-toolbar-primary-surface');
+    const toolsSurface = document.getElementById('chat-toolbar-tools-surface');
+    const selectorsSurface = document.getElementById('chat-toolbar-selectors-surface');
+    const desktopPrimarySlot = document.getElementById('chat-toolbar-desktop-primary-slot');
+    const desktopToolsSlot = document.getElementById('chat-toolbar-desktop-tools-slot');
+    const desktopSelectorsSlot = document.getElementById('chat-toolbar-desktop-selectors-slot');
+    const mobileToolsSlot = document.getElementById('chat-toolbar-mobile-tools-slot');
+    const mobilePrimarySlot = document.getElementById('chat-toolbar-mobile-primary-slot');
+    const mobileSelectorsSlot = document.getElementById('chat-toolbar-mobile-selectors-slot');
+
+    if (!mobileToolsToggle || !mobileToolsPanel || !primarySurface || !toolsSurface || !selectorsSurface) {
+        return;
+    }
+
+    const dismissButtonIds = [
+        'image-generate-btn',
+        'search-documents-btn',
+        'choose-file-btn',
+        'search-web-btn',
+        'reasoning-toggle-btn',
+        'tts-autoplay-toggle-btn',
+    ];
+
+    const syncToolbarLayout = () => {
+        if (isMobileToolbarViewport()) {
+            moveSurfaceToSlot(primarySurface, mobilePrimarySlot);
+            moveSurfaceToSlot(toolsSurface, mobileToolsSlot);
+            moveSurfaceToSlot(selectorsSurface, mobileSelectorsSlot);
+            return;
+        }
+
+        closeOpenMobileSelectorDropdowns();
+        moveSurfaceToSlot(primarySurface, desktopPrimarySlot);
+        moveSurfaceToSlot(toolsSurface, desktopToolsSlot);
+        moveSurfaceToSlot(selectorsSurface, desktopSelectorsSlot);
+
+        mobileToolsToggle.classList.remove('is-expanded');
+        mobileToolsToggle.setAttribute('aria-expanded', 'false');
+        getMobileToolsOffcanvas(mobileToolsPanel)?.hide();
+    };
+
+    mobileToolsPanel.addEventListener('shown.bs.offcanvas', () => {
+        mobileToolsToggle.classList.add('is-expanded');
+        mobileToolsToggle.setAttribute('aria-expanded', 'true');
+    });
+
+    mobileToolsPanel.addEventListener('hidden.bs.offcanvas', () => {
+        closeOpenMobileSelectorDropdowns();
+        mobileToolsToggle.classList.remove('is-expanded');
+        mobileToolsToggle.setAttribute('aria-expanded', 'false');
+    });
+
+    mobileToolsClose?.addEventListener('click', (event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        closeOpenMobileSelectorDropdowns();
+        hideMobileToolsPanel(mobileToolsPanel);
+    });
+
+    window.addEventListener('chat:toolbar-selector-activated', (event) => {
+        revealSelectorInMobileDrawer(event.detail || {});
+    });
+
+    dismissButtonIds.forEach((buttonId) => {
+        const button = document.getElementById(buttonId);
+        if (!button) {
+            return;
+        }
+
+        button.addEventListener('click', () => {
+            window.setTimeout(() => {
+                hideMobileToolsPanel(mobileToolsPanel);
+            }, 0);
+        });
+    });
+
+    window.addEventListener('resize', syncToolbarLayout);
+    syncToolbarLayout();
+}
+
+initializeChatMobileToolbar();
\ No newline at end of file
diff --git a/application/single_app/static/js/chat/chat-model-selector.js b/application/single_app/static/js/chat/chat-model-selector.js
index 3c4c5daa..9a3048a8 100644
--- a/application/single_app/static/js/chat/chat-model-selector.js
+++ b/application/single_app/static/js/chat/chat-model-selector.js
@@ -14,6 +14,24 @@ const modelDropdownText = modelDropdownButton
 const modelSearchInput = document.getElementById('model-search-input');
 const modelDropdownItems = document.getElementById('model-dropdown-items');
 
+const FLOATING_SELECTOR_DROPDOWN_CONFIG = {
+    boundary: 'viewport',
+    reference: 'toggle',
+    autoClose: 'outside',
+    popperConfig: {
+        strategy: 'fixed',
+        modifiers: [
+            {
+                name: 'preventOverflow',
+                options: {
+                    boundary: 'viewport',
+                    padding: 12,
+                },
+            },
+        ],
+    },
+};
+
 let modelSelectorController = null;
 let scopeChangeListenerInitialized = false;
 let suppressScopeNarrowing = false;
@@ -484,6 +502,7 @@ export function initializeModelSelector() {
             emptyMessage: 'No models available',
             emptySearchMessage: 'No matching models found',
             getOptionSearchText: option => option.dataset.searchText || option.textContent.trim(),
+            dropdownConfig: FLOATING_SELECTOR_DROPDOWN_CONFIG,
         });
     }
 
diff --git a/application/single_app/static/js/chat/chat-onload.js b/application/single_app/static/js/chat/chat-onload.js
index 16de2096..77d329e2 100644
--- a/application/single_app/static/js/chat/chat-onload.js
+++ b/application/single_app/static/js/chat/chat-onload.js
@@ -10,6 +10,7 @@ import {
     filterDocumentsBySelectedTags,
     setScopeFromUrlParam,
     ensureSearchDocumentsVisible,
+    showSearchDocumentsPanel,
     openScopeDropdown,
     openTagsDropdown,
 } from "./chat-documents.js";
@@ -204,13 +205,12 @@ window.addEventListener('DOMContentLoaded', async () => {
               })
           })
           .then(response => response.json())
-          .then(data => {
+          .then(async data => {
               if (data.message) {
                   console.log('Active public workspace set successfully');
                   
                   // Auto-open search documents section
-                  localSearchDocsBtn.classList.add("active");
-                  searchDocumentsContainer.style.display = "block";
+                  await showSearchDocumentsPanel();
                   
                   // Set scope to public
                   setScopeFromUrlParam("public", { workspaceId: workspaceParam });
@@ -238,8 +238,7 @@ window.addEventListener('DOMContentLoaded', async () => {
           });
       } else if (localSearchDocsParam && localSearchDocsBtn && localDocScopeSel && localDocSelectEl && searchDocumentsContainer) {
           console.log("Handling document URL parameters."); // Log
-          localSearchDocsBtn.classList.add("active");
-          searchDocumentsContainer.style.display = "block";
+          await showSearchDocumentsPanel();
           if (localDocScopeParam) {
               setScopeFromUrlParam(localDocScopeParam, { groupId: groupIdParam, workspaceId: workspaceIdParam });
           }
@@ -342,8 +341,7 @@ window.addEventListener('DOMContentLoaded', async () => {
           }
       } else if (openSearchParam && scopeParam === "public" && localSearchDocsBtn && localDocScopeSel && searchDocumentsContainer) {
           // Handle openSearch=1&scope=public from public directory chat button
-          localSearchDocsBtn.classList.add("active");
-          searchDocumentsContainer.style.display = "block";
+          await showSearchDocumentsPanel();
           setScopeFromUrlParam("public");
           populateDocumentSelectScope();
           loadTagsForScope();
diff --git a/application/single_app/static/js/chat/chat-prompts.js b/application/single_app/static/js/chat/chat-prompts.js
index 828a5dbd..54f656a8 100644
--- a/application/single_app/static/js/chat/chat-prompts.js
+++ b/application/single_app/static/js/chat/chat-prompts.js
@@ -24,6 +24,15 @@ let userPrompts = [];
 let groupPrompts = [];
 let publicPrompts = [];
 
+function notifyMobileSelectorActivated(selectorId, dropdownButtonId) {
+  window.dispatchEvent(new CustomEvent("chat:toolbar-selector-activated", {
+    detail: {
+      selectorId,
+      dropdownButtonId,
+    },
+  }));
+}
+
 function getPreloadedPromptOptions() {
   return Array.isArray(window.chatPromptOptions) ? window.chatPromptOptions : [];
 }
@@ -242,7 +251,9 @@ export function initializePromptInteractions() {
 
             if (isActive) {
                 promptSelectionContainer.style.display = "block";
-                loadAllPrompts();
+            loadAllPrompts().finally(() => {
+              notifyMobileSelectorActivated("prompt-selection-container", "prompt-dropdown-button");
+            });
                 userInput.classList.add("with-prompt-active");
                 userInput.focus();
                 updateSendButtonVisibility();
diff --git a/application/single_app/static/js/chat/chat-searchable-select.js b/application/single_app/static/js/chat/chat-searchable-select.js
index c8acbcfd..51990190 100644
--- a/application/single_app/static/js/chat/chat-searchable-select.js
+++ b/application/single_app/static/js/chat/chat-searchable-select.js
@@ -203,6 +203,7 @@ export function createSearchableSingleSelect({
     emptySearchMessage,
     getOptionLabel,
     getOptionSearchText,
+    dropdownConfig,
 }) {
     if (!selectEl || !dropdownEl || !buttonEl || !buttonTextEl || !menuEl || !searchInputEl || !itemsContainerEl) {
         return null;
@@ -210,6 +211,9 @@ export function createSearchableSingleSelect({
 
     const readOptionLabel = getOptionLabel || (option => option.textContent.trim());
     const readOptionSearchText = getOptionSearchText || (option => option.textContent.trim());
+    const resolvedDropdownConfig = dropdownConfig || {
+        autoClose: 'outside',
+    };
 
     const getTopLevelEntries = () => Array.from(selectEl.children).filter(child => {
         const tagName = child.tagName;
@@ -339,9 +343,7 @@ export function createSearchableSingleSelect({
         selectEl.dispatchEvent(new Event('change', { bubbles: true }));
 
         try {
-            bootstrap.Dropdown.getOrCreateInstance(buttonEl, {
-                autoClose: 'outside'
-            }).hide();
+            bootstrap.Dropdown.getOrCreateInstance(buttonEl, resolvedDropdownConfig).hide();
         } catch (error) {
             console.error('Error hiding dropdown after selection:', error);
         }
@@ -405,9 +407,7 @@ export function createSearchableSingleSelect({
     });
 
     try {
-        bootstrap.Dropdown.getOrCreateInstance(buttonEl, {
-            autoClose: 'outside'
-        });
+        bootstrap.Dropdown.getOrCreateInstance(buttonEl, resolvedDropdownConfig);
     } catch (error) {
         console.error('Error initializing searchable select:', error);
     }
diff --git a/application/single_app/static/js/chat/chat-toast.js b/application/single_app/static/js/chat/chat-toast.js
index f255bc23..6b255575 100644
--- a/application/single_app/static/js/chat/chat-toast.js
+++ b/application/single_app/static/js/chat/chat-toast.js
@@ -1,8 +1,82 @@
 // chat-toast.js
 
+const preferredToastContainerSelector = '[data-toast-container="preferred"]';
+const syncedToastContainers = new WeakSet();
+
+function getToastContainer() {
+  return document.querySelector(preferredToastContainerSelector) || document.getElementById("toast-container");
+}
+
+function getToastAnchor(container) {
+  const anchorId = container?.dataset.toastAnchor;
+  if (!anchorId) {
+    return null;
+  }
+
+  return document.getElementById(anchorId);
+}
+
+function syncToastContainerPosition(container) {
+  if (!container) {
+    return;
+  }
+
+  if (!container.dataset.toastAnchor) {
+    return;
+  }
+
+  const defaultTop = container.dataset.toastDefaultTop || "16px";
+  const anchor = getToastAnchor(container);
+
+  if (!anchor || anchor.offsetParent === null || !anchor.classList.contains("is-ready")) {
+    container.style.top = defaultTop;
+    return;
+  }
+
+  const gap = Number.parseInt(container.dataset.toastGap || "12", 10);
+  const containerPaddingTop = Number.parseFloat(window.getComputedStyle(container).paddingTop || "0");
+  const anchorRect = anchor.getBoundingClientRect();
+  const anchoredTop = Math.max(16, Math.ceil(anchorRect.bottom + gap - containerPaddingTop));
+
+  container.style.top = `${anchoredTop}px`;
+}
+
+function ensureToastContainerAnchorSync(container) {
+  if (!container || !container.dataset.toastAnchor || syncedToastContainers.has(container)) {
+    return;
+  }
+
+  syncedToastContainers.add(container);
+
+  const reposition = () => syncToastContainerPosition(container);
+  const anchor = getToastAnchor(container);
+
+  window.addEventListener("resize", reposition);
+
+  if (window.ResizeObserver && anchor) {
+    const resizeObserver = new ResizeObserver(reposition);
+    resizeObserver.observe(anchor);
+  }
+
+  if (window.MutationObserver && anchor) {
+    const mutationObserver = new MutationObserver(reposition);
+    mutationObserver.observe(anchor, {
+      attributes: true,
+      attributeFilter: ["class", "style"],
+    });
+  }
+
+  reposition();
+}
+
 export function showToast(message, variant = "danger") {
-  const container = document.getElementById("toast-container");
-  if (!container) return;
+  const container = getToastContainer();
+  if (!container) {
+    return;
+  }
+
+  ensureToastContainerAnchorSync(container);
+  syncToastContainerPosition(container);
 
   const id = "toast-" + Date.now();
   const toastEl = document.createElement("div");
diff --git a/application/single_app/static/js/control-center.js b/application/single_app/static/js/control-center.js
index 639e9466..1c8a02d7 100644
--- a/application/single_app/static/js/control-center.js
+++ b/application/single_app/static/js/control-center.js
@@ -23,6 +23,14 @@ function parseDateKey(dateStr) {
     return Number.isNaN(parsed.getTime()) ? null : parsed;
 }
 
+const ACTIVITY_LOGS_LAYOUT_PRESET_STORAGE_KEY = 'simplechat_activityLogsLayoutPreset';
+const ACTIVITY_LOGS_LAYOUT_PRESETS = ['balanced', 'details-focus', 'compact'];
+const ACTIVITY_LOGS_LAYOUT_HINTS = {
+    balanced: 'Balanced view keeps the five log columns readable. Switch to Details Focus or click a row for the full raw log.',
+    'details-focus': 'Details Focus widens the Details column for longer entries. Click a row for the full raw log.',
+    compact: 'Compact view prioritizes faster scanning. Click a row for the full raw log when details are truncated.'
+};
+
 // Group Table Sorter - similar to user table but for groups
 class GroupTableSorter {
     constructor(tableId) {
@@ -178,12 +186,17 @@ class ControlCenter {
         this.activityLogsPerPage = 50;
         this.activityLogsSearch = '';
         this.activityTypeFilter = 'all';
+        this.activityLogsLayoutPreset = 'balanced';
+        this.currentActivityLogUserMap = {};
+        this.currentRawLogJson = '';
         
         this.init();
     }
     
     init() {
         this.bindEvents();
+        this.loadActivityLogsLayoutPreset();
+        this.applyActivityLogsLayoutPreset(this.activityLogsLayoutPreset);
         
         // Check if user has admin role (passed from backend)
         const hasAdminRole = window.hasControlCenterAdmin === true;
@@ -219,17 +232,8 @@ class ControlCenter {
             setTimeout(() => this.loadPublicWorkspaces(), 100);
         });
         
-        document.getElementById('activity-logs-tab')?.addEventListener('click', () => {
-            console.log('Activity Logs tab clicked!');
-            setTimeout(() => {
-                console.log('Calling loadActivityLogs...');
-                this.loadActivityLogs();
-            }, 100);
-        });
-        
-        // Also use shown.bs.tab as backup
         document.getElementById('activity-logs-tab')?.addEventListener('shown.bs.tab', () => {
-            console.log('Activity Logs tab shown event fired');
+            this.loadActivityLogs();
         });
         
         // Search and filter controls
@@ -361,6 +365,9 @@ class ControlCenter {
             () => this.exportActivityLogsToCSV());
         document.getElementById('refreshActivityLogsBtn')?.addEventListener('click', 
             () => this.loadActivityLogs());
+        document.querySelectorAll('input[name="activityLogsLayoutPreset"]').forEach((presetInput) => {
+            presetInput.addEventListener('change', (event) => this.handleActivityLogsLayoutPresetChange(event));
+        });
     }
     
     debounce(func, wait) {
@@ -2418,16 +2425,82 @@ class ControlCenter {
     }
     
     // Activity Logs Methods
-    async loadActivityLogs() {
-        console.log('=== loadActivityLogs CALLED ===');
-        console.log('this:', this);
-        console.log('State:', {
-            activityLogsPage: this.activityLogsPage,
-            activityLogsPerPage: this.activityLogsPerPage,
-            activityLogsSearch: this.activityLogsSearch,
-            activityTypeFilter: this.activityTypeFilter
+    getDefaultActivityLogsLayoutPreset() {
+        return 'balanced';
+    }
+
+    isValidActivityLogsLayoutPreset(preset) {
+        return ACTIVITY_LOGS_LAYOUT_PRESETS.includes(preset);
+    }
+
+    loadActivityLogsLayoutPreset() {
+        let storedPreset = null;
+
+        try {
+            storedPreset = window.localStorage.getItem(ACTIVITY_LOGS_LAYOUT_PRESET_STORAGE_KEY);
+        } catch (error) {
+            console.warn('Unable to load Activity Logs layout preset:', error);
+        }
+
+        if (this.isValidActivityLogsLayoutPreset(storedPreset)) {
+            this.activityLogsLayoutPreset = storedPreset;
+            return;
+        }
+
+        this.activityLogsLayoutPreset = this.getDefaultActivityLogsLayoutPreset();
+    }
+
+    saveActivityLogsLayoutPreset() {
+        try {
+            window.localStorage.setItem(ACTIVITY_LOGS_LAYOUT_PRESET_STORAGE_KEY, this.activityLogsLayoutPreset);
+        } catch (error) {
+            console.warn('Unable to save Activity Logs layout preset:', error);
+        }
+    }
+
+    syncActivityLogsLayoutPresetControls() {
+        document.querySelectorAll('input[name="activityLogsLayoutPreset"]').forEach((presetInput) => {
+            presetInput.checked = presetInput.value === this.activityLogsLayoutPreset;
         });
-        
+    }
+
+    updateActivityLogsLayoutHint() {
+        const hintElement = document.getElementById('activityLogsLayoutHint');
+        if (!hintElement) {
+            return;
+        }
+
+        hintElement.textContent = ACTIVITY_LOGS_LAYOUT_HINTS[this.activityLogsLayoutPreset]
+            || ACTIVITY_LOGS_LAYOUT_HINTS[this.getDefaultActivityLogsLayoutPreset()];
+    }
+
+    applyActivityLogsLayoutPreset(preset) {
+        const resolvedPreset = this.isValidActivityLogsLayoutPreset(preset)
+            ? preset
+            : this.getDefaultActivityLogsLayoutPreset();
+
+        this.activityLogsLayoutPreset = resolvedPreset;
+
+        const activityLogsTable = document.getElementById('activityLogsTable');
+        if (activityLogsTable) {
+            activityLogsTable.setAttribute('data-layout-preset', resolvedPreset);
+        }
+
+        this.syncActivityLogsLayoutPresetControls();
+        this.updateActivityLogsLayoutHint();
+    }
+
+    handleActivityLogsLayoutPresetChange(event) {
+        const preset = event.target?.value;
+        if (!this.isValidActivityLogsLayoutPreset(preset)) {
+            return;
+        }
+
+        this.applyActivityLogsLayoutPreset(preset);
+        this.saveActivityLogsLayoutPreset();
+    }
+
+    async loadActivityLogs() {
         try {
             const params = new URLSearchParams({
                 page: this.activityLogsPage,
@@ -2436,31 +2509,31 @@ class ControlCenter {
                 activity_type_filter: this.activityTypeFilter
             });
 
-            const url = `/api/admin/control-center/activity-logs?${params}`;
-            console.log('Fetching from:', url);
-            
-            const response = await fetch(url);
-            console.log('Response received:', response.status);
+            const response = await fetch(`/api/admin/control-center/activity-logs?${params}`);
+            let data = null;
+            try {
+                data = await response.json();
+            } catch (parseError) {
+                data = null;
+            }
             
             if (!response.ok) {
-                throw new Error('Failed to load activity logs');
+                throw new Error(data?.error || 'Failed to load activity logs');
             }
-
-            const data = await response.json();
-            console.log('Activity logs loaded:', data);
             
             this.renderActivityLogs(data.logs, data.user_map);
             this.renderActivityLogsPagination(data.pagination);
             
         } catch (error) {
             console.error('Error loading activity logs:', error);
-            this.showActivityLogsError('Failed to load activity logs. Please try again.');
+            this.showActivityLogsError(error.message || 'Failed to load activity logs. Please try again.');
         }
     }
 
-    renderActivityLogs(logs, userMap) {
+    renderActivityLogs(logs, userMap = {}) {
         // Store logs for modal access
         this.currentActivityLogs = logs;
+        this.currentActivityLogUserMap = userMap;
         
         const tbody = document.getElementById('activityLogsTableBody');
         if (!tbody) return;
@@ -2476,7 +2549,7 @@ class ControlCenter {
             return;
         }
 
-        tbody.innerHTML = logs.map(log => {
+        tbody.innerHTML = logs.map((log, logIndex) => {
             // Handle user identification - some activities may not have user_id (system activities)
             let userName = 'System';
             if (log.user_id) {
@@ -2490,24 +2563,35 @@ class ControlCenter {
                 userName = log.added_by_email;
             }
             
-            const timestamp = new Date(log.timestamp).toLocaleString();
+            const timestamp = this.formatActivityLogTimestamp(log.timestamp);
             const activityType = this.formatActivityType(log.activity_type);
             const details = this.formatActivityDetails(log);
             const workspaceType = log.workspace_type || 'N/A';
-
-            const logIndex = logs.indexOf(log);
             return `
-                <tr style="cursor: pointer;" onclick="window.controlCenter.showRawLogModal(${logIndex})" title="Click to view raw log data">
-                    <td>${timestamp}</td>
-                    <td><span class="badge bg-primary">${activityType}</span></td>
-                    <td>${this.escapeHtml(userName)}</td>
-                    <td>${details}</td>
-                    <td>${this.capitalizeFirst(workspaceType)}</td>
+                <tr class="activity-log-row" onclick="window.controlCenter.showRawLogModal(${logIndex})" title="Click to view raw log data">
+                    <td><span class="activity-log-cell-text">${this.escapeHtml(timestamp)}</span></td>
+                    <td><span class="activity-log-badge-wrap"><span class="badge bg-primary">${this.escapeHtml(activityType)}</span></span></td>
+                    <td><span class="activity-log-cell-text">${this.escapeHtml(userName)}</span></td>
+                    <td><div class="activity-log-details">${details}</div></td>
+                    <td><span class="activity-log-cell-text">${this.escapeHtml(this.capitalizeFirst(workspaceType))}</span></td>
                 </tr>
             `;
         }).join('');
     }
 
+    formatActivityLogTimestamp(timestamp) {
+        if (!timestamp) {
+            return 'N/A';
+        }
+
+        const parsedTimestamp = new Date(timestamp);
+        if (Number.isNaN(parsedTimestamp.getTime())) {
+            return String(timestamp);
+        }
+
+        return parsedTimestamp.toLocaleString();
+    }
+
     formatActivityType(activityType) {
         const typeMap = {
             'user_login': 'User Login',
@@ -2521,10 +2605,22 @@ class ControlCenter {
             'group_status_change': 'Group Status Change',
             'group_member_deleted': 'Group Member Deleted',
             'add_member_directly': 'Add Member Directly',
+            'admin_add_member_csv': 'Add Member CSV',
             'admin_take_ownership_approved': 'Admin Take Ownership (Approved)',
             'delete_group_approved': 'Delete Group (Approved)',
-            'delete_all_documents_approved': 'Delete All Documents (Approved)'
+            'delete_all_documents_approved': 'Delete All Documents (Approved)',
+            'public_workspace_status_change': 'Public Workspace Status Change',
+            'admin_take_workspace_ownership_approved': 'Take Workspace Ownership (Approved)',
+            'transfer_workspace_ownership_approved': 'Transfer Workspace Ownership (Approved)',
+            'transfer_ownership_approved': 'Transfer Ownership (Approved)',
+            'add_workspace_member_directly': 'Add Workspace Member',
+            'admin_add_workspace_member_csv': 'Add Workspace Member CSV',
+            'delete_workspace_documents_approved': 'Delete Workspace Documents (Approved)',
+            'delete_workspace_approved': 'Delete Workspace (Approved)'
         };
+        if (!activityType) {
+            return 'Unknown';
+        }
         return typeMap[activityType] || activityType.replace(/_/g, ' ').replace(/\b\w/g, l => l.toUpperCase());
     }
 
@@ -2669,7 +2765,7 @@ class ControlCenter {
                 return `Workspace: ${this.escapeHtml(deletedWorkspace)}<br>Requested by: ${this.escapeHtml(wsDelRequester)}<br><small class="text-muted">Approved by: ${this.escapeHtml(wsDelApprover)}</small>`;
                 
             default:
-                return 'N/A';
+                return this.escapeHtml(log.description || 'N/A');
         }
     }
 
@@ -2678,9 +2774,13 @@ class ControlCenter {
         const paginationNav = document.getElementById('activityLogsPagination');
         
         if (paginationInfo) {
-            const start = (pagination.page - 1) * pagination.per_page + 1;
-            const end = Math.min(pagination.page * pagination.per_page, pagination.total_items);
-            paginationInfo.textContent = `Showing ${start}-${end} of ${pagination.total_items} logs`;
+            if (!pagination.total_items) {
+                paginationInfo.textContent = 'Showing 0-0 of 0 logs';
+            } else {
+                const start = (pagination.page - 1) * pagination.per_page + 1;
+                const end = Math.min(pagination.page * pagination.per_page, pagination.total_items);
+                paginationInfo.textContent = `Showing ${start}-${end} of ${pagination.total_items} logs`;
+            }
         }
         
         if (paginationNav) {
@@ -2743,6 +2843,9 @@ class ControlCenter {
     }
 
     goToActivityLogsPage(page) {
+        if (page < 1) {
+            return;
+        }
         this.activityLogsPage = page;
         this.loadActivityLogs();
     }
@@ -2768,65 +2871,56 @@ class ControlCenter {
     }
 
     async exportActivityLogsToCSV() {
+        const exportButton = document.getElementById('exportActivityLogsBtn');
+        const originalButtonMarkup = exportButton ? exportButton.innerHTML : '';
+
+        if (exportButton) {
+            exportButton.disabled = true;
+            exportButton.innerHTML = '<span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>Exporting';
+        }
+
         try {
-            // Get current filtered data
             const params = new URLSearchParams({
-                page: 1,
-                per_page: 10000, // Get all for export
                 search: this.activityLogsSearch,
                 activity_type_filter: this.activityTypeFilter
             });
 
-            const response = await fetch(`/api/admin/control-center/activity-logs?${params}`);
+            const response = await fetch(`/api/admin/control-center/activity-logs/export?${params}`);
             
             if (!response.ok) {
-                throw new Error('Failed to load activity logs for export');
+                let errorMessage = 'Failed to export activity logs';
+                try {
+                    const errorData = await response.json();
+                    errorMessage = errorData.error || errorMessage;
+                } catch (parseError) {
+                    // Ignore JSON parse failures and use the default message.
+                }
+                throw new Error(errorMessage);
             }
 
-            const data = await response.json();
-            
-            // Convert to CSV
-            const headers = ['Timestamp', 'Activity Type', 'User ID', 'User Email', 'User Name', 'Details', 'Workspace Type'];
-            const csvRows = [headers.join(',')];
-            
-            data.logs.forEach(log => {
-                const user = data.user_map[log.user_id] || {};
-                const timestamp = new Date(log.timestamp).toISOString();
-                const activityType = log.activity_type;
-                const userId = log.user_id;
-                const userEmail = user.email || '';
-                const userName = user.display_name || '';
-                const details = this.getActivityDetailsForCSV(log);
-                const workspaceType = log.workspace_type || '';
-                
-                const row = [
-                    timestamp,
-                    activityType,
-                    userId,
-                    userEmail,
-                    userName,
-                    details,
-                    workspaceType
-                ].map(field => `"${String(field).replace(/"/g, '""')}"`);
-                
-                csvRows.push(row.join(','));
-            });
-            
-            // Download CSV
-            const csvContent = csvRows.join('\n');
-            const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+            const blob = await response.blob();
             const link = document.createElement('a');
             const url = URL.createObjectURL(blob);
+            const disposition = response.headers.get('Content-Disposition') || '';
+            const filenameMatch = disposition.match(/filename="?([^";]+)"?/i);
+            const filename = filenameMatch ? filenameMatch[1] : `activity_logs_${new Date().toISOString().split('T')[0]}.csv`;
+
             link.setAttribute('href', url);
-            link.setAttribute('download', `activity_logs_${new Date().toISOString().split('T')[0]}.csv`);
+            link.setAttribute('download', filename);
             link.style.visibility = 'hidden';
             document.body.appendChild(link);
             link.click();
             document.body.removeChild(link);
+            window.URL.revokeObjectURL(url);
             
         } catch (error) {
             console.error('Error exporting activity logs:', error);
-            showToast('Failed to export activity logs. Please try again.', 'danger');
+            showToast(error.message || 'Failed to export activity logs. Please try again.', 'danger');
+        } finally {
+            if (exportButton) {
+                exportButton.disabled = false;
+                exportButton.innerHTML = originalButtonMarkup;
+            }
         }
     }
 
@@ -2859,6 +2953,9 @@ class ControlCenter {
 
     showActivityLogsError(message) {
         const tbody = document.getElementById('activityLogsTableBody');
+        const paginationInfo = document.getElementById('activityLogsPaginationInfo');
+        const paginationNav = document.getElementById('activityLogsPagination');
+
         if (tbody) {
             tbody.innerHTML = `
                 <tr>
@@ -2870,6 +2967,14 @@ class ControlCenter {
                 </tr>
             `;
         }
+
+        if (paginationInfo) {
+            paginationInfo.textContent = message;
+        }
+
+        if (paginationNav) {
+            paginationNav.innerHTML = '';
+        }
     }
 
     capitalizeFirst(str) {
@@ -2877,6 +2982,461 @@ class ControlCenter {
         return str.charAt(0).toUpperCase() + str.slice(1);
     }
 
+    isActivityLogValuePresent(value) {
+        return value !== undefined && value !== null && value !== '';
+    }
+
+    formatActivityLogNumber(value) {
+        const parsedValue = Number(value);
+        if (!Number.isFinite(parsedValue)) {
+            return String(value);
+        }
+
+        return parsedValue.toLocaleString();
+    }
+
+    getActivityLogBadgeClass(activityType) {
+        const badgeClassMap = {
+            token_usage: 'bg-success',
+            document_creation: 'bg-primary',
+            document_deletion: 'bg-danger',
+            document_metadata_update: 'bg-warning text-dark',
+            conversation_creation: 'bg-info text-dark',
+            conversation_deletion: 'bg-secondary',
+            conversation_archival: 'bg-dark',
+            user_login: 'bg-primary',
+            group_status_change: 'bg-warning text-dark',
+            public_workspace_status_change: 'bg-warning text-dark'
+        };
+
+        return badgeClassMap[activityType] || 'bg-primary';
+    }
+
+    renderActivityLogBooleanBadge(value, trueLabel = 'Yes', falseLabel = 'No') {
+        const badgeClass = value ? 'bg-success' : 'bg-secondary';
+        const label = value ? trueLabel : falseLabel;
+        return `<span class="badge ${badgeClass}">${this.escapeHtml(label)}</span>`;
+    }
+
+    renderActivityLogFieldValue(field) {
+        if (field.html !== undefined) {
+            return field.html;
+        }
+
+        const fieldValue = field.formatter
+            ? field.formatter(field.value)
+            : String(field.value);
+        const escapedValue = this.escapeHtml(fieldValue);
+
+        if (field.code) {
+            return `<code>${escapedValue}</code>`;
+        }
+
+        if (field.badgeClass) {
+            return `<span class="badge ${field.badgeClass}">${escapedValue}</span>`;
+        }
+
+        return escapedValue;
+    }
+
+    renderActivityLogMetricGrid(fields) {
+        const visibleFields = fields.filter((field) => field && this.isActivityLogValuePresent(field.value ?? field.html));
+
+        if (!visibleFields.length) {
+            return '<div class="text-muted">No additional details captured for this activity.</div>';
+        }
+
+        return `
+            <div class="row g-3">
+                ${visibleFields.map((field) => `
+                    <div class="${field.columnClass || 'col-sm-6'}">
+                        <div class="activity-log-detail-label">${this.escapeHtml(field.label)}</div>
+                        <div class="activity-log-detail-value">${this.renderActivityLogFieldValue(field)}</div>
+                    </div>
+                `).join('')}
+            </div>
+        `;
+    }
+
+    renderActivityLogSection(columnClass, title, icon, headerClass, bodyHtml, headerSuffix = '') {
+        if (!bodyHtml) {
+            return '';
+        }
+
+        return `
+            <div class="${columnClass}">
+                <div class="card h-100">
+                    <div class="card-header ${headerClass} d-flex justify-content-between align-items-center">
+                        <h6 class="mb-0"><i class="bi ${icon} me-2"></i>${this.escapeHtml(title)}</h6>
+                        ${headerSuffix}
+                    </div>
+                    <div class="card-body">
+                        ${bodyHtml}
+                    </div>
+                </div>
+            </div>
+        `;
+    }
+
+    resolveActivityLogActor(log) {
+        const actorUserId = log.user_id || log.admin_user_id || log.added_by_user_id || '';
+        const resolvedUser = actorUserId ? (this.currentActivityLogUserMap?.[actorUserId] || {}) : {};
+        const actorEmail = resolvedUser.email || log.admin_email || log.requester_email || log.added_by_email || log.member_email || '';
+        const actorDisplayName = resolvedUser.display_name || actorEmail || actorUserId || 'System';
+
+        return {
+            userId: actorUserId,
+            displayName: actorDisplayName,
+            email: actorEmail
+        };
+    }
+
+    renderActivityLogOverviewContent(log) {
+        const actor = this.resolveActivityLogActor(log);
+
+        return this.renderActivityLogMetricGrid([
+            {
+                label: 'Timestamp',
+                value: this.formatActivityLogTimestamp(log.timestamp),
+                columnClass: 'col-md-4'
+            },
+            {
+                label: 'Activity',
+                value: this.formatActivityType(log.activity_type),
+                badgeClass: this.getActivityLogBadgeClass(log.activity_type),
+                columnClass: 'col-md-4'
+            },
+            {
+                label: 'Workspace',
+                value: this.capitalizeFirst(log.workspace_type || 'N/A'),
+                badgeClass: 'bg-secondary',
+                columnClass: 'col-md-4'
+            },
+            {
+                label: 'Actor',
+                value: actor.displayName,
+                columnClass: 'col-md-4'
+            },
+            {
+                label: 'Actor Email',
+                value: actor.email,
+                columnClass: 'col-md-4'
+            },
+            {
+                label: 'Log ID',
+                value: log.id || 'N/A',
+                code: true,
+                columnClass: 'col-md-4'
+            },
+            {
+                label: 'Actor ID',
+                value: actor.userId,
+                code: true,
+                columnClass: 'col-12'
+            }
+        ]);
+    }
+
+    renderActivityLogSummaryContent(log) {
+        const usage = log.usage || {};
+        const updatedFields = Object.keys(log.updated_fields || {});
+        const summaryFields = [];
+
+        switch (log.activity_type) {
+            case 'token_usage':
+                summaryFields.push(
+                    {
+                        label: 'Token Type',
+                        value: log.token_type || 'unknown',
+                        badgeClass: 'bg-success',
+                        columnClass: 'col-md-4'
+                    },
+                    {
+                        label: 'Total Tokens',
+                        value: usage.total_tokens,
+                        formatter: (value) => this.formatActivityLogNumber(value),
+                        columnClass: 'col-md-4'
+                    },
+                    {
+                        label: 'Model',
+                        value: usage.model || 'N/A',
+                        columnClass: 'col-md-4'
+                    },
+                    {
+                        label: 'Prompt Tokens',
+                        value: usage.prompt_tokens,
+                        formatter: (value) => this.formatActivityLogNumber(value),
+                        columnClass: 'col-md-6'
+                    },
+                    {
+                        label: 'Completion Tokens',
+                        value: usage.completion_tokens,
+                        formatter: (value) => this.formatActivityLogNumber(value),
+                        columnClass: 'col-md-6'
+                    }
+                );
+                break;
+            case 'document_creation':
+            case 'document_deletion':
+                summaryFields.push(
+                    {
+                        label: 'File Name',
+                        value: log.document?.file_name || 'Unknown',
+                        columnClass: 'col-12'
+                    },
+                    {
+                        label: 'File Type',
+                        value: log.document?.file_type,
+                        badgeClass: 'bg-secondary',
+                        columnClass: 'col-md-4'
+                    }
+                );
+                break;
+            case 'document_metadata_update':
+                summaryFields.push(
+                    {
+                        label: 'File Name',
+                        value: log.document?.file_name || 'Unknown',
+                        columnClass: 'col-12'
+                    },
+                    {
+                        label: 'Updated Fields',
+                        value: updatedFields.join(', '),
+                        columnClass: 'col-12'
+                    }
+                );
+                break;
+            case 'conversation_creation':
+            case 'conversation_deletion':
+            case 'conversation_archival':
+                summaryFields.push({
+                    label: 'Conversation Title',
+                    value: log.conversation?.title || 'Untitled',
+                    columnClass: 'col-12'
+                });
+                break;
+            case 'user_login':
+                summaryFields.push({
+                    label: 'Login Method',
+                    value: log.login_method || log.details?.login_method || 'N/A',
+                    columnClass: 'col-12'
+                });
+                break;
+            case 'group_status_change':
+            case 'public_workspace_status_change':
+                summaryFields.push(
+                    {
+                        label: 'Target',
+                        value: log.group?.group_name || log.public_workspace?.workspace_name || log.workspace_context?.public_workspace_name || log.group_name || log.workspace_name || log.public_workspace_name || 'Unknown',
+                        columnClass: 'col-12'
+                    },
+                    {
+                        label: 'Previous Status',
+                        value: log.status_change?.old_status,
+                        badgeClass: 'bg-secondary',
+                        columnClass: 'col-md-6'
+                    },
+                    {
+                        label: 'New Status',
+                        value: log.status_change?.new_status,
+                        badgeClass: 'bg-success',
+                        columnClass: 'col-md-6'
+                    }
+                );
+                break;
+            default:
+                break;
+        }
+
+        if (summaryFields.length) {
+            return this.renderActivityLogMetricGrid(summaryFields);
+        }
+
+        return `<div class="activity-log-summary-text">${this.formatActivityDetails(log)}</div>`;
+    }
+
+    renderActivityLogContextContent(log) {
+        const workspaceContext = log.workspace_context || {};
+        const relatedFields = [
+            {
+                label: 'Group ID',
+                value: workspaceContext.group_id,
+                code: true,
+                columnClass: 'col-12'
+            },
+            {
+                label: 'Public Workspace ID',
+                value: workspaceContext.public_workspace_id,
+                code: true,
+                columnClass: 'col-12'
+            },
+            {
+                label: 'Group',
+                value: log.group?.group_name || log.group_name,
+                columnClass: 'col-12'
+            },
+            {
+                label: 'Workspace Name',
+                value: log.public_workspace?.workspace_name || workspaceContext.public_workspace_name || log.workspace_name || log.public_workspace_name,
+                columnClass: 'col-12'
+            },
+            {
+                label: 'Conversation ID',
+                value: log.chat_details?.conversation_id || log.conversation?.conversation_id,
+                code: true,
+                columnClass: 'col-12'
+            },
+            {
+                label: 'Message ID',
+                value: log.chat_details?.message_id,
+                code: true,
+                columnClass: 'col-12'
+            },
+            {
+                label: 'Document ID',
+                value: log.document?.document_id || log.embedding_details?.document_id,
+                code: true,
+                columnClass: 'col-12'
+            },
+            {
+                label: 'Embedded File',
+                value: log.embedding_details?.file_name,
+                columnClass: 'col-12'
+            }
+        ];
+
+        const visibleFields = relatedFields.filter((field) => field && this.isActivityLogValuePresent(field.value));
+        if (!visibleFields.length) {
+            return '';
+        }
+
+        return this.renderActivityLogMetricGrid(visibleFields);
+    }
+
+    renderActivityLogAdditionalContextContent(log) {
+        const additionalContext = log.additional_context || {};
+        const updatedFields = Object.keys(log.updated_fields || {});
+        const metadataFields = [
+            {
+                label: 'Agent Name',
+                value: additionalContext.agent_name,
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Augmented',
+                html: typeof additionalContext.augmented === 'boolean'
+                    ? this.renderActivityLogBooleanBadge(additionalContext.augmented, 'Enabled', 'Disabled')
+                    : undefined,
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Reasoning Effort',
+                value: additionalContext.reasoning_effort,
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Requester',
+                value: log.requester_email,
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Approver',
+                value: log.approver_email,
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Old Owner',
+                value: log.old_owner_email,
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'New Owner',
+                value: log.new_owner_email,
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Member',
+                value: log.member_name || log.member_email || log.removed_member?.name || log.removed_member?.email,
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Member Role',
+                value: log.member_role ? this.capitalizeFirst(String(log.member_role).replace(/_/g, ' ')) : '',
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Documents Deleted',
+                value: log.documents_deleted,
+                formatter: (value) => this.formatActivityLogNumber(value),
+                columnClass: 'col-md-6'
+            },
+            {
+                label: 'Updated Fields',
+                value: updatedFields.join(', '),
+                columnClass: 'col-12'
+            }
+        ].filter((field) => field && this.isActivityLogValuePresent(field.value ?? field.html));
+
+        const sections = [];
+        if (metadataFields.length) {
+            sections.push(this.renderActivityLogMetricGrid(metadataFields));
+        }
+
+        if (this.isActivityLogValuePresent(log.description)) {
+            sections.push(`
+                <div class="${metadataFields.length ? 'mt-3' : ''}">
+                    <div class="activity-log-detail-label">Description</div>
+                    <div class="activity-log-detail-value activity-log-summary-text">${this.escapeHtml(log.description)}</div>
+                </div>
+            `);
+        }
+
+        return sections.join('');
+    }
+
+    renderActivityLogRawJsonAccordion(prettyJson) {
+        return `
+            <div class="col-12">
+                <div class="accordion" id="rawLogModalAccordion">
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="rawLogJsonHeading">
+                            <button class="accordion-button collapsed" id="rawLogJsonToggle" type="button" data-bs-toggle="collapse" data-bs-target="#rawLogJsonCollapse" aria-expanded="false" aria-controls="rawLogJsonCollapse">
+                                <i class="bi bi-braces me-2"></i>Raw JSON
+                            </button>
+                        </h2>
+                        <div id="rawLogJsonCollapse" class="accordion-collapse collapse" aria-labelledby="rawLogJsonHeading" data-bs-parent="#rawLogModalAccordion">
+                            <div class="accordion-body activity-log-raw-json">
+                                <div class="d-flex justify-content-end mb-3">
+                                    <button type="button" class="btn btn-sm btn-outline-primary" id="copyRawLogJsonBtn" onclick="window.controlCenter.copyRawLogToClipboard()">
+                                        <i class="bi bi-clipboard me-1"></i>Copy JSON
+                                    </button>
+                                </div>
+                                <pre id="rawLogModalJson">${this.escapeHtml(prettyJson)}</pre>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        `;
+    }
+
+    renderActivityLogModal(log, prettyJson) {
+        const overviewContent = this.renderActivityLogOverviewContent(log);
+        const summaryContent = this.renderActivityLogSummaryContent(log);
+        const contextContent = this.renderActivityLogContextContent(log);
+        const additionalContextContent = this.renderActivityLogAdditionalContextContent(log);
+        const activityBadge = `<span class="badge bg-light text-dark">${this.escapeHtml(this.formatActivityType(log.activity_type))}</span>`;
+        const sections = [
+            this.renderActivityLogSection('col-12', 'Overview', 'bi-journal-text', 'bg-primary text-white', overviewContent, activityBadge),
+            this.renderActivityLogSection('col-lg-6', 'Activity Summary', 'bi-card-checklist', 'bg-success text-white', summaryContent),
+            this.renderActivityLogSection('col-lg-6', 'Context & Related IDs', 'bi-diagram-3', 'bg-info text-white', contextContent),
+            this.renderActivityLogSection('col-12', 'Additional Context', 'bi-sliders2', 'bg-warning text-dark', additionalContextContent),
+            this.renderActivityLogRawJsonAccordion(prettyJson)
+        ].filter(Boolean);
+
+        return `<div class="row g-3">${sections.join('')}</div>`;
+    }
+
     showRawLogModal(logIndex) {
         if (!this.currentActivityLogs || !this.currentActivityLogs[logIndex]) {
             showToast('Log data not available', 'warning');
@@ -2892,28 +3452,26 @@ class ControlCenter {
             return;
         }
 
-        // Set title
         const activityType = this.formatActivityType(log.activity_type);
-        const timestamp = new Date(log.timestamp).toLocaleString();
-        modalTitle.textContent = `${activityType} - ${timestamp}`;
+        const timestamp = this.formatActivityLogTimestamp(log.timestamp);
+        modalTitle.innerHTML = `<i class="bi bi-journal-text me-2"></i>${this.escapeHtml(activityType)}<span class="text-muted fs-6 ms-2">${this.escapeHtml(timestamp)}</span>`;
 
-        // Display JSON with pretty formatting
-        modalBody.innerHTML = `<pre class="mb-0" style="max-height: 500px; overflow-y: auto;">${this.escapeHtml(JSON.stringify(log, null, 2))}</pre>`;
+        this.currentRawLogJson = JSON.stringify(log, null, 2);
+        modalBody.innerHTML = this.renderActivityLogModal(log, this.currentRawLogJson);
 
-        // Show modal
         const modal = new bootstrap.Modal(document.getElementById('rawLogModal'));
         modal.show();
     }
 
     copyRawLogToClipboard() {
-        const rawLogText = document.getElementById('rawLogModalBody')?.textContent;
+        const rawLogText = this.currentRawLogJson || document.getElementById('rawLogModalJson')?.textContent;
         if (!rawLogText) {
             showToast('No log data to copy', 'warning');
             return;
         }
 
         navigator.clipboard.writeText(rawLogText).then(() => {
-            this.showToast('Log data copied to clipboard', 'success');
+            this.showToast('Log JSON copied to clipboard', 'success');
         }).catch(err => {
             console.error('Failed to copy:', err);
             showToast('Failed to copy to clipboard', 'danger');
diff --git a/application/single_app/static/js/navigation.js b/application/single_app/static/js/navigation.js
index be624c2e..40116f89 100644
--- a/application/single_app/static/js/navigation.js
+++ b/application/single_app/static/js/navigation.js
@@ -1,95 +1,142 @@
-// Top Navigation Functionality
+// navigation.js
 
 /**
- * Navigation-related utilities and event handlers
- * Handles general navigation behavior and interactions
+ * Navigation-related utilities and event handlers.
+ * Handles responsive drawer behavior, dropdown accessibility, and overlay coordination.
  */
 
-// Initialize top navigation functionality
 document.addEventListener('DOMContentLoaded', () => {
-  // Set up any top navigation specific event listeners
-  console.log('Top navigation initialized');
+    handleResponsiveNavigation();
+    setupDropdownBehaviors();
+    initializeMobileNavigationDrawers();
+    initializeNavigationOverlayCoordination();
+});
 
-  // Handle responsive navigation behavior
-  handleResponsiveNavigation();
+function isChatRailNavigationDrawer(offcanvasElement) {
+    return offcanvasElement?.dataset?.navigationDrawer === 'chat-rail';
+}
 
-  // Set up dropdown behaviors
-  setupDropdownBehaviors();
-});
+function getNavigationOffcanvasElements() {
+    if (typeof bootstrap === 'undefined' || !bootstrap.Offcanvas) {
+        return [];
+    }
 
-// Handle responsive navigation behavior
-function handleResponsiveNavigation() {
-  // Handle window resize for responsive navigation
-  window.addEventListener('resize', function() {
-    // Close any open mobile menus when resizing to larger screens
-    if (window.innerWidth > 768) {
-      const navbarCollapse = document.querySelector('.navbar-collapse');
-      if (navbarCollapse && navbarCollapse.classList.contains('show')) {
-        // Use Bootstrap's collapse method if available
-        if (typeof bootstrap !== 'undefined' && bootstrap.Collapse) {
-          const collapse = bootstrap.Collapse.getInstance(navbarCollapse);
-          if (collapse) {
-            collapse.hide();
-          }
-        }
-      }
+    return Array.from(document.querySelectorAll('[data-navigation-drawer]'));
+}
+
+function hideOffcanvasElement(offcanvasElement) {
+    if (!offcanvasElement || typeof bootstrap === 'undefined' || !bootstrap.Offcanvas) {
+        return;
+    }
+
+    const offcanvasInstance = bootstrap.Offcanvas.getInstance(offcanvasElement);
+    if (offcanvasInstance) {
+        offcanvasInstance.hide();
     }
-  });
 }
 
-// Set up dropdown behaviors
-function setupDropdownBehaviors() {
-  // Handle dropdown menu accessibility
-  document.querySelectorAll('.dropdown-toggle').forEach(dropdown => {
-    dropdown.addEventListener('keydown', function(e) {
-      // Handle keyboard navigation for dropdowns
-      if (e.key === 'Enter' || e.key === ' ') {
-        e.preventDefault();
+function closeOpenDropdowns() {
+    document.querySelectorAll('.dropdown-menu.show').forEach((menu) => {
         if (typeof bootstrap !== 'undefined' && bootstrap.Dropdown) {
-          const dropdownInstance = bootstrap.Dropdown.getOrCreateInstance(this);
-          dropdownInstance.toggle();
+            const dropdownToggle = menu.previousElementSibling;
+            if (dropdownToggle) {
+                const dropdownInstance = bootstrap.Dropdown.getInstance(dropdownToggle);
+                if (dropdownInstance) {
+                    dropdownInstance.hide();
+                }
+            }
         }
-      }
     });
-  });
+}
 
-  // Close dropdowns when clicking outside
-  document.addEventListener('click', function(e) {
-    if (!e.target.closest('.dropdown')) {
-      document.querySelectorAll('.dropdown-menu.show').forEach(menu => {
-        if (typeof bootstrap !== 'undefined' && bootstrap.Dropdown) {
-          const dropdownToggle = menu.previousElementSibling;
-          if (dropdownToggle) {
-            const dropdownInstance = bootstrap.Dropdown.getInstance(dropdownToggle);
-            if (dropdownInstance) {
-              dropdownInstance.hide();
+function handleResponsiveNavigation() {
+    window.addEventListener('resize', () => {
+        if (window.innerWidth > 991) {
+            const navbarCollapse = document.querySelector('.navbar-collapse');
+            if (navbarCollapse && navbarCollapse.classList.contains('show') && typeof bootstrap !== 'undefined' && bootstrap.Collapse) {
+                bootstrap.Collapse.getOrCreateInstance(navbarCollapse).hide();
             }
-          }
+
+            getNavigationOffcanvasElements().forEach((offcanvasElement) => {
+                hideOffcanvasElement(offcanvasElement);
+            });
+        }
+    });
+}
+
+function initializeMobileNavigationDrawers() {
+    getNavigationOffcanvasElements().forEach((offcanvasElement) => {
+        if (isChatRailNavigationDrawer(offcanvasElement)) {
+            return;
         }
-      });
+
+        const offcanvasInstance = bootstrap.Offcanvas.getOrCreateInstance(offcanvasElement);
+
+        offcanvasElement.querySelectorAll('a[href]').forEach((link) => {
+            link.addEventListener('click', () => {
+                if (window.innerWidth < 992) {
+                    offcanvasInstance.hide();
+                }
+            });
+        });
+    });
+}
+
+function initializeNavigationOverlayCoordination() {
+    const topNavUserDropdown = document.getElementById('userDropdown');
+    const topNavDropdownContainer = topNavUserDropdown ? topNavUserDropdown.closest('.dropdown') : null;
+
+    if (topNavDropdownContainer && typeof bootstrap !== 'undefined' && bootstrap.Dropdown) {
+        topNavDropdownContainer.addEventListener('show.bs.dropdown', () => {
+            getNavigationOffcanvasElements().forEach((offcanvasElement) => {
+                hideOffcanvasElement(offcanvasElement);
+            });
+        });
     }
-  });
+
+    getNavigationOffcanvasElements().forEach((offcanvasElement) => {
+        offcanvasElement.addEventListener('show.bs.offcanvas', () => {
+            closeOpenDropdowns();
+        });
+    });
+}
+
+function setupDropdownBehaviors() {
+    document.querySelectorAll('.dropdown-toggle').forEach((dropdown) => {
+        dropdown.addEventListener('keydown', function(e) {
+            if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                if (typeof bootstrap !== 'undefined' && bootstrap.Dropdown) {
+                    const dropdownInstance = bootstrap.Dropdown.getOrCreateInstance(this);
+                    dropdownInstance.toggle();
+                }
+            }
+        });
+    });
+
+    document.addEventListener('click', (e) => {
+        if (!e.target.closest('.dropdown')) {
+            closeOpenDropdowns();
+        }
+    });
 }
 
-// Utility function to toggle navbar collapse on mobile
 function toggleNavbarCollapse() {
-  const navbarCollapse = document.querySelector('.navbar-collapse');
-  if (navbarCollapse) {
-    if (typeof bootstrap !== 'undefined' && bootstrap.Collapse) {
-      const collapse = bootstrap.Collapse.getOrCreateInstance(navbarCollapse);
-      collapse.toggle();
-    } else {
-      // Fallback for manual toggle
-      navbarCollapse.classList.toggle('show');
+    const navbarCollapse = document.querySelector('.navbar-collapse');
+    if (navbarCollapse) {
+        if (typeof bootstrap !== 'undefined' && bootstrap.Collapse) {
+            const collapse = bootstrap.Collapse.getOrCreateInstance(navbarCollapse);
+            collapse.toggle();
+        } else {
+            navbarCollapse.classList.toggle('show');
+        }
     }
-  }
 }
 
-// Export functions for use in other modules if needed
 if (typeof module !== 'undefined' && module.exports) {
-  module.exports = {
-    handleResponsiveNavigation,
-    setupDropdownBehaviors,
-    toggleNavbarCollapse
-  };
-}
+    module.exports = {
+        handleResponsiveNavigation,
+        setupDropdownBehaviors,
+        toggleNavbarCollapse
+    };
+}
\ No newline at end of file
diff --git a/application/single_app/static/js/sidebar.js b/application/single_app/static/js/sidebar.js
index 22b9daae..31b7b088 100644
--- a/application/single_app/static/js/sidebar.js
+++ b/application/single_app/static/js/sidebar.js
@@ -1,3 +1,5 @@
+// sidebar.js
+
 // Sidebar Navigation Functionality
 
 /**
@@ -57,6 +59,126 @@ function updateNavLayoutToggleText(navLayout) {
   }
 }
 
+function getSidebarElements() {
+  return {
+    body: document.body,
+    sidebar: document.getElementById('sidebar-nav'),
+    toggleButton: document.getElementById('sidebar-toggle-btn'),
+    floatingButton: document.getElementById('floating-expand-btn'),
+    mainContent: document.getElementById('main-content'),
+    allContentElements: document.querySelectorAll('.main-content, .container, .container-fluid, #main-content')
+  };
+}
+
+function syncSidebarControls(isExpanded, toggleButton, floatingButton) {
+  document.querySelectorAll('[data-sidebar-toggle="toggle"]').forEach((control) => {
+    control.setAttribute('aria-expanded', String(isExpanded));
+  });
+
+  if (floatingButton) {
+    floatingButton.classList.toggle('d-none', isExpanded);
+    floatingButton.classList.toggle('sidebar-floating-expand-visible', !isExpanded);
+    floatingButton.setAttribute('aria-hidden', String(isExpanded));
+  }
+}
+
+function setSidebarExpandedState(isExpanded) {
+  const {
+    body,
+    sidebar,
+    toggleButton,
+    floatingButton,
+    mainContent,
+    allContentElements
+  } = getSidebarElements();
+
+  if (!body || !sidebar) {
+    return false;
+  }
+
+  sidebar.classList.toggle('sidebar-expanded', isExpanded);
+  sidebar.classList.toggle('sidebar-collapsed', !isExpanded);
+  body.classList.toggle('sidebar-collapsed', !isExpanded);
+
+  allContentElements.forEach((element) => {
+    element.style.marginLeft = isExpanded ? '' : '0px';
+    element.style.maxWidth = isExpanded ? '' : '100%';
+  });
+
+  if (mainContent) {
+    mainContent.classList.toggle('sidebar-padding', isExpanded);
+  }
+
+  syncSidebarControls(isExpanded, toggleButton, floatingButton);
+  return isExpanded;
+}
+
+function toggleSidebar(event) {
+  if (event) {
+    event.preventDefault();
+  }
+
+  const { sidebar } = getSidebarElements();
+  if (!sidebar) {
+    return false;
+  }
+
+  const isExpanded = sidebar.classList.contains('sidebar-expanded') && !sidebar.classList.contains('sidebar-collapsed');
+  return setSidebarExpandedState(!isExpanded);
+}
+
+function initializeSidebarToggleButtons() {
+  document.querySelectorAll('[data-sidebar-toggle="toggle"]').forEach((button) => {
+    if (button.dataset.sidebarToggleBound === 'true') {
+      return;
+    }
+
+    button.dataset.sidebarToggleBound = 'true';
+    button.addEventListener('click', toggleSidebar);
+  });
+
+  const { body, sidebar } = getSidebarElements();
+  if (!body || !sidebar) {
+    return;
+  }
+
+  const isExpanded = !body.classList.contains('sidebar-collapsed') && !sidebar.classList.contains('sidebar-collapsed');
+  setSidebarExpandedState(isExpanded);
+}
+
+function initializeChatSidebarDrawer() {
+  const sidebar = document.querySelector('#sidebar-nav[data-navigation-drawer="chat-rail"]');
+  if (!sidebar || typeof bootstrap === 'undefined' || !bootstrap.Offcanvas) {
+    return;
+  }
+
+  if (sidebar.dataset.chatSidebarDrawerBound === 'true') {
+    return;
+  }
+
+  sidebar.dataset.chatSidebarDrawerBound = 'true';
+
+  sidebar.addEventListener('click', (event) => {
+    if (window.innerWidth > 991) {
+      return;
+    }
+
+    const dismissTrigger = event.target.closest('a[href], #sidebar-new-chat-btn, .sidebar-conversation-item');
+    if (!dismissTrigger || dismissTrigger.matches('a[href^="#"]')) {
+      return;
+    }
+
+    const offcanvasInstance = bootstrap.Offcanvas.getInstance(sidebar);
+    if (offcanvasInstance) {
+      offcanvasInstance.hide();
+    }
+  });
+}
+
+if (typeof window !== 'undefined') {
+  window.toggleSidebar = toggleSidebar;
+}
+
 // Initialize sidebar navigation functionality
 document.addEventListener('DOMContentLoaded', () => {
   // On click, toggle nav layout in user settings and reload
@@ -102,6 +224,9 @@ document.addEventListener('DOMContentLoaded', () => {
     // Default to top nav if error
     updateNavLayoutToggleText('top');
   });
+
+  initializeSidebarToggleButtons();
+  initializeChatSidebarDrawer();
 });
 
 // Export functions for use in other modules if needed
@@ -109,6 +234,8 @@ if (typeof module !== 'undefined' && module.exports) {
   module.exports = {
     getUserSettings,
     setUserNavLayout,
-    updateNavLayoutToggleText
+    updateNavLayoutToggleText,
+    toggleSidebar,
+    setSidebarExpandedState
   };
 }
diff --git a/application/single_app/static/js/workspace/group_agents.js b/application/single_app/static/js/workspace/group_agents.js
index 03a52f7c..d8040d93 100644
--- a/application/single_app/static/js/workspace/group_agents.js
+++ b/application/single_app/static/js/workspace/group_agents.js
@@ -489,7 +489,7 @@ function initialize() {
   setupViewToggle('groupAgents', 'groupAgentsViewPreference', (mode) => {
     currentViewMode = mode;
     switchViewContainers(mode, agentsListView, agentsGridView);
-  });
+  }, { mobileDefault: 'grid' });
 
   if (document.getElementById("group-agents-tab-btn")?.classList.contains("active")) {
     fetchGroupAgents();
diff --git a/application/single_app/static/js/workspace/group_plugins.js b/application/single_app/static/js/workspace/group_plugins.js
index 8acdf5bd..cb9a5a09 100644
--- a/application/single_app/static/js/workspace/group_plugins.js
+++ b/application/single_app/static/js/workspace/group_plugins.js
@@ -276,7 +276,7 @@ async function fetchGroupPlugins() {
         document.getElementById('group-plugins-list-view'),
         document.getElementById('group-plugins-grid-view')
       );
-    });
+    }, { mobileDefault: 'grid' });
   } catch (error) {
     console.error("Error loading group actions:", error);
     renderError(error.message || "Unable to load group actions.");
diff --git a/application/single_app/static/js/workspace/view-utils.js b/application/single_app/static/js/workspace/view-utils.js
index 216a8ffe..3b0b7722 100644
--- a/application/single_app/static/js/workspace/view-utils.js
+++ b/application/single_app/static/js/workspace/view-utils.js
@@ -93,34 +93,69 @@ export function createViewToggleHtml(prefix) {
  * @param {string} storageKey - localStorage key for persistence
  * @param {function} onSwitch - Callback receiving 'list' or 'grid'
  */
-export function setupViewToggle(prefix, storageKey, onSwitch) {
+export function setupViewToggle(prefix, storageKey, onSwitch, options = {}) {
     const listRadio = document.getElementById(`${prefix}-view-list`);
     const gridRadio = document.getElementById(`${prefix}-view-grid`);
     if (!listRadio || !gridRadio) return;
 
+    const mobileQuery = typeof window !== 'undefined' && typeof window.matchMedia === 'function'
+        ? window.matchMedia(options.mobileQuery || '(max-width: 991.98px)')
+        : null;
+
+    function getPreferredMode() {
+        const saved = localStorage.getItem(storageKey);
+        if (options.mobileDefault && mobileQuery && mobileQuery.matches) {
+            return options.mobileDefault;
+        }
+
+        return saved === 'grid' ? 'grid' : 'list';
+    }
+
+    function applyMode(mode, persistPreference) {
+        const resolvedMode = mode === 'grid' ? 'grid' : 'list';
+        listRadio.checked = resolvedMode === 'list';
+        gridRadio.checked = resolvedMode === 'grid';
+
+        if (persistPreference) {
+            localStorage.setItem(storageKey, resolvedMode);
+        }
+
+        onSwitch(resolvedMode);
+    }
+
+    if (listRadio.dataset.viewToggleBound === 'true' && gridRadio.dataset.viewToggleBound === 'true') {
+        applyMode(getPreferredMode(), false);
+        return;
+    }
+
+    listRadio.dataset.viewToggleBound = 'true';
+    gridRadio.dataset.viewToggleBound = 'true';
+
     listRadio.addEventListener("change", () => {
         if (listRadio.checked) {
-            localStorage.setItem(storageKey, "list");
-            onSwitch("list");
+            applyMode('list', true);
         }
     });
 
     gridRadio.addEventListener("change", () => {
         if (gridRadio.checked) {
-            localStorage.setItem(storageKey, "grid");
-            onSwitch("grid");
+            applyMode('grid', true);
         }
     });
 
-    // Restore saved preference
-    const saved = localStorage.getItem(storageKey);
-    if (saved === "grid") {
-        gridRadio.checked = true;
-        listRadio.checked = false;
-        onSwitch("grid");
-    } else {
-        onSwitch("list");
+    const syncPreferredMode = () => {
+        applyMode(getPreferredMode(), false);
+    };
+
+    if (mobileQuery) {
+        if (typeof mobileQuery.addEventListener === 'function') {
+            mobileQuery.addEventListener('change', syncPreferredMode);
+        } else if (typeof mobileQuery.addListener === 'function') {
+            mobileQuery.addListener(syncPreferredMode);
+        }
     }
+
+    syncPreferredMode();
 }
 
 /**
diff --git a/application/single_app/static/js/workspace/workspace-documents.js b/application/single_app/static/js/workspace/workspace-documents.js
index eefd0237..1b686b99 100644
--- a/application/single_app/static/js/workspace/workspace-documents.js
+++ b/application/single_app/static/js/workspace/workspace-documents.js
@@ -1,7 +1,7 @@
 // static/js/workspace/workspace-documents.js
 
 import { escapeHtml } from "./workspace-utils.js";
-import { initializeTags, renderTagBadges, loadWorkspaceTags } from "./workspace-tags.js";
+import { initializeTags, renderTagBadges, loadWorkspaceTags, currentView } from "./workspace-tags.js";
 import { getSelectedTagsArray, setSelectedTags, clearSelectedTags, updateDocumentTagsDisplay, loadWorkspaceTags as loadTagManagementTags } from './workspace-tag-management.js';
 
 // ------------- State Variables -------------
@@ -19,6 +19,7 @@ const activePolls = new Set();
 
 // ------------- DOM Elements (Documents Tab) -------------
 const documentsTableBody = document.querySelector("#documents-table tbody");
+const documentsCardView = document.getElementById("documents-card-view");
 const docsPaginationContainer = document.getElementById("docs-pagination-container");
 const docsPageSizeSelect = document.getElementById("docs-page-size-select");
 const fileInput = document.getElementById("workspace-file-input");
@@ -59,6 +60,9 @@ window.docsCurrentPage = docsCurrentPage;
 window.docsTagsFilter = docsTagsFilter;
 window.selectedDocuments = selectedDocuments;
 window.fetchUserDocuments = fetchUserDocuments;
+window.lastFetchedDocs = window.lastFetchedDocs || [];
+window.lastFetchedDocsError = null;
+window.hasFetchedUserDocuments = window.hasFetchedUserDocuments || false;
 
 // ------------- Helper Functions -------------
 function isColorLight(hexColor) {
@@ -90,6 +94,353 @@ function isColorLight(hexColor) {
     return luminance > 0.5;
 }
 
+function truncateDocumentText(text, maxLength = 150) {
+    if (!text) {
+        return "";
+    }
+
+    return text.length > maxLength ? `${text.slice(0, maxLength).trimEnd()}…` : text;
+}
+
+function getDocumentProcessingState(doc) {
+    const pctString = String(doc?.percentage_complete ?? "");
+    const pct = /^\d+(\.\d+)?$/.test(pctString) ? parseFloat(pctString) : 0;
+    const docStatus = doc?.status || "";
+    const normalizedStatus = docStatus.toLowerCase();
+    const hasError = normalizedStatus.includes("error");
+    const isComplete = pct >= 100 || normalizedStatus.includes("complete") || hasError;
+
+    return { pct, docStatus, hasError, isComplete };
+}
+
+function getPersonalDocumentAccess(doc) {
+    const currentUserId = window.current_user_id;
+    const isOwner = doc.user_id === currentUserId;
+    let sharedUserEntry = null;
+
+    if (!isOwner) {
+        sharedUserEntry = (doc.shared_user_ids || []).find(
+            entry => entry.startsWith(`${currentUserId},`)
+        ) || null;
+    }
+
+    return {
+        isOwner,
+        sharedUserEntry,
+        requiresApproval: Boolean(!isOwner && sharedUserEntry && sharedUserEntry.endsWith(",not_approved")),
+        hasApprovedAccess: isOwner || (!sharedUserEntry || sharedUserEntry.endsWith(",approved"))
+    };
+}
+
+function getDocumentCardIcon(fileName = "") {
+    const extension = (fileName.split('.').pop() || '').toLowerCase();
+    const iconMap = {
+        pdf: 'bi-filetype-pdf',
+        doc: 'bi-file-earmark-word',
+        docx: 'bi-file-earmark-word',
+        ppt: 'bi-file-earmark-slides',
+        pptx: 'bi-file-earmark-slides',
+        xls: 'bi-file-earmark-spreadsheet',
+        xlsx: 'bi-file-earmark-spreadsheet',
+        xlsm: 'bi-file-earmark-spreadsheet',
+        csv: 'bi-filetype-csv',
+        png: 'bi-file-earmark-image',
+        jpg: 'bi-file-earmark-image',
+        jpeg: 'bi-file-earmark-image',
+        gif: 'bi-file-earmark-image',
+        txt: 'bi-file-earmark-text',
+        md: 'bi-file-earmark-richtext',
+        html: 'bi-filetype-html',
+        json: 'bi-filetype-json',
+        xml: 'bi-filetype-xml'
+    };
+
+    return iconMap[extension] || 'bi-file-earmark-text';
+}
+
+function getDocumentClassificationBadge(doc) {
+    if (!(window.enable_document_classification === true || window.enable_document_classification === "true")) {
+        return '';
+    }
+
+    const currentLabel = doc.document_classification || null;
+    const categories = window.classification_categories || [];
+    const category = categories.find(cat => cat.label === currentLabel);
+
+    if (category) {
+        const bgColor = category.color || '#6c757d';
+        const textColorClass = isColorLight(bgColor) ? 'text-dark' : '';
+        return `<span class="classification-badge ${textColorClass}" style="background-color: ${escapeHtml(bgColor)};">${escapeHtml(category.label)}</span>`;
+    }
+
+    if (currentLabel) {
+        return `<span class="badge bg-warning text-dark">${escapeHtml(currentLabel)}</span>`;
+    }
+
+    return '<span class="badge bg-secondary">None</span>';
+}
+
+function getDocumentMetaPills(doc) {
+    const pills = [];
+    const authors = Array.isArray(doc.authors)
+        ? doc.authors.filter(Boolean)
+        : (doc.authors ? [doc.authors] : []);
+
+    if (doc.version) {
+        pills.push(`<span class="document-meta-pill"><i class="bi bi-layers"></i>v${escapeHtml(String(doc.version))}</span>`);
+    }
+    if (doc.number_of_pages) {
+        pills.push(`<span class="document-meta-pill"><i class="bi bi-file-earmark-text"></i>${escapeHtml(String(doc.number_of_pages))} pages</span>`);
+    }
+    if (authors.length) {
+        const authorLabel = authors.length > 2
+            ? `${authors.slice(0, 2).join(', ')} +${authors.length - 2}`
+            : authors.join(', ');
+        pills.push(`<span class="document-meta-pill"><i class="bi bi-people"></i>${escapeHtml(authorLabel)}</span>`);
+    }
+    if (doc.publication_date) {
+        pills.push(`<span class="document-meta-pill"><i class="bi bi-calendar-event"></i>${escapeHtml(String(doc.publication_date))}</span>`);
+    }
+
+    return pills.join('');
+}
+
+function getDocumentSummaryText(doc) {
+    const abstractText = truncateDocumentText((doc.abstract || '').trim(), 165);
+    if (abstractText) {
+        return abstractText;
+    }
+
+    const keywords = Array.isArray(doc.keywords)
+        ? doc.keywords.filter(Boolean).join(', ')
+        : (doc.keywords || '');
+
+    if (keywords) {
+        return `Keywords: ${truncateDocumentText(keywords, 165)}`;
+    }
+
+    return 'Use chat, metadata tools, and sharing actions directly from this document card.';
+}
+
+function renderDocumentsEmptyState(filtersActive) {
+    const message = filtersActive
+        ? 'No documents found matching the current filters.'
+        : 'No documents found. Upload a document to get started.';
+    const resetHtml = filtersActive
+        ? '<br /><button class="btn btn-link btn-sm p-0 docs-reset-filter-msg-btn" type="button">Clear filters</button> to see all documents.'
+        : '';
+
+    documentsTableBody.innerHTML = `
+        <tr>
+            <td colspan="4" class="text-center p-4 text-muted">${message}${resetHtml}</td>
+        </tr>`;
+
+    if (documentsCardView) {
+        documentsCardView.innerHTML = `
+            <div class="col-12 text-center text-muted py-5">
+                <i class="bi bi-folder2-open display-6 mb-2 d-block"></i>
+                <p class="mb-2">${message}</p>
+                ${filtersActive ? '<button class="btn btn-link btn-sm p-0 docs-reset-filter-msg-btn" type="button">Clear filters</button>' : ''}
+            </div>`;
+    }
+
+    document.querySelectorAll('.docs-reset-filter-msg-btn').forEach(button => {
+        if (button.dataset.bound === 'true') {
+            return;
+        }
+
+        button.dataset.bound = 'true';
+        button.addEventListener('click', () => {
+            docsClearFiltersBtn?.click();
+        });
+    });
+}
+
+function renderDocumentsErrorState(message) {
+    documentsTableBody.innerHTML = `<tr><td colspan="4" class="text-center text-danger p-4">${message}</td></tr>`;
+
+    if (documentsCardView) {
+        documentsCardView.innerHTML = `
+            <div class="col-12 text-center text-danger py-5">
+                <i class="bi bi-exclamation-triangle display-6 mb-2 d-block"></i>
+                <p class="mb-0">${message}</p>
+            </div>`;
+    }
+}
+
+function createDocumentCard(doc) {
+    const docId = doc.id;
+    const { pct, docStatus, hasError, isComplete } = getDocumentProcessingState(doc);
+    const access = getPersonalDocumentAccess(doc);
+    const displayTitle = doc.title && doc.title !== doc.file_name ? doc.title : (doc.file_name || 'Untitled');
+    const subtitle = doc.title && doc.title !== doc.file_name ? (doc.file_name || '') : '';
+    const selected = selectedDocuments.has(docId);
+    const checkboxClass = selectionModeActive ? '' : ' d-none';
+
+    let statusBadge = '<span class="badge bg-success">Ready</span>';
+    if (access.requiresApproval) {
+        statusBadge = '<span class="badge bg-warning text-dark">Pending Approval</span>';
+    } else if (hasError) {
+        statusBadge = '<span class="badge bg-danger">Error</span>';
+    } else if (!isComplete) {
+        statusBadge = `<span class="badge bg-info text-dark">Processing ${pct.toFixed(0)}%</span>`;
+    }
+
+    let primaryButtonsHtml = '';
+    if (access.requiresApproval) {
+        primaryButtonsHtml += `
+            <button class="btn btn-sm btn-success me-1" onclick="window.approveSharedDocument('${docId}', this, '${escapeHtml(doc.owner_id || doc.user_id)}')">
+                <i class="bi bi-check-circle me-1"></i>Approve
+            </button>`;
+    } else if (isComplete && !hasError && access.hasApprovedAccess) {
+        primaryButtonsHtml += `
+            <button class="btn btn-sm btn-primary me-1" onclick="window.redirectToChat('${docId}')">
+                <i class="bi bi-chat-dots me-1"></i>Chat
+            </button>
+            <button class="btn btn-sm btn-outline-secondary me-1" onclick="window.onEditDocument('${docId}')">
+                <i class="bi bi-pencil me-1"></i>Edit
+            </button>`;
+    }
+
+    let dropdownItems = '';
+    if (isComplete && !hasError) {
+        dropdownItems += `
+            <li><a class="dropdown-item select-btn" href="#" onclick="window.toggleSelectionMode(); return false;">
+                <i class="bi bi-check-square me-2"></i>Select
+            </a></li>`;
+
+        if (window.enable_extract_meta_data === true || window.enable_extract_meta_data === "true") {
+            dropdownItems += `
+                <li><a class="dropdown-item" href="#" onclick="window.onExtractMetadata('${docId}', event); return false;">
+                    <i class="bi bi-magic me-2"></i>Extract Metadata
+                </a></li>`;
+        }
+
+        if (access.isOwner && (window.enable_file_sharing === true || window.enable_file_sharing === "true")) {
+            const shareCount = Array.isArray(doc.shared_user_ids) ? doc.shared_user_ids.length : 0;
+            dropdownItems += `
+                <li><a class="dropdown-item" href="#" onclick="window.shareDocument('${docId}', '${escapeHtml(doc.file_name || '')}'); return false;">
+                    <i class="bi bi-share-fill me-2"></i>Share
+                    <span class="badge bg-secondary ms-1">${shareCount}</span>
+                </a></li>`;
+        }
+
+        if (access.isOwner) {
+            dropdownItems += `
+                <li><hr class="dropdown-divider"></li>
+                <li><a class="dropdown-item text-danger" href="#" onclick="window.deleteDocument('${docId}', event); return false;">
+                    <i class="bi bi-trash-fill me-2"></i>Delete
+                </a></li>`;
+        } else if (access.sharedUserEntry && !access.requiresApproval) {
+            dropdownItems += `
+                <li><hr class="dropdown-divider"></li>
+                <li><a class="dropdown-item text-danger" href="#" onclick="window.removeSelfFromDocument('${docId}', event); return false;">
+                    <i class="bi bi-x-circle-fill me-2"></i>Remove
+                </a></li>`;
+        }
+    } else if (access.isOwner) {
+        dropdownItems += `
+            <li><a class="dropdown-item text-danger" href="#" onclick="window.deleteDocument('${docId}', event); return false;">
+                <i class="bi bi-trash-fill me-2"></i>Delete
+            </a></li>`;
+    }
+
+    const dropdownHtml = dropdownItems
+        ? `
+            <div class="dropdown action-dropdown d-inline-block ms-auto">
+                <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    <i class="bi bi-three-dots-vertical"></i>
+                </button>
+                <ul class="dropdown-menu dropdown-menu-end">${dropdownItems}</ul>
+            </div>`
+        : '';
+
+    const progressHtml = hasError
+        ? `<div class="alert alert-danger py-2 px-3 small mb-0"><i class="bi bi-exclamation-triangle-fill me-1"></i>${escapeHtml(docStatus || 'Processing error')}</div>`
+        : (!isComplete
+            ? `<div class="document-item-card__progress"><div class="progress" style="height: 10px;"><div class="progress-bar progress-bar-striped progress-bar-animated bg-info" role="progressbar" style="width: ${pct}%" aria-valuenow="${pct}" aria-valuemin="0" aria-valuemax="100"></div></div><span class="document-item-card__progress-label">${escapeHtml(docStatus)} (${pct.toFixed(0)}%)</span></div>`
+            : '');
+
+    const cardColumn = document.createElement('div');
+    cardColumn.className = 'col-12 col-md-6 col-xl-4';
+    cardColumn.innerHTML = `
+        <div class="card item-card document-item-card h-100${selected ? ' is-selected' : ''}" data-document-id="${docId}">
+            <div class="card-body d-flex flex-column">
+                <div class="document-item-card__header">
+                    <div class="document-item-card__check">
+                        <input type="checkbox" class="form-check-input document-checkbox${checkboxClass}" data-document-id="${docId}" ${selected ? 'checked' : ''} />
+                    </div>
+                    <div class="item-card-icon"><i class="bi ${getDocumentCardIcon(doc.file_name || '')}" style="font-size: 1.75rem;"></i></div>
+                    <div class="document-item-card__title-wrap">
+                        <div class="document-item-card__eyebrow">Personal document</div>
+                        <h6 class="card-title mb-1" title="${escapeHtml(displayTitle)}">${escapeHtml(truncateDocumentText(displayTitle, 60))}</h6>
+                        ${subtitle ? `<div class="document-item-card__subtitle" title="${escapeHtml(subtitle)}">${escapeHtml(subtitle)}</div>` : ''}
+                    </div>
+                    <div class="document-item-card__status">${statusBadge}</div>
+                </div>
+                <div class="document-item-card__summary">${escapeHtml(getDocumentSummaryText(doc))}</div>
+                <div class="document-item-card__meta">${getDocumentMetaPills(doc)}</div>
+                <div class="document-item-card__badges">
+                    ${getDocumentClassificationBadge(doc)}
+                    <span class="badge ${doc.enhanced_citations ? 'bg-success' : 'bg-secondary'}">${doc.enhanced_citations ? 'Enhanced citations' : 'Standard citations'}</span>
+                </div>
+                <div class="document-item-card__tags">${renderTagBadges(doc.tags || [], 4)}</div>
+                ${progressHtml}
+                <div class="item-card-buttons mt-auto d-flex flex-wrap gap-1">
+                    ${primaryButtonsHtml}
+                    ${dropdownHtml}
+                </div>
+            </div>
+        </div>`;
+
+    return cardColumn;
+}
+
+function renderDocumentCards(docs) {
+    if (!documentsCardView) {
+        return;
+    }
+
+    documentsCardView.innerHTML = '';
+    docs.forEach(doc => {
+        documentsCardView.appendChild(createDocumentCard(doc));
+    });
+}
+
+function renderWorkspaceDocumentView() {
+    const docs = Array.isArray(window.lastFetchedDocs) ? window.lastFetchedDocs : [];
+    const filtersActive = docsSearchTerm || docsClassificationFilter || docsAuthorFilter || docsKeywordsFilter || docsAbstractFilter || docsTagsFilter;
+
+    if (!window.hasFetchedUserDocuments && !window.lastFetchedDocsError) {
+        return;
+    }
+
+    if (window.lastFetchedDocsError) {
+        renderDocumentsErrorState(window.lastFetchedDocsError);
+        return;
+    }
+
+    documentsTableBody.innerHTML = '';
+    if (documentsCardView) {
+        documentsCardView.innerHTML = '';
+    }
+
+    if (!docs.length) {
+        renderDocumentsEmptyState(filtersActive);
+        return;
+    }
+
+    if (currentView === 'cards') {
+        renderDocumentCards(docs);
+    } else {
+        docs.forEach(doc => renderDocumentRow(doc));
+    }
+
+    syncDocumentSelectionModeUI();
+}
+
+window.renderWorkspaceDocumentView = renderWorkspaceDocumentView;
+
 function getDocumentDeleteModalContent(documentCount) {
     if (documentCount === 1) {
         return {
@@ -661,6 +1012,13 @@ function fetchUserDocuments() {
                 Loading documents...
             </td>
         </tr>`;
+    if (documentsCardView) {
+        documentsCardView.innerHTML = `
+            <div class="col-12 text-center text-muted py-5">
+                <div class="spinner-border spinner-border-sm me-2" role="status"><span class="visually-hidden">Loading...</span></div>
+                Loading documents...
+            </div>`;
+    }
     if (docsPaginationContainer) docsPaginationContainer.innerHTML = ''; // Clear pagination
 
     // Build query parameters - Include all active filters
@@ -709,50 +1067,25 @@ function fetchUserDocuments() {
                 showLegacyUpdatePrompt();
               }
 
-            documentsTableBody.innerHTML = ""; // Clear loading/existing rows
-            if (!data.documents || data.documents.length === 0) {
-                // Check if any filters are active
-                const filtersActive = docsSearchTerm || docsClassificationFilter || docsAuthorFilter || docsKeywordsFilter || docsAbstractFilter || docsTagsFilter;
-                documentsTableBody.innerHTML = `
-                    <tr>
-                        <td colspan="4" class="text-center p-4 text-muted">
-                            ${ filtersActive
-                                ? 'No documents found matching the current filters.'
-                                : 'No documents found. Upload a document to get started.'
-                            }
-                            ${ filtersActive
-                                ? '<br><button class="btn btn-link btn-sm p-0" id="docs-reset-filter-msg-btn">Clear filters</button> to see all documents.'
-                                : ''
-                            }
-                        </td>
-                    </tr>`;
-                 // Add event listener for the reset button within the message
-                 const resetButton = document.getElementById('docs-reset-filter-msg-btn');
-                 if (resetButton && docsClearFiltersBtn) { // Ensure clear button exists
-                     resetButton.addEventListener('click', () => {
-                         docsClearFiltersBtn.click(); // Simulate clicking the main clear button
-                     });
-                 }
-            } else {
-                // If backend does not support shared_only, filter client-side as fallback
-                let docs = data.documents;
-                if (docsSharedOnlyFilter && docsSharedOnlyFilter.checked) {
-                    docs = docs.filter(doc =>
-                        Array.isArray(doc.shared_user_ids) && doc.shared_user_ids.length > 0
-                    );
-                }
-                // Client-side sort to ensure correct order
-                if (docsSortBy !== '_ts') {
-                    docs.sort((a, b) => {
-                        const valA = (a[docsSortBy] || '').toLowerCase();
-                        const valB = (b[docsSortBy] || '').toLowerCase();
-                        const cmp = valA.localeCompare(valB);
-                        return docsSortOrder === 'asc' ? cmp : -cmp;
-                    });
-                }
-                window.lastFetchedDocs = docs;
-                docs.forEach(doc => renderDocumentRow(doc));
+            let docs = data.documents || [];
+            if (docsSharedOnlyFilter && docsSharedOnlyFilter.checked) {
+                docs = docs.filter(doc =>
+                    Array.isArray(doc.shared_user_ids) && doc.shared_user_ids.length > 0
+                );
+            }
+            if (docsSortBy !== '_ts') {
+                docs.sort((a, b) => {
+                    const valA = String(a[docsSortBy] || '').toLowerCase();
+                    const valB = String(b[docsSortBy] || '').toLowerCase();
+                    const cmp = valA.localeCompare(valB);
+                    return docsSortOrder === 'asc' ? cmp : -cmp;
+                });
             }
+
+            window.lastFetchedDocs = docs;
+            window.lastFetchedDocsError = null;
+            window.hasFetchedUserDocuments = true;
+            renderWorkspaceDocumentView();
             renderDocsPaginationControls(data.page, data.page_size, data.total_count);
         })
         .catch(error => {
@@ -765,7 +1098,10 @@ function fetchUserDocuments() {
             } else {
                 displayMsg = `Error loading documents: ${escapeHtml(error.error || error.message || 'Unknown error')}`;
             }
-            documentsTableBody.innerHTML = `<tr><td colspan="4" class="text-center text-danger p-4">${displayMsg}</td></tr>`;
+            window.lastFetchedDocs = [];
+            window.lastFetchedDocsError = displayMsg;
+            window.hasFetchedUserDocuments = true;
+            renderDocumentsErrorState(displayMsg);
             renderDocsPaginationControls(1, docsPageSize, 0); // Show empty pagination on error
         });
 }
@@ -800,7 +1136,7 @@ function renderDocumentRow(doc) {
     // First column with checkbox and expand/collapse
     let firstColumnHtml = `
         <td class="align-middle">
-            <input type="checkbox" class="document-checkbox" data-document-id="${docId}" style="display: none;">
+            <input type="checkbox" class="form-check-input document-checkbox${selectionModeActive ? '' : ' d-none'}" data-document-id="${docId}" ${selectedDocuments.has(docId) ? 'checked' : ''}>
             <span class="expand-collapse-container">
             ${isComplete && !hasError ?
                 `<button class="btn btn-link p-0" onclick="window.toggleDetails('${docId}')" title="Show/Hide Details">
@@ -930,9 +1266,9 @@ function renderDocumentRow(doc) {
     // Complete row HTML
     docRow.innerHTML = `
         ${firstColumnHtml}
-        <td class="align-middle" title="${escapeHtml(doc.file_name || "")}">${escapeHtml(doc.file_name || "")}</td>
-        <td class="align-middle" title="${escapeHtml(doc.title || "")}">${escapeHtml(doc.title || "N/A")}</td>
-        <td class="align-middle">
+        <td class="align-middle document-file-cell" title="${escapeHtml(doc.file_name || "")}">${escapeHtml(doc.file_name || "")}</td>
+        <td class="align-middle document-title-cell" title="${escapeHtml(doc.title || "")}">${escapeHtml(doc.title || "N/A")}</td>
+        <td class="align-middle document-actions-cell">
             ${approvalButton}
             ${chatButton}
             ${actionsDropdown}
@@ -945,6 +1281,7 @@ function renderDocumentRow(doc) {
     if (isComplete && !hasError) {
         const detailsRow = document.createElement("tr");
         detailsRow.id = `details-row-${docId}`;
+        detailsRow.classList.add("document-details-row");
         detailsRow.style.display = "none"; // Initially hidden
 
         let classificationDisplayHTML = '';
@@ -1005,6 +1342,7 @@ function renderDocumentRow(doc) {
     if (!isComplete || hasError) {
         const statusRow = document.createElement("tr");
         statusRow.id = `status-row-${docId}`;
+        statusRow.classList.add("document-status-row");
         if (hasError) {
              statusRow.innerHTML = `
                 <td colspan="4">
@@ -1525,51 +1863,12 @@ window.fetchUserDocuments = fetchUserDocuments;
 // Toggle selection mode
 window.toggleSelectionMode = function() {
     selectionModeActive = !selectionModeActive;
-    
-    const documentsTable = document.getElementById("documents-table");
-    const checkboxes = document.querySelectorAll('.document-checkbox');
-    const expandContainers = document.querySelectorAll('.expand-collapse-container');
-    const bulkActionsBar = document.getElementById('bulkActionsBar');
-    
-    if (selectionModeActive) {
-        // Enter selection mode
-        documentsTable.classList.add('selection-mode');
-        
-        // Show checkboxes and hide expand buttons
-        checkboxes.forEach(checkbox => {
-            checkbox.classList.remove('d-none');
-            checkbox.classList.add('d-inline-block');
-        });
-        
-        expandContainers.forEach(container => {
-            container.classList.remove('d-inline-block');
-            container.classList.add('d-none');
-        });
-    } else {
-        // Exit selection mode
-        documentsTable.classList.remove('selection-mode');
-        
-        // Hide checkboxes and show expand buttons
-        checkboxes.forEach(checkbox => {
-            checkbox.classList.remove('d-inline-block');
-            checkbox.classList.add('d-none');
-            checkbox.checked = false;
-        });
-        
-        expandContainers.forEach(container => {
-            container.classList.remove('d-none');
-            container.classList.add('d-inline-block');
-        });
-        
-        // Hide bulk actions bar
-        if (bulkActionsBar) {
-            bulkActionsBar.classList.remove('d-block');
-            bulkActionsBar.classList.add('d-none');
-        }
-        
-        // Clear selected documents
+
+    if (!selectionModeActive) {
         selectedDocuments.clear();
     }
+
+    syncDocumentSelectionModeUI();
 };
 
 // Update selected documents
@@ -1579,8 +1878,14 @@ window.updateSelectedDocuments = function(documentId, isSelected) {
     } else {
         selectedDocuments.delete(documentId);
     }
-    
-    // Show/hide appropriate action buttons based on selection
+
+    document.querySelectorAll(`.document-checkbox[data-document-id="${documentId}"]`).forEach(checkbox => {
+        checkbox.checked = isSelected;
+    });
+    document.querySelectorAll(`.document-item-card[data-document-id="${documentId}"]`).forEach(card => {
+        card.classList.toggle('is-selected', isSelected);
+    });
+
     updateBulkActionButtons();
 };
 
@@ -1599,15 +1904,6 @@ function updateBulkActionButtons() {
             selectedCountSpan.textContent = selectedDocuments.size;
         }
         
-        // Check if any selected documents are shared (for remove button logic if needed in future)
-        const hasSharedDocuments = Array.from(selectedDocuments).some(docId => {
-            const docRow = document.getElementById(`doc-row-${docId}`);
-            if (docRow && docRow.__docData) {
-                const doc = docRow.__docData;
-                return doc.user_id !== window.current_user_id;
-            }
-            return false;
-        });
     } else {
         // Hide bulk actions bar
         if (bulkActionsBar) {
@@ -1617,6 +1913,36 @@ function updateBulkActionButtons() {
     }
 }
 
+function syncDocumentSelectionModeUI() {
+    const documentsTable = document.getElementById('documents-table');
+    const bulkActionsBar = document.getElementById('bulkActionsBar');
+
+    documentsTable?.classList.toggle('selection-mode', selectionModeActive);
+    documentsCardView?.classList.toggle('selection-mode', selectionModeActive);
+
+    document.querySelectorAll('.document-checkbox').forEach(checkbox => {
+        checkbox.classList.toggle('d-none', !selectionModeActive);
+        checkbox.checked = selectionModeActive && selectedDocuments.has(checkbox.getAttribute('data-document-id'));
+    });
+
+    document.querySelectorAll('.expand-collapse-container').forEach(container => {
+        container.classList.toggle('d-none', selectionModeActive);
+        container.classList.toggle('d-inline-block', !selectionModeActive);
+    });
+
+    document.querySelectorAll('.document-item-card').forEach(card => {
+        const documentId = card.getAttribute('data-document-id');
+        card.classList.toggle('is-selected', selectedDocuments.has(documentId));
+    });
+
+    if (!selectionModeActive && bulkActionsBar) {
+        bulkActionsBar.classList.remove('d-block');
+        bulkActionsBar.classList.add('d-none');
+    }
+
+    updateBulkActionButtons();
+}
+
 // Delete selected documents
 window.deleteSelectedDocuments = async function() {
     if (selectedDocuments.size === 0) return;
@@ -1726,7 +2052,7 @@ window.clearDocumentSelection = function() {
         checkbox.checked = false;
     });
     selectedDocuments.clear();
-    updateBulkActionButtons();
+    syncDocumentSelectionModeUI();
 };
 
 // Add event listeners for selection functionality
@@ -1741,15 +2067,12 @@ document.addEventListener('DOMContentLoaded', function() {
         clearSelectionBtn.addEventListener('click', window.clearDocumentSelection);
     }
     
-    // Delegate event listener for checkboxes (they're dynamically created)
-    if (documentsTableBody) {
-        documentsTableBody.addEventListener('change', function(event) {
-            if (event.target.classList.contains('document-checkbox')) {
-                const documentId = event.target.getAttribute('data-document-id');
-                window.updateSelectedDocuments(documentId, event.target.checked);
-            }
-        });
-    }
+    document.addEventListener('change', function(event) {
+        if (event.target.classList.contains('document-checkbox')) {
+            const documentId = event.target.getAttribute('data-document-id');
+            window.updateSelectedDocuments(documentId, event.target.checked);
+        }
+    });
 });
 
 // Approve shared document handler
diff --git a/application/single_app/static/js/workspace/workspace-tags.js b/application/single_app/static/js/workspace/workspace-tags.js
index 8b1b2b13..948f5cde 100644
--- a/application/single_app/static/js/workspace/workspace-tags.js
+++ b/application/single_app/static/js/workspace/workspace-tags.js
@@ -6,7 +6,7 @@ import { showTagManagementModal } from "./workspace-tag-management.js";
 
 // ============= State Variables =============
 let workspaceTags = []; // All available workspace tags with colors
-let currentView = 'list'; // 'list' or 'grid'
+let currentView = 'list'; // 'list', 'cards', or 'grid' (folders)
 let selectedTagFilter = [];
 let currentFolder = null;    // null = folder overview, string = tag name being viewed
 let currentFolderType = null; // null | 'tag' | 'classification'
@@ -59,12 +59,20 @@ export function initializeTags() {
         });
     }
     
-    // Load saved view preference
-    const savedView = localStorage.getItem('personalWorkspaceViewPreference');
-    if (savedView === 'grid') {
-        document.getElementById('docs-view-grid').checked = true;
-        switchView('grid');
+    const preferredView = getPreferredWorkspaceView();
+    const cardsRadio = document.getElementById('docs-view-cards');
+    const gridRadio = document.getElementById('docs-view-grid');
+    const listRadio = document.getElementById('docs-view-list');
+
+    if (preferredView === 'cards' && cardsRadio) {
+        cardsRadio.checked = true;
+    } else if (preferredView === 'grid' && gridRadio) {
+        gridRadio.checked = true;
+    } else if (listRadio) {
+        listRadio.checked = true;
     }
+
+    switchView(preferredView);
 }
 
 // ============= Load Workspace Tags =============
@@ -99,6 +107,7 @@ export async function loadWorkspaceTags() {
 
 function setupViewSwitcher() {
     const listRadio = document.getElementById('docs-view-list');
+    const cardsRadio = document.getElementById('docs-view-cards');
     const gridRadio = document.getElementById('docs-view-grid');
     
     if (listRadio) {
@@ -108,6 +117,14 @@ function setupViewSwitcher() {
             }
         });
     }
+
+    if (cardsRadio) {
+        cardsRadio.addEventListener('change', () => {
+            if (cardsRadio.checked) {
+                switchView('cards');
+            }
+        });
+    }
     
     if (gridRadio) {
         gridRadio.addEventListener('change', () => {
@@ -118,11 +135,47 @@ function setupViewSwitcher() {
     }
 }
 
+function getPreferredWorkspaceView() {
+    const savedView = localStorage.getItem('personalWorkspaceViewPreference');
+    if (savedView === 'cards' || savedView === 'grid' || savedView === 'list') {
+        return savedView;
+    }
+
+    if (typeof window !== 'undefined' && typeof window.matchMedia === 'function') {
+        return window.matchMedia('(max-width: 991.98px)').matches ? 'cards' : 'list';
+    }
+
+    return 'list';
+}
+
+function showViewElement(element, displayClass = null) {
+    if (!element) {
+        return;
+    }
+
+    element.classList.remove('d-none');
+    if (displayClass) {
+        element.classList.add(displayClass);
+    }
+}
+
+function hideViewElement(element, displayClass = null) {
+    if (!element) {
+        return;
+    }
+
+    element.classList.add('d-none');
+    if (displayClass) {
+        element.classList.remove(displayClass);
+    }
+}
+
 function switchView(view) {
-    currentView = view;
+    currentView = view === 'grid' || view === 'cards' ? view : 'list';
     localStorage.setItem('personalWorkspaceViewPreference', view);
 
     const listView = document.getElementById('documents-list-view');
+    const cardView = document.getElementById('documents-card-view');
     const gridView = document.getElementById('documents-grid-view');
     const viewInfo = document.getElementById('docs-view-info');
     const listControls = document.getElementById('list-controls-bar');
@@ -130,8 +183,10 @@ function switchView(view) {
 
     const filterBtn = document.getElementById('docs-filters-toggle-btn');
     const filterCollapse = document.getElementById('docs-filters-collapse');
+    const selectionModeActive = document.getElementById('documents-table')?.classList.contains('selection-mode')
+        || document.getElementById('documents-card-view')?.classList.contains('selection-mode');
 
-    if (view === 'list') {
+    if (currentView === 'list' || currentView === 'cards') {
         // Reset folder drill-down state
         currentFolder = null;
         currentFolderType = null;
@@ -142,39 +197,80 @@ function switchView(view) {
         const tagContainer = document.getElementById('tag-folders-container');
         if (tagContainer) tagContainer.className = 'row g-2';
 
-        listView.style.display = 'block';
-        gridView.style.display = 'none';
-        if (listControls) listControls.style.display = 'flex';
-        if (gridControls) gridControls.style.display = 'none';
-        if (filterBtn) filterBtn.style.display = '';
-        if (viewInfo) viewInfo.textContent = '';
-        // Trigger reload of documents if needed
-        window.fetchUserDocuments?.();
+        if (currentView === 'list') {
+            showViewElement(listView);
+            hideViewElement(cardView);
+            if (viewInfo) {
+                viewInfo.textContent = '';
+            }
+        } else {
+            hideViewElement(listView);
+            showViewElement(cardView);
+            if (viewInfo) {
+                viewInfo.textContent = 'Cards surface status, metadata, and quick actions.';
+            }
+        }
+
+        hideViewElement(gridView);
+        showViewElement(listControls, 'd-flex');
+        hideViewElement(gridControls, 'd-flex');
+        if (filterBtn) {
+            filterBtn.classList.remove('d-none');
+        }
+
+        if (typeof window.renderWorkspaceDocumentView === 'function') {
+            window.renderWorkspaceDocumentView();
+        } else {
+            window.fetchUserDocuments?.();
+        }
     } else {
-        listView.style.display = 'none';
-        gridView.style.display = 'block';
-        if (listControls) listControls.style.display = 'none';
-        if (gridControls) gridControls.style.display = 'flex';
+        hideViewElement(listView);
+        hideViewElement(cardView);
+        showViewElement(gridView);
+        hideViewElement(listControls, 'd-flex');
+        showViewElement(gridControls, 'd-flex');
         // Hide list view filters in grid folder overview
-        if (filterBtn) filterBtn.style.display = 'none';
+        if (filterBtn) {
+            filterBtn.classList.add('d-none');
+        }
         if (filterCollapse) {
             const bsCollapse = bootstrap.Collapse.getInstance(filterCollapse);
             if (bsCollapse) bsCollapse.hide();
         }
+        if (viewInfo) {
+            viewInfo.textContent = 'Browse folders by tag and classification.';
+        }
+        if (selectionModeActive && typeof window.toggleSelectionMode === 'function') {
+            window.toggleSelectionMode();
+        }
         renderGridView();
     }
 }
 
 
 export function setWorkspaceView(view) {
-    const normalizedView = view === 'grid' ? 'grid' : 'list';
+    const normalizedView = view === 'grid' || view === 'cards' ? view : 'list';
     const listRadio = document.getElementById('docs-view-list');
+    const cardsRadio = document.getElementById('docs-view-cards');
     const gridRadio = document.getElementById('docs-view-grid');
 
     if (normalizedView === 'grid') {
         if (gridRadio) {
             gridRadio.checked = true;
         }
+        if (cardsRadio) {
+            cardsRadio.checked = false;
+        }
+        if (listRadio) {
+            listRadio.checked = false;
+        }
+    } else if (normalizedView === 'cards') {
+        if (cardsRadio) {
+            cardsRadio.checked = true;
+        }
+        if (gridRadio) {
+            gridRadio.checked = false;
+        }
         if (listRadio) {
             listRadio.checked = false;
         }
@@ -182,6 +278,9 @@ export function setWorkspaceView(view) {
         if (listRadio) {
             listRadio.checked = true;
         }
+        if (cardsRadio) {
+            cardsRadio.checked = false;
+        }
         if (gridRadio) {
             gridRadio.checked = false;
         }
diff --git a/application/single_app/static/js/workspace/workspace_agents.js b/application/single_app/static/js/workspace/workspace_agents.js
index 88404b86..fc765d75 100644
--- a/application/single_app/static/js/workspace/workspace_agents.js
+++ b/application/single_app/static/js/workspace/workspace_agents.js
@@ -347,7 +347,7 @@ function initializeWorkspaceAgentUI() {
     if (mode === 'grid' && filteredAgents.length) {
       renderAgentsGrid(filteredAgents);
     }
-  });
+  }, { mobileDefault: 'grid' });
 
   fetchAgents();
 }
diff --git a/application/single_app/static/js/workspace/workspace_plugins.js b/application/single_app/static/js/workspace/workspace_plugins.js
index 67a7a966..671402d7 100644
--- a/application/single_app/static/js/workspace/workspace_plugins.js
+++ b/application/single_app/static/js/workspace/workspace_plugins.js
@@ -91,7 +91,7 @@ async function fetchPlugins() {
         document.getElementById('plugins-list-view'),
         document.getElementById('plugins-grid-view')
       );
-    });
+    }, { mobileDefault: 'grid' });
     
     // Set up the create action button
     const createPluginBtn = document.getElementById('create-plugin-btn');
diff --git a/application/single_app/static/js/workspace_section_switcher.js b/application/single_app/static/js/workspace_section_switcher.js
new file mode 100644
index 00000000..733d2183
--- /dev/null
+++ b/application/single_app/static/js/workspace_section_switcher.js
@@ -0,0 +1,59 @@
+// workspace_section_switcher.js
+
+(function initializeWorkspaceSectionSwitchers() {
+    function getTabButtons(tabListSelector) {
+        if (!tabListSelector) {
+            return [];
+        }
+
+        return Array.from(document.querySelectorAll(`${tabListSelector} button[data-bs-toggle="tab"]`));
+    }
+
+    function syncSelectWithActiveTab(selectElement, tabButtons) {
+        const activeButton = tabButtons.find((button) => button.classList.contains('active'));
+        if (activeButton) {
+            selectElement.value = activeButton.id;
+        }
+    }
+
+    function initializeSwitcher(switcherElement) {
+        const selectElement = switcherElement.querySelector('[data-workspace-section-select]');
+        const tabButtons = getTabButtons(switcherElement.dataset.tabList);
+        if (!selectElement || !tabButtons.length) {
+            return;
+        }
+
+        selectElement.addEventListener('change', (event) => {
+            const targetButton = document.getElementById(event.target.value);
+            if (!targetButton) {
+                return;
+            }
+
+            if (typeof bootstrap !== 'undefined' && bootstrap.Tab) {
+                bootstrap.Tab.getOrCreateInstance(targetButton).show();
+            } else {
+                targetButton.click();
+            }
+        });
+
+        tabButtons.forEach((button) => {
+            button.addEventListener('shown.bs.tab', () => {
+                syncSelectWithActiveTab(selectElement, tabButtons);
+            });
+        });
+
+        syncSelectWithActiveTab(selectElement, tabButtons);
+    }
+
+    function bindSwitchers() {
+        document.querySelectorAll('[data-workspace-switcher]').forEach((switcherElement) => {
+            initializeSwitcher(switcherElement);
+        });
+    }
+
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', bindSwitchers);
+    } else {
+        bindSwitchers();
+    }
+})();
\ No newline at end of file
diff --git a/application/single_app/static/js/workspace_sidebar_nav.js b/application/single_app/static/js/workspace_sidebar_nav.js
index 9ed63a37..f3cdc573 100644
--- a/application/single_app/static/js/workspace_sidebar_nav.js
+++ b/application/single_app/static/js/workspace_sidebar_nav.js
@@ -51,6 +51,12 @@ document.addEventListener('DOMContentLoaded', function() {
     };
 });
 
+function syncWorkspaceSidebarActiveTab(tabId) {
+    document.querySelectorAll('.workspace-nav-tab').forEach((link) => {
+        link.classList.toggle('active', link.getAttribute('data-tab') === tabId);
+    });
+}
+
 function initWorkspaceSidebarNav() {
     console.log('Initializing workspace sidebar navigation');
     
@@ -65,6 +71,11 @@ function initWorkspaceSidebarNav() {
     console.log('Group submenu found:', !!groupSubmenu);
     
     toggles.forEach(toggle => {
+        if (toggle.dataset.workspaceToggleBound === 'true') {
+            return;
+        }
+
+        toggle.dataset.workspaceToggleBound = 'true';
         console.log('Setting up toggle for:', toggle.getAttribute('data-target'));
         toggle.addEventListener('click', function(e) {
             e.preventDefault();
@@ -120,6 +131,11 @@ function initWorkspaceSidebarNav() {
     console.log('Found workspace tabs:', workspaceTabs.length);
     
     workspaceTabs.forEach(tabLink => {
+        if (tabLink.dataset.workspaceTabBound === 'true') {
+            return;
+        }
+
+        tabLink.dataset.workspaceTabBound = 'true';
         tabLink.addEventListener('click', function(e) {
             e.preventDefault();
             const tabId = this.getAttribute('data-tab');
@@ -136,6 +152,21 @@ function initWorkspaceSidebarNav() {
             this.classList.add('active');
         });
     });
+
+    document.querySelectorAll('#workspaceTab button[data-bs-toggle="tab"], #groupWorkspaceTab button[data-bs-toggle="tab"]').forEach(tabButton => {
+        if (tabButton.dataset.workspaceSidebarBound === 'true') {
+            return;
+        }
+
+        tabButton.dataset.workspaceSidebarBound = 'true';
+        tabButton.addEventListener('shown.bs.tab', function(event) {
+            const targetSelector = event.target.getAttribute('data-bs-target') || '';
+            const targetId = targetSelector.startsWith('#') ? targetSelector.slice(1) : targetSelector;
+            if (targetId) {
+                syncWorkspaceSidebarActiveTab(targetId);
+            }
+        });
+    });
     
     // Auto-expand the relevant workspace submenu if we're on a workspace page
     if (window.location.pathname.includes('/workspace')) {
@@ -197,6 +228,15 @@ function initWorkspaceSidebarNav() {
             console.log('Group submenu or toggle not found!');
         }
     }
+
+    const activeButton = document.querySelector('#workspaceTab .nav-link.active, #groupWorkspaceTab .nav-link.active');
+    if (activeButton) {
+        const activeTarget = activeButton.getAttribute('data-bs-target') || '';
+        const activeTabId = activeTarget.startsWith('#') ? activeTarget.slice(1) : activeTarget;
+        if (activeTabId) {
+            syncWorkspaceSidebarActiveTab(activeTabId);
+        }
+    }
 }
 
 function showWorkspaceTab(tabId) {
diff --git a/application/single_app/templates/_sidebar_nav.html b/application/single_app/templates/_sidebar_nav.html
index 0c106e39..d26cdfb4 100644
--- a/application/single_app/templates/_sidebar_nav.html
+++ b/application/single_app/templates/_sidebar_nav.html
@@ -4,18 +4,10 @@
   <div id="sidebar-resize-handle" class="sidebar-resize-handle" aria-label="Resize sidebar" role="separator" tabindex="0">
     <i class="bi bi-grip-vertical"></i>
   </div>
-  
-  <!-- Collapse/Expand button -->
-  <button type="button" id="sidebar-toggle-btn" class="btn btn-sm btn-outline-secondary position-absolute d-none d-sm-block"
-          aria-label="Toggle sidebar" title="Hide sidebar"
-          style="top: 1rem; right: 0.75rem; z-index: 1041; width: 28px; height: 28px; padding: 0; border-radius: 4px;"
-          onclick="toggleSidebar()">
-    <i id="sidebar-toggle-icon" class="bi bi-chevron-left" style="font-size: 0.875rem;"></i>
-  </button>
-  
-  <div class="p-3 border-bottom flex-shrink-0">
+
+  <div class="sidebar-header p-3 border-bottom flex-shrink-0">
     {% if app_settings.show_logo %}
-      <a class="navbar-brand d-flex align-items-center mb-2" href="{{ url_for('index') }}">
+      <a class="navbar-brand sidebar-brand-link" href="{{ url_for('index') }}">
         {% if app_settings.custom_logo_base64 or app_settings.custom_logo_dark_base64 %}
           <!-- Light mode logo -->
           {% if app_settings.custom_logo_base64 %}
@@ -41,14 +33,30 @@
           <img id="sidebar-logo-dark" src="{{ url_for('static', filename='images/logo-darkmode.png') }}" alt="Logo" height="32" class="me-2 d-dark-mode-only" />
         {% endif %}
         {% if not app_settings.hide_app_title %}
-          <span id="sidebar-app-title" class="fw-bold sidebar-title-truncate" data-title="{{ app_settings.app_title }}" data-show-logo="{{ app_settings.show_logo }}" title="{{ app_settings.app_title }}">{{ app_settings.app_title }}</span>
+          <span class="sidebar-brand-text">
+            <span id="sidebar-app-title" class="fw-bold sidebar-title-truncate" data-title="{{ app_settings.app_title }}" data-show-logo="{{ app_settings.show_logo }}" title="{{ app_settings.app_title }}">{{ app_settings.app_title }}</span>
+          </span>
         {% endif %}
       </a>
     {% elif not app_settings.hide_app_title %}
-      <a class="navbar-brand fw-bold" href="{{ url_for('index') }}">
-        <span id="sidebar-app-title" class="sidebar-title-truncate" data-title="{{ app_settings.app_title }}" data-show-logo="false" title="{{ app_settings.app_title }}">{{ app_settings.app_title }}</span>
+      <a class="navbar-brand fw-bold sidebar-brand-link" href="{{ url_for('index') }}">
+        <span class="sidebar-brand-text">
+          <span id="sidebar-app-title" class="sidebar-title-truncate" data-title="{{ app_settings.app_title }}" data-show-logo="false" title="{{ app_settings.app_title }}">{{ app_settings.app_title }}</span>
+        </span>
       </a>
     {% endif %}
+
+    <div class="sidebar-toggle-row">
+      <button type="button" id="sidebar-toggle-btn" class="btn btn-sm btn-outline-secondary w-100 sidebar-toggle-control"
+              data-sidebar-toggle="toggle"
+              aria-controls="sidebar-nav"
+              aria-expanded="true"
+              aria-label="Hide navigation"
+              title="Hide navigation">
+        <i id="sidebar-toggle-icon" class="bi bi-chevron-bar-left" aria-hidden="true"></i>
+        <span class="sidebar-toggle-label">Hide navigation</span>
+      </button>
+    </div>
   </div>
   <div id="sidebar-content" class="flex-grow-1 d-flex flex-column" style="padding-bottom: 80px; overflow-y: auto;">
     <ul class="nav flex-column">
@@ -107,6 +115,13 @@
                 </a>
               </li>
               {% endif %}
+              {% if settings.allow_user_custom_endpoints and settings.enable_multi_model_endpoints %}
+              <li class="nav-item">
+                <a class="nav-link d-flex align-items-center workspace-nav-tab" href="#" data-tab="endpoints-tab">
+                  <i class="bi bi-hdd-network me-2" style="font-size: 0.8em;"></i><span class="nav-text">Your Endpoints</span>
+                </a>
+              </li>
+              {% endif %}
             </ul>
             {% else %}
             <!-- Regular Personal workspace link when not on workspace page -->
@@ -147,6 +162,13 @@
                   </a>
                 </li>
               {% endif %}
+              {% if settings.per_user_semantic_kernel and settings.enable_semantic_kernel and settings.allow_group_custom_endpoints and settings.enable_multi_model_endpoints %}
+                <li class="nav-item">
+                  <a class="nav-link d-flex align-items-center workspace-nav-tab" href="#" data-tab="group-endpoints-tab">
+                    <i class="bi bi-hdd-network me-2" style="font-size: 0.8em;"></i><span class="nav-text">Group Endpoints</span>
+                  </a>
+                </li>
+              {% endif %}
             </ul>
             {% else %}
             <!-- Regular Groups workspace link when not on group workspace page -->
@@ -957,147 +979,12 @@
       }
     });
 
-    // Sidebar Toggle Functionality
-    function toggleSidebar() {
-      var sidebar = document.getElementById('sidebar-nav');
-      var toggleBtn = document.getElementById('sidebar-toggle-btn');
-      var toggleIcon = document.getElementById('sidebar-toggle-icon');
-      var floatingBtn = document.getElementById('floating-expand-btn');
-      var body = document.body;
-      
-      // Get all main content containers - using more comprehensive selectors
-      var allContentElements = document.querySelectorAll('.main-content, .container, .container-fluid, #main-content');
-      var mainContent = document.getElementById('main-content');
-      
-      if (sidebar.classList.contains('sidebar-expanded')) {
-        // Hide sidebar completely
-        sidebar.classList.remove('sidebar-expanded');
-        sidebar.classList.add('sidebar-collapsed');
-        body.classList.add('sidebar-collapsed');
-        
-        // Update all content areas - remove left margin when sidebar is hidden
-        allContentElements.forEach(function(element) {
-          element.style.marginLeft = '0px';
-          element.style.maxWidth = '100%';
-        });
-        // Remove sidebar-padding class from main content
-        if (mainContent) mainContent.classList.remove('sidebar-padding');
-        
-        // Hide the sidebar toggle button and show the floating button
-        toggleBtn.style.display = 'none';
-        floatingBtn.classList.remove('d-none');
-        floatingBtn.classList.add('d-block');
-        
-      } else {
-        // Show sidebar
-        sidebar.classList.remove('sidebar-collapsed');
-        sidebar.classList.add('sidebar-expanded');
-        body.classList.remove('sidebar-collapsed');
-        
-        // Remove any inline margin/maxWidth and add sidebar-padding class
-        allContentElements.forEach(function(element) {
-          element.style.marginLeft = '';
-          element.style.maxWidth = '';
-        });
-        if (mainContent) mainContent.classList.add('sidebar-padding');
-        
-        // Show the sidebar toggle button and hide the floating button
-        toggleBtn.style.display = 'block';
-        floatingBtn.classList.remove('d-block');
-        floatingBtn.classList.add('d-none');
-      }
-    }
-    
-    // Add CSS for collapsed state
-    var style = document.createElement('style');
-    style.textContent = `
-      #sidebar-nav {
-        transition: transform 0.3s ease;
-        position: relative;
-      }
-      
-      #sidebar-nav.sidebar-collapsed {
-        transform: translateX(-100%);
-      }
-      
-      /* Fixed user account section */
-      #sidebar-user-account {
-        width: var(--sidebar-width, 260px);
-        min-width: var(--sidebar-min-width, 220px);
-        transition: inherit;
-        backdrop-filter: blur(10px);
-        -webkit-backdrop-filter: blur(10px);
-      }
-      
-      /* Ensure user account section inherits background from sidebar */
-      #sidebar-user-account {
-        background-color: var(--bs-light, #f8f9fa) !important;
-      }
-      
-      /* Dark mode support for user account section */
-      [data-bs-theme="dark"] #sidebar-user-account {
-        background-color: var(--bs-dark, #212529) !important;
-        border-color: var(--bs-border-color-translucent, rgba(255,255,255,0.15)) !important;
-      }
-      
-      /* Smooth transitions for content area adjustments */
-      .main-content,
-      .container,
-      .container-fluid,
-      #main-content {
-        transition: margin-left 0.3s ease-in-out, max-width 0.3s ease-in-out !important;
-      }
-      
-      /* Floating expand button styles */
-      #floating-expand-btn {
-        background-color: var(--bs-body-bg, #fff) !important;
-        border: 1px solid var(--bs-border-color, #dee2e6) !important;
-        box-shadow: 0 2px 8px rgba(0,0,0,0.15) !important;
-        color: var(--bs-body-color, #212529) !important;
-      }
-      
-      /* Dark mode styles for floating expand button */
-      [data-bs-theme="dark"] #floating-expand-btn {
-        background-color: var(--bs-dark, #212529) !important;
-        border: 1px solid var(--bs-border-color-translucent, rgba(255,255,255,0.15)) !important;
-        box-shadow: 0 2px 8px rgba(0,0,0,0.5) !important;
-        color: var(--bs-body-color, #fff) !important;
-      }
-      
-      /* Floating expand button hover effect */
-      #floating-expand-btn:hover {
-        background-color: var(--bs-gray-100, #f8f9fa) !important;
-        transform: scale(1.05);
-        transition: all 0.2s ease;
-      }
-      
-      /* Dark mode hover effect */
-      [data-bs-theme="dark"] #floating-expand-btn:hover {
-        background-color: var(--bs-gray-800, #343a40) !important;
-      }
-      
-      /* Sidebar title truncation styles */
-      .sidebar-title-truncate {
-        display: inline-block;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        max-width: 140px; /* Default max width for no logo scenario (18 chars approx) */
-      }
-      
-      /* When logo is present, reduce max width */
-      [data-show-logo="true"].sidebar-title-truncate {
-        max-width: 80px; /* Reduced width for logo scenario (10 chars approx) */
-      }
-    `;
-    document.head.appendChild(style);
   </script>
 </div>
 <!-- Floating expand button (shown when sidebar is collapsed) -->
 <button type="button" id="floating-expand-btn" class="btn btn-sm btn-outline-secondary d-none"
         aria-label="Show sidebar" title="Show sidebar"
-        style="position: fixed; left: 0.5rem; top: 0.5rem; z-index: 1050; width: auto; min-width: 30px; height: 30px; padding: 3px; border-radius: 1px; display: flex; align-items: center; justify-content: center;"
-        onclick="toggleSidebar()">
+        data-sidebar-toggle="toggle">
   {% if app_settings.custom_logo_base64 or app_settings.custom_logo_dark_base64 %}
     <!-- Light mode logo -->
     {% if app_settings.custom_logo_base64 %}
@@ -1122,4 +1009,5 @@
     <img src="{{ url_for('static', filename='images/logo-lightmode.png') }}" alt="Logo" height="24" style="max-width: none;" class="d-light-mode-only" />
     <img src="{{ url_for('static', filename='images/logo-darkmode.png') }}" alt="Logo" height="24" style="max-width: none;" class="d-dark-mode-only" />
   {% endif %}
+  <span class="floating-expand-label">Open</span>
 </button>
\ No newline at end of file
diff --git a/application/single_app/templates/_sidebar_short_nav.html b/application/single_app/templates/_sidebar_short_nav.html
index dcd66446..dd34a78c 100644
--- a/application/single_app/templates/_sidebar_short_nav.html
+++ b/application/single_app/templates/_sidebar_short_nav.html
@@ -1,11 +1,72 @@
 {# Sidebar Navigation Partial - Short version without brand/logo #}
-<div id="sidebar-nav" class="d-flex flex-column bg-light border-end sidebar-expanded" style="width: var(--sidebar-width, 260px); min-width: var(--sidebar-min-width, 220px); position: fixed; left: 0; top: {% if app_settings.classification_banner_enabled and app_settings.classification_banner_text %}102px{% else %}58px{% endif %}; height: calc(100vh - {% if app_settings.classification_banner_enabled and app_settings.classification_banner_text %}102px{% else %}62px{% endif %}); z-index: 1040; transition: transform 0.3s ease;">
+<div id="sidebar-nav" class="d-flex flex-column bg-light border-end sidebar-expanded chat-sidebar-nav offcanvas-lg offcanvas-start" tabindex="-1" aria-labelledby="chatSidebarDrawerLabel" data-navigation-drawer="chat-rail">
+
+  <div class="offcanvas-header chat-sidebar-mobile-header">
+    <div>
+      <h5 class="offcanvas-title" id="chatSidebarDrawerLabel">Chat Navigation</h5>
+      <p class="mb-0 text-muted small">Conversations and quick actions</p>
+    </div>
+    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+  </div>
 
   <div id="sidebar-resize-handle" class="sidebar-resize-handle" aria-label="Resize sidebar" role="separator" tabindex="0">
     <i class="bi bi-grip-vertical"></i>
   </div>
+
+  <div class="sidebar-short-header chat-sidebar-desktop-header p-3 border-bottom flex-shrink-0">
+    <button type="button" id="sidebar-toggle-btn" class="btn btn-sm btn-outline-secondary w-100 sidebar-toggle-control"
+            data-sidebar-toggle="toggle"
+            aria-controls="sidebar-nav"
+            aria-expanded="true"
+            aria-label="Hide navigation"
+            title="Hide navigation">
+      <i id="sidebar-toggle-icon" class="bi bi-chevron-bar-left" aria-hidden="true"></i>
+      <span class="sidebar-toggle-label">Hide navigation</span>
+    </button>
+  </div>
   
-  <div id="sidebar-content" class="flex-grow-1 d-flex flex-column" style="padding-bottom: 80px; overflow-y: auto;">
+  <div id="sidebar-content" class="flex-grow-1 d-flex flex-column overflow-auto">
+    {% if session.get('user') and session['user'].get('roles') and ('Admin' in session['user']['roles'] or 'User' in session['user']['roles']) %}
+    <div class="chat-sidebar-mobile-sections d-lg-none px-3 pb-3 border-bottom flex-shrink-0">
+      <div class="chat-sidebar-mobile-section">
+        <div class="top-nav-mobile-section-label">Workspace</div>
+        <div class="list-group list-group-flush top-nav-mobile-list">
+          {% if app_settings.enable_user_workspace %}
+          <a class="list-group-item list-group-item-action" href="{{ url_for('workspace') }}">
+            <i class="bi bi-person-workspace me-2"></i>Personal
+          </a>
+          {% endif %}
+          {% if app_settings.enable_group_workspaces %}
+          <a class="list-group-item list-group-item-action" href="{{ url_for('group_workspaces') }}">
+            <i class="bi bi-people me-2"></i>Groups
+          </a>
+          {% endif %}
+          {% if app_settings.enable_public_workspaces %}
+          <a class="list-group-item list-group-item-action" href="{{ url_for('public_directory') }}">
+            <i class="bi bi-globe-americas me-2"></i>Public
+          </a>
+          {% endif %}
+          <a class="list-group-item list-group-item-action" href="{{ url_for('chats') }}">
+            <i class="bi bi-chat-dots me-2"></i>Chat
+          </a>
+        </div>
+      </div>
+
+      {% if app_settings.enable_external_links and app_settings.external_links %}
+      <div class="chat-sidebar-mobile-section">
+        <div class="top-nav-mobile-section-label">{{ app_settings.external_links_menu_name or 'External Links' }}</div>
+        <div class="list-group list-group-flush top-nav-mobile-list">
+          {% for link in app_settings.external_links %}
+          <a class="list-group-item list-group-item-action" href="{{ link.url }}" target="_blank" rel="noopener noreferrer">
+            <i class="bi bi-box-arrow-up-right me-2"></i>{{ link.label }}
+          </a>
+          {% endfor %}
+        </div>
+      </div>
+      {% endif %}
+    </div>
+    {% endif %}
+
     <ul class="nav flex-column">
       {% if session.get('user') and session['user'].get('roles') and ('Admin' in session['user']['roles'] or 'User' in session['user']['roles']) %}
         <li class="nav-item">
@@ -111,7 +172,7 @@
   </div>
   
   <!-- Fixed User Account Section at Bottom -->
-  <div id="sidebar-user-account" class="border-top p-3 position-absolute bottom-0 start-0 end-0" style="background: inherit; z-index: 1050;">
+  <div id="sidebar-user-account" class="border-top p-3 mt-auto chat-sidebar-user-account">
     {% if session.get('user') and session['user'].get('roles') and ('Admin' in session['user']['roles'] or 'User' in session['user']['roles']) %}
       <div class="dropdown">
         <a class="nav-link dropdown-toggle p-0 d-flex align-items-center w-100" href="#" id="sidebarUserDropdown" data-bs-toggle="dropdown" aria-expanded="false" style="display: flex; align-items: center; gap: 0.5rem; min-width: 0;">
@@ -239,169 +300,5 @@
       }
     });
 
-    // Sidebar Toggle Functionality
-    function toggleSidebar() {
-      var sidebar = document.getElementById('sidebar-nav');
-      var toggleBtn = document.getElementById('sidebar-toggle-btn');
-      var toggleIcon = document.getElementById('sidebar-toggle-icon');
-      var floatingBtn = document.getElementById('floating-expand-btn');
-      var body = document.body;
-      
-      // Get all main content containers - using more comprehensive selectors
-      var allContentElements = document.querySelectorAll('.main-content, .container, .container-fluid, #main-content');
-      var mainContent = document.getElementById('main-content');
-      
-      if (sidebar.classList.contains('sidebar-expanded')) {
-        // Hide sidebar completely
-        sidebar.classList.remove('sidebar-expanded');
-        sidebar.classList.add('sidebar-collapsed');
-        body.classList.add('sidebar-collapsed');
-        
-        // Update all content areas - remove left margin when sidebar is hidden
-        allContentElements.forEach(function(element) {
-          element.style.marginLeft = '0px';
-          element.style.maxWidth = '100%';
-        });
-        // Remove sidebar-padding class from main content
-        if (mainContent) mainContent.classList.remove('sidebar-padding');
-        
-        // Hide the sidebar toggle button and show the floating button
-        toggleBtn.style.display = 'none';
-        floatingBtn.classList.remove('d-none');
-        floatingBtn.classList.add('d-block');
-        
-      } else {
-        // Show sidebar
-        sidebar.classList.remove('sidebar-collapsed');
-        sidebar.classList.add('sidebar-expanded');
-        body.classList.remove('sidebar-collapsed');
-        
-        // Remove any inline margin/maxWidth and add sidebar-padding class
-        allContentElements.forEach(function(element) {
-          element.style.marginLeft = '';
-          element.style.maxWidth = '';
-        });
-        if (mainContent) mainContent.classList.add('sidebar-padding');
-        
-        // Show the sidebar toggle button and hide the floating button
-        toggleBtn.style.display = 'block';
-        floatingBtn.classList.remove('d-block');
-        floatingBtn.classList.add('d-none');
-      }
-    }
-    
-    // Add CSS for collapsed state
-    var style = document.createElement('style');
-    style.textContent = `
-      #sidebar-nav {
-        transition: transform 0.3s ease;
-        position: relative;
-      }
-      
-      #sidebar-nav.sidebar-collapsed {
-        transform: translateX(-100%);
-      }
-      
-      /* Fixed user account section */
-      #sidebar-user-account {
-        width: var(--sidebar-width, 260px);
-        min-width: var(--sidebar-min-width, 220px);
-        transition: inherit;
-        backdrop-filter: blur(10px);
-        -webkit-backdrop-filter: blur(10px);
-      }
-      
-      /* Ensure user account section inherits background from sidebar */
-      #sidebar-user-account {
-        background-color: var(--bs-light, #f8f9fa) !important;
-      }
-      
-      /* Dark mode support for user account section */
-      [data-bs-theme="dark"] #sidebar-user-account {
-        background-color: var(--bs-dark, #212529) !important;
-        border-color: var(--bs-border-color-translucent, rgba(255,255,255,0.15)) !important;
-      }
-      
-      /* Smooth transitions for content area adjustments */
-      .main-content,
-      .container,
-      .container-fluid,
-      #main-content {
-        transition: margin-left 0.3s ease-in-out, max-width 0.3s ease-in-out !important;
-      }
-      
-      /* Floating expand button styles */
-      #floating-expand-btn {
-        background-color: var(--bs-body-bg, #fff) !important;
-        border: 1px solid var(--bs-border-color, #dee2e6) !important;
-        box-shadow: 0 2px 8px rgba(0,0,0,0.15) !important;
-        color: var(--bs-body-color, #212529) !important;
-      }
-      
-      /* Dark mode styles for floating expand button */
-      [data-bs-theme="dark"] #floating-expand-btn {
-        background-color: var(--bs-dark, #212529) !important;
-        border: 1px solid var(--bs-border-color-translucent, rgba(255,255,255,0.15)) !important;
-        box-shadow: 0 2px 8px rgba(0,0,0,0.5) !important;
-        color: var(--bs-body-color, #fff) !important;
-      }
-      
-      /* Floating expand button hover effect */
-      #floating-expand-btn:hover {
-        background-color: var(--bs-gray-100, #f8f9fa) !important;
-        transform: scale(1.05);
-        transition: all 0.2s ease;
-      }
-      
-      /* Dark mode hover effect */
-      [data-bs-theme="dark"] #floating-expand-btn:hover {
-        background-color: var(--bs-gray-800, #343a40) !important;
-      }
-      
-      /* Sidebar title truncation styles */
-      .sidebar-title-truncate {
-        display: inline-block;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        max-width: 140px; /* Default max width for no logo scenario (18 chars approx) */
-      }
-      
-      /* When logo is present, reduce max width */
-      [data-show-logo="true"].sidebar-title-truncate {
-        max-width: 80px; /* Reduced width for logo scenario (10 chars approx) */
-      }
-    `;
-    document.head.appendChild(style);
   </script>
 </div>
-<!-- Floating expand button (shown when sidebar is collapsed) -->
-<button type="button" id="floating-expand-btn" class="btn btn-sm btn-outline-secondary d-none"
-        aria-label="Show sidebar" title="Show sidebar"
-        style="position: fixed; left: 0.5rem; top: 0.5rem; z-index: 1050; width: auto; min-width: 30px; height: 30px; padding: 3px; border-radius: 1px; display: flex; align-items: center; justify-content: center;"
-        onclick="toggleSidebar()">
-  {% if app_settings.custom_logo_base64 or app_settings.custom_logo_dark_base64 %}
-    <!-- Light mode logo -->
-    {% if app_settings.custom_logo_base64 %}
-      <img src="{{ url_for('static', filename='images/custom_logo.png') }}?v={{ app_settings.logo_version | default(1) }}" 
-           alt="Logo" height="24" style="max-width: none;" class="d-light-mode-only" />
-    {% else %}
-      <img src="{{ url_for('static', filename='images/logo-lightmode.png') }}" 
-           alt="Logo" height="24" style="max-width: none;" class="d-light-mode-only" />
-    {% endif %}
-    <!-- Dark mode logo -->
-    {% if app_settings.custom_logo_dark_base64 %}
-      <img src="{{ url_for('static', filename='images/custom_logo_dark.png') }}?v={{ app_settings.logo_dark_version | default(1) }}" 
-           alt="Logo" height="24" style="max-width: none;" class="d-dark-mode-only" />
-    {% elif app_settings.custom_logo_base64 %}
-      <img src="{{ url_for('static', filename='images/custom_logo.png') }}?v={{ app_settings.logo_version | default(1) }}" 
-           alt="Logo" height="24" style="max-width: none;" class="d-dark-mode-only" />
-    {% else %}
-      <img src="{{ url_for('static', filename='images/logo-darkmode.png') }}" 
-           alt="Logo" height="24" style="max-width: none;" class="d-dark-mode-only" />
-    {% endif %}
-  {% else %}
-    <img src="{{ url_for('static', filename='images/logo-lightmode.png') }}" alt="Logo" height="24" style="max-width: none;" class="d-light-mode-only" />
-    <img src="{{ url_for('static', filename='images/logo-darkmode.png') }}" alt="Logo" height="24" style="max-width: none;" class="d-dark-mode-only" />
-  {% endif %}
-</button>
\ No newline at end of file
diff --git a/application/single_app/templates/_top_nav.html b/application/single_app/templates/_top_nav.html
index dccf691a..a20b7869 100644
--- a/application/single_app/templates/_top_nav.html
+++ b/application/single_app/templates/_top_nav.html
@@ -1,266 +1,290 @@
-<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
-  <div class="container-fluid">
-    <!-- Brand/Logo -->
-    {% if app_settings.show_logo %}
-      <a class="navbar-brand d-flex align-items-center" href="{{ url_for('index') }}">
-        {% if app_settings.custom_logo_base64 or app_settings.custom_logo_dark_base64 %}
-          <!-- Light mode logo -->
-          {% if app_settings.custom_logo_base64 %}
-            <img src="{{ url_for('static', filename='images/custom_logo.png') }}?v={{ app_settings.logo_version | default(1) }}" 
-                 alt="Logo" height="32" class="me-2 d-light-mode-only" />
-          {% else %}
-            <img src="{{ url_for('static', filename='images/logo-lightmode.png') }}" 
-                 alt="Logo" height="32" class="me-2 d-light-mode-only" />
-          {% endif %}
-          <!-- Dark mode logo -->
-          {% if app_settings.custom_logo_dark_base64 %}
-            <img src="{{ url_for('static', filename='images/custom_logo_dark.png') }}?v={{ app_settings.logo_dark_version | default(1) }}" 
-                 alt="Logo" height="32" class="me-2 d-dark-mode-only" />
-          {% elif app_settings.custom_logo_base64 %}
-            <img src="{{ url_for('static', filename='images/custom_logo.png') }}?v={{ app_settings.logo_version | default(1) }}" 
-                 alt="Logo" height="32" class="me-2 d-dark-mode-only" />
-          {% else %}
-            <img src="{{ url_for('static', filename='images/logo-darkmode.png') }}" 
-                 alt="Logo" height="32" class="me-2 d-dark-mode-only" />
-          {% endif %}
-        {% else %}
-          <img src="{{ url_for('static', filename='images/logo-lightmode.png') }}" alt="Logo" height="32" class="me-2 d-light-mode-only" />
-          <img src="{{ url_for('static', filename='images/logo-darkmode.png') }}" alt="Logo" height="32" class="me-2 d-dark-mode-only" />
-        {% endif %}
-        {% if not app_settings.hide_app_title %}
-          <span class="fw-bold">{{ app_settings.app_title }}</span>
-        {% endif %}
-      </a>
-    {% elif not app_settings.hide_app_title %}
-      <a class="navbar-brand fw-bold" href="{{ url_for('index') }}">{{ app_settings.app_title }}</a>
-    {% else %}
-      <!-- Fallback when both logo and title are hidden -->
-      <a class="navbar-brand fw-bold" href="{{ url_for('index') }}">Home</a>
-    {% endif %}
+{% set is_chat_page = request.endpoint == 'chats' %}
+<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top top-nav-bar{% if is_chat_page %} top-nav-bar-chat{% endif %}">
+    <div class="container-fluid top-nav-shell{% if is_chat_page %} top-nav-shell-chat{% endif %}">
+        <div class="top-nav-brand">
+            {% if app_settings.show_logo %}
+                <a class="navbar-brand d-flex align-items-center top-nav-brand-link" href="{{ url_for('index') }}">
+                    {% if app_settings.custom_logo_base64 or app_settings.custom_logo_dark_base64 %}
+                        {% if app_settings.custom_logo_base64 %}
+                            <img src="{{ url_for('static', filename='images/custom_logo.png') }}?v={{ app_settings.logo_version | default(1) }}" alt="Logo" height="32" class="me-2 d-light-mode-only" />
+                        {% else %}
+                            <img src="{{ url_for('static', filename='images/logo-lightmode.png') }}" alt="Logo" height="32" class="me-2 d-light-mode-only" />
+                        {% endif %}
+                        {% if app_settings.custom_logo_dark_base64 %}
+                            <img src="{{ url_for('static', filename='images/custom_logo_dark.png') }}?v={{ app_settings.logo_dark_version | default(1) }}" alt="Logo" height="32" class="me-2 d-dark-mode-only" />
+                        {% elif app_settings.custom_logo_base64 %}
+                            <img src="{{ url_for('static', filename='images/custom_logo.png') }}?v={{ app_settings.logo_version | default(1) }}" alt="Logo" height="32" class="me-2 d-dark-mode-only" />
+                        {% else %}
+                            <img src="{{ url_for('static', filename='images/logo-darkmode.png') }}" alt="Logo" height="32" class="me-2 d-dark-mode-only" />
+                        {% endif %}
+                    {% else %}
+                        <img src="{{ url_for('static', filename='images/logo-lightmode.png') }}" alt="Logo" height="32" class="me-2 d-light-mode-only" />
+                        <img src="{{ url_for('static', filename='images/logo-darkmode.png') }}" alt="Logo" height="32" class="me-2 d-dark-mode-only" />
+                    {% endif %}
+                    {% if not app_settings.hide_app_title %}
+                        <span class="fw-bold top-nav-brand-title">{{ app_settings.app_title }}</span>
+                    {% endif %}
+                </a>
+            {% elif not app_settings.hide_app_title %}
+                <a class="navbar-brand fw-bold top-nav-brand-link" href="{{ url_for('index') }}">{{ app_settings.app_title }}</a>
+            {% else %}
+                <a class="navbar-brand fw-bold top-nav-brand-link" href="{{ url_for('index') }}">Home</a>
+            {% endif %}
+        </div>
 
-    <!-- Left side nav -->
-    <ul class="navbar-nav me-auto">
-      {% if session.get('user') and session['user'].get('roles') and ('Admin' in session['user']['roles'] or 'User' in session['user']['roles']) %}
-        {% if app_settings.enable_user_workspace %}
-        <li class="nav-item">
-          <a class="nav-link" href="{{ url_for('workspace') }}">Personal</a>
-        </li>
-        {% endif %}
-        {% if app_settings.enable_group_workspaces %}
-        <li class="nav-item">
-          <a class="nav-link" href="{{ url_for('group_workspaces') }}">Groups</a>
-        </li>
-        {% endif %}
-        {% if app_settings.enable_public_workspaces %}
-        <li class="nav-item">
-          <a class="nav-link" href="{{ url_for('public_directory') }}">Public</a>
-        </li>
-        {% endif %}
-        <li class="nav-item">
-          <a class="nav-link" href="{{ url_for('chats') }}">Chat</a>
-        </li>
+        <div class="navbar-nav me-auto d-none d-lg-flex top-nav-primary-nav{% if is_chat_page %} top-nav-chat-nav{% endif %}">
+            {% if session.get('user') and session['user'].get('roles') and ('Admin' in session['user']['roles'] or 'User' in session['user']['roles']) %}
+                {% if app_settings.enable_user_workspace %}
+                    <div class="nav-item">
+                        <a class="nav-link" href="{{ url_for('workspace') }}">Personal</a>
+                    </div>
+                {% endif %}
+                {% if app_settings.enable_group_workspaces %}
+                    <div class="nav-item">
+                        <a class="nav-link" href="{{ url_for('group_workspaces') }}">Groups</a>
+                    </div>
+                {% endif %}
+                {% if app_settings.enable_public_workspaces %}
+                    <div class="nav-item">
+                        <a class="nav-link" href="{{ url_for('public_directory') }}">Public</a>
+                    </div>
+                {% endif %}
+                <div class="nav-item">
+                    <a class="nav-link" href="{{ url_for('chats') }}">Chat</a>
+                </div>
 
-        {% set support_menu_role_allowed = 'Admin' in session['user']['roles'] or 'User' in session['user']['roles'] %}
-        {% if support_menu_role_allowed and app_settings.enable_support_menu %}
-          {% set show_support_latest_features = app_settings.enable_support_latest_features and app_settings.support_latest_features_has_visible_items %}
-          {% set show_support_send_feedback = app_settings.enable_support_send_feedback and app_settings.support_feedback_recipient_configured %}
-          {% if show_support_latest_features or show_support_send_feedback %}
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="supportMenuDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                {{ app_settings.support_menu_name or 'Support' }}
-              </a>
-              <ul class="dropdown-menu" aria-labelledby="supportMenuDropdown">
-                {% if show_support_latest_features %}
-                <li>
-                  <a class="dropdown-item" href="{{ url_for('support_latest_features') }}">
-                    Latest Features
-                  </a>
-                </li>
+                {% set support_menu_role_allowed = 'Admin' in session['user']['roles'] or 'User' in session['user']['roles'] %}
+                {% if support_menu_role_allowed and app_settings.enable_support_menu %}
+                    {% set show_support_latest_features = app_settings.enable_support_latest_features and app_settings.support_latest_features_has_visible_items %}
+                    {% set show_support_send_feedback = app_settings.enable_support_send_feedback and app_settings.support_feedback_recipient_configured %}
+                    {% if show_support_latest_features or show_support_send_feedback %}
+                        <div class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" id="supportMenuDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                {{ app_settings.support_menu_name or 'Support' }}
+                            </a>
+                            <div class="dropdown-menu" aria-labelledby="supportMenuDropdown">
+                                {% if show_support_latest_features %}
+                                    <a class="dropdown-item" href="{{ url_for('support_latest_features') }}">
+                                        Latest Features
+                                    </a>
+                                {% endif %}
+                                {% if show_support_send_feedback %}
+                                    <a class="dropdown-item" href="{{ url_for('support_send_feedback') }}">
+                                        Send Feedback
+                                    </a>
+                                {% endif %}
+                            </div>
+                        </div>
+                    {% endif %}
                 {% endif %}
-                {% if show_support_send_feedback %}
-                <li>
-                  <a class="dropdown-item" href="{{ url_for('support_send_feedback') }}">
-                    Send Feedback
-                  </a>
-                </li>
+
+                {% if app_settings.enable_external_links and app_settings.external_links %}
+                    {% set should_force_menu = app_settings.external_links_force_menu %}
+                    {% set link_count = app_settings.external_links|length %}
+                    {% if should_force_menu or link_count >= 3 %}
+                        <div class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" id="externalLinksDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                {{ app_settings.external_links_menu_name or 'External Links' }}
+                            </a>
+                            <div class="dropdown-menu" aria-labelledby="externalLinksDropdown">
+                                {% for link in app_settings.external_links %}
+                                    <a class="dropdown-item" href="{{ link.url }}" target="_blank" rel="noopener noreferrer">
+                                        {{ link.label }}
+                                    </a>
+                                {% endfor %}
+                            </div>
+                        </div>
+                    {% else %}
+                        {% for link in app_settings.external_links %}
+                            <div class="nav-item">
+                                <a class="nav-link" href="{{ link.url }}" target="_blank" rel="noopener noreferrer">
+                                    {{ link.label }}
+                                </a>
+                            </div>
+                        {% endfor %}
+                    {% endif %}
                 {% endif %}
-              </ul>
-            </li>
-          {% endif %}
-        {% endif %}
-        
-        <!-- External Links -->
-        {% if app_settings.enable_external_links and app_settings.external_links %}
-          {% set should_force_menu = app_settings.external_links_force_menu %}
-          {% set link_count = app_settings.external_links|length %}
-          {% if should_force_menu or link_count >= 3 %}
-            <!-- Display as dropdown menu -->
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="externalLinksDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                {{ app_settings.external_links_menu_name or 'External Links' }}
-              </a>
-              <ul class="dropdown-menu" aria-labelledby="externalLinksDropdown">
-                {% for link in app_settings.external_links %}
-                <li>
-                  <a class="dropdown-item" href="{{ link.url }}" target="_blank" rel="noopener noreferrer">
-                    {{ link.label }}
-                  </a>
-                </li>
-                {% endfor %}
-              </ul>
-            </li>
-          {% else %}
-            <!-- Display as individual nav items for 1-2 links -->
-            {% for link in app_settings.external_links %}
-            <li class="nav-item">
-              <a class="nav-link" href="{{ link.url }}" target="_blank" rel="noopener noreferrer">
-                {{ link.label }}
-              </a>
-            </li>
-            {% endfor %}
-          {% endif %}
-        {% endif %}
-      {% endif %}
-    </ul>
-    <!-- Right side nav -->
-    <ul class="navbar-nav">
-      {% if session.get('user') and session['user'].get('roles') and ('Admin' in session['user']['roles'] or 'User' in session['user']['roles']) %}
-        <!-- My Account Dropdown -->
-        <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle p-0" href="#" id="userDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false" style="display: flex; align-items: center; gap: 0.5rem;">
-            {% set profile_image = user_settings.get("settings", {}).get("profileImage", "") %}
-            <div id="top-nav-profile-avatar" class="rounded-circle bg-secondary d-flex align-items-center justify-content-center" style="width: 28px; height: 28px; position: relative;">
-              {% if profile_image %}
-                <!-- Render profile image directly from server data -->
-                <img src="{{ profile_image }}" alt="Profile" class="rounded-circle" style="width: 28px; height: 28px; object-fit: cover;">
-              {% else %}
-                <!-- Fallback to initials with class for JS targeting -->
-                <span class="text-white fw-bold nav-initials" style="font-size: 1rem;">{{ session['user'].get('name', '')[:2] }}</span>
-              {% endif %}
-              <!-- Notification badge - positioned at bottom-right corner -->
-              <span id="notification-badge" class="position-absolute badge rounded-circle bg-danger align-items-center justify-content-center" style="display: none; font-size: 0.6rem; font-weight: 700; bottom: -2px; right: -2px; width: 18px; height: 18px; padding: 0; line-height: 1; border: 2px solid white;"></span>
-            </div>
-            <div class="d-flex flex-column justify-content-center" style="line-height: 1;">
-              <span class="fw-semibold" style="font-size: 1rem;">{{ session['user'].get('name', 'User') }}</span>
-              <span class="text-muted" style="font-size: 0.75rem;">
-                {% if 'Admin' in session['user']['roles'] %}
-                  Admin account
+            {% endif %}
+        </div>
+
+        <div class="top-nav-actions">
+            {% if is_chat_page %}
+            <button class="btn btn-outline-secondary d-lg-none top-nav-mobile-toggle" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebar-nav" aria-label="Open chat navigation">
+                <i class="bi bi-list"></i>
+            </button>
+            {% else %}
+            <button class="btn btn-outline-secondary d-lg-none top-nav-mobile-toggle" type="button" data-bs-toggle="offcanvas" data-bs-target="#topNavMobileMenu" aria-controls="topNavMobileMenu" aria-label="Open navigation">
+                <i class="bi bi-list"></i>
+            </button>
+            {% endif %}
+
+            <div class="navbar-nav top-nav-user-nav">
+                {% if session.get('user') and session['user'].get('roles') and ('Admin' in session['user']['roles'] or 'User' in session['user']['roles']) %}
+                    <div class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle p-0 top-nav-user-trigger" href="#" id="userDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            {% set profile_image = user_settings.get("settings", {}).get("profileImage", "") %}
+                            <div id="top-nav-profile-avatar" class="rounded-circle bg-secondary d-flex align-items-center justify-content-center top-nav-profile-avatar">
+                                {% if profile_image %}
+                                    <img src="{{ profile_image }}" alt="Profile" class="rounded-circle top-nav-profile-image" />
+                                {% else %}
+                                    <span class="text-white fw-bold nav-initials top-nav-initials">{{ session['user'].get('name', '')[:2] }}</span>
+                                {% endif %}
+                                <span id="notification-badge" class="position-absolute badge rounded-circle bg-danger align-items-center justify-content-center top-nav-notification-badge"></span>
+                            </div>
+                            <div class="top-nav-user-meta d-none d-lg-flex">
+                                <span class="fw-semibold top-nav-user-name">{{ session['user'].get('name', 'User') }}</span>
+                                <span class="text-muted top-nav-user-role">
+                                    {% if 'Admin' in session['user']['roles'] %}
+                                        Admin account
+                                    {% else %}
+                                        Personal Account
+                                    {% endif %}
+                                </span>
+                            </div>
+                        </a>
+                        <div class="dropdown-menu dropdown-menu-end top-nav-user-menu" aria-labelledby="userDropdown">
+                            <a class="dropdown-item" href="{{ url_for('profile') }}">
+                                <i class="bi bi-person-circle me-2"></i>
+                                {{ session['user'].get('name') }}
+                            </a>
+                            <a class="dropdown-item dark-mode-toggle" id="topNavDarkModeToggle" role="button" href="#">
+                                <span id="topNavSwitchToDarkText">
+                                    <i class="bi bi-moon-fill me-2"></i>Dark Mode
+                                </span>
+                                <span id="topNavSwitchToLightText" class="d-none">
+                                    <i class="bi bi-sun-fill me-2"></i>Light Mode
+                                </span>
+                            </a>
+                            <a class="dropdown-item nav-layout-toggle" href="#">
+                                <span id="switchToLeftNavText">
+                                    <i class="bi bi-layout-sidebar me-2"></i>Left Nav
+                                </span>
+                                <span id="switchToTopNavText" class="d-none">
+                                    <i class="bi bi-window-dock me-2"></i>Top Nav
+                                </span>
+                            </a>
+                            <hr class="dropdown-divider" />
+                            <a class="dropdown-item" href="{{ url_for('notifications') }}">
+                                <i class="bi bi-bell me-2"></i>Notifications
+                                <span id="notification-count-badge" class="badge bg-danger ms-2">0</span>
+                            </a>
+                            <a class="dropdown-item" href="{{ url_for('approvals') }}">
+                                <i class="bi bi-check-circle me-2"></i>Approval Requests
+                            </a>
+                            <hr class="dropdown-divider" />
+                            {% if app_settings.enable_group_workspaces %}
+                                <a class="dropdown-item" href="{{ url_for('my_groups') }}">My Groups</a>
+                            {% endif %}
+                            {% if app_settings.enable_public_workspaces %}
+                                <a class="dropdown-item" href="{{ url_for('my_public_workspaces') }}">My Public Workspaces</a>
+                            {% endif %}
+                            {% if app_settings.enable_user_feedback %}
+                                <a class="dropdown-item" href="{{ url_for('my_feedback') }}">My Feedback</a>
+                            {% endif %}
+                            {% if app_settings.enable_content_safety %}
+                                <a class="dropdown-item" href="{{ url_for('my_safety_violations') }}">My Safety Violations</a>
+                            {% endif %}
+                            {% if 'Admin' in session['user']['roles'] %}
+                                <hr class="dropdown-divider" />
+                                <div class="dropdown-header top-nav-menu-section">Admin</div>
+                                <a class="dropdown-item" href="{{ url_for('admin_settings') }}">App Settings</a>
+                            {% endif %}
+                            {% if (app_settings.require_member_of_control_center_admin and session.get('user') and 'ControlCenterAdmin' in session['user']['roles']) or (app_settings.require_member_of_control_center_dashboard_reader and session.get('user') and 'ControlCenterDashboardReader' in session['user']['roles']) or (not app_settings.require_member_of_control_center_admin and 'Admin' in session['user']['roles']) %}
+                                <a class="dropdown-item" href="{{ url_for('control_center') }}">Control Center</a>
+                            {% endif %}
+                            {% if app_settings.enable_content_safety %}
+                                {% if (app_settings.require_member_of_safety_violation_admin and session.get('user') and 'SafetyViolationAdmin' in session['user']['roles']) or (not app_settings.require_member_of_safety_violation_admin and 'Admin' in session['user']['roles']) %}
+                                    <a class="dropdown-item" href="{{ url_for('admin_safety_violations') }}">Safety Violations</a>
+                                {% endif %}
+                            {% endif %}
+                            {% if app_settings.enable_user_feedback %}
+                                {% if (app_settings.require_member_of_feedback_admin and session.get('user') and 'FeedbackAdmin' in session['user']['roles']) or (not app_settings.require_member_of_feedback_admin and 'Admin' in session['user']['roles']) %}
+                                    <a class="dropdown-item" href="{{ url_for('admin_feedback_review') }}">Feedback Review</a>
+                                {% endif %}
+                            {% endif %}
+                            <hr class="dropdown-divider" />
+                            <a class="dropdown-item" href="{{ url_for('logout') }}">
+                                <i class="bi bi-box-arrow-right me-2"></i>Logout
+                            </a>
+                        </div>
+                    </div>
                 {% else %}
-                  Personal Account
+                    <div class="nav-item d-none d-lg-block">
+                        <a class="nav-link" href="{{ url_for('login') }}">Login</a>
+                    </div>
                 {% endif %}
-              </span>
             </div>
-          </a>
-          <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
-            <li>
-              <a class="dropdown-item" href="{{ url_for('profile') }}">
-                <i class="bi bi-person-circle me-2"></i>
-                {{ session['user'].get('name') }}
-              </a>
-            </li>
-            <li>
-              <a class="dropdown-item dark-mode-toggle" id="topNavDarkModeToggle" role="button" href="#">
-                <span id="topNavSwitchToDarkText">
-                  <i class="bi bi-moon-fill me-2"></i>Dark Mode
-                </span>
-                <span id="topNavSwitchToLightText" class="d-none">
-                  <i class="bi bi-sun-fill me-2"></i>Light Mode
-                </span>
-              </a>
-            </li>
-            <li>
-              <a class="dropdown-item nav-layout-toggle" href="#">
-                <span id="switchToLeftNavText" class="">
-                  <i class="bi bi-layout-sidebar me-2"></i>Left Nav
-                </span>
-                <span id="switchToTopNavText" class="d-none">
-                  <i class="bi bi-window-dock me-2"></i>Top Nav
-                </span>
-              </a>
-            </li>
-            <li><hr class="dropdown-divider"></li>
-            <!-- Notifications -->
-            <li>
-              <a class="dropdown-item" href="{{ url_for('notifications') }}">
-                <i class="bi bi-bell me-2"></i>Notifications
-                <span id="notification-count-badge" class="badge bg-danger ms-2" style="display: none;">0</span>
-              </a>
-            </li>
-            <li>
-              <a class="dropdown-item" href="{{ url_for('approvals') }}">
-                <i class="bi bi-check-circle me-2"></i>Approval Requests
-              </a>
-            </li>
-            <li><hr class="dropdown-divider"></li>
-            {% if app_settings.enable_group_workspaces %}
-            <li>
-              <a class="dropdown-item" href="{{ url_for('my_groups') }}">My Groups</a>
-            </li>
-            {% endif %}
-            {% if app_settings.enable_public_workspaces %}
-            <li>
-              <a class="dropdown-item" href="{{ url_for('my_public_workspaces') }}">My Public Workspaces</a>
-            </li>
-            {% endif %}
-            {% if app_settings.enable_user_feedback %}
-            <li>
-              <a class="dropdown-item" href="{{ url_for('my_feedback') }}">My Feedback</a>
-            </li>
-            {% endif %}
-            {% if app_settings.enable_content_safety %}
-            <li>
-              <a class="dropdown-item" href="{{ url_for('my_safety_violations') }}">My Safety Violations</a>
-            </li>
-            {% endif %}
-            {% if 'Admin' in session['user']['roles'] %}
-            <li><hr class="dropdown-divider"></li>
-            <div class="px-3 pt-2 pb-1 text-muted small" style="font-weight: 500; letter-spacing: 0.02em;">
-              Admin
+        </div>
+    </div>
+</nav>
+{% if not is_chat_page %}
+<div class="offcanvas offcanvas-start top-nav-mobile-drawer" tabindex="-1" id="topNavMobileMenu" aria-labelledby="topNavMobileMenuLabel" data-navigation-drawer="top-nav">
+    <div class="offcanvas-header">
+        <h5 class="offcanvas-title" id="topNavMobileMenuLabel">Navigation</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+    <div class="offcanvas-body">
+        {% if session.get('user') and session['user'].get('roles') and ('Admin' in session['user']['roles'] or 'User' in session['user']['roles']) %}
+            <div class="top-nav-mobile-section-label">Workspace</div>
+            <div class="list-group list-group-flush top-nav-mobile-list">
+                {% if app_settings.enable_user_workspace %}
+                    <a class="list-group-item list-group-item-action" href="{{ url_for('workspace') }}">
+                        <i class="bi bi-person-workspace me-2"></i>Personal
+                    </a>
+                {% endif %}
+                {% if app_settings.enable_group_workspaces %}
+                    <a class="list-group-item list-group-item-action" href="{{ url_for('group_workspaces') }}">
+                        <i class="bi bi-people me-2"></i>Groups
+                    </a>
+                {% endif %}
+                {% if app_settings.enable_public_workspaces %}
+                    <a class="list-group-item list-group-item-action" href="{{ url_for('public_directory') }}">
+                        <i class="bi bi-globe-americas me-2"></i>Public
+                    </a>
+                {% endif %}
+                <a class="list-group-item list-group-item-action" href="{{ url_for('chats') }}">
+                    <i class="bi bi-chat-dots me-2"></i>Chat
+                </a>
             </div>
-            <li>
-              <a class="dropdown-item" href="{{ url_for('admin_settings') }}">App Settings</a>
-            </li>
-            {% endif %}
-            {# Control Center - access based on role requirements #}
-            {# When require_member_of_control_center_admin ENABLED: only ControlCenterAdmin role grants access #}
-            {# When DISABLED (default): only regular Admin role grants access #}
-            {# DashboardReader role grants dashboard-only access when that setting is enabled #}
-            {% if (app_settings.require_member_of_control_center_admin and session.get('user') and 'ControlCenterAdmin' in session['user']['roles']) or (app_settings.require_member_of_control_center_dashboard_reader and session.get('user') and 'ControlCenterDashboardReader' in session['user']['roles']) or (not app_settings.require_member_of_control_center_admin and 'Admin' in session['user']['roles']) %}
-            <li>
-              <a class="dropdown-item" href="{{ url_for('control_center') }}">Control Center</a>
-            </li>
-            {% endif %}
-            {# Safety Violations - only show when requirement enabled AND user has role, OR requirement disabled AND user is admin #}
-            {% if app_settings.enable_content_safety %}
-              {% if (app_settings.require_member_of_safety_violation_admin and session.get('user') and 'SafetyViolationAdmin' in session['user']['roles']) or (not app_settings.require_member_of_safety_violation_admin and 'Admin' in session['user']['roles']) %}
-              <li>
-                <a class="dropdown-item" href="{{ url_for('admin_safety_violations') }}">Safety Violations</a>
-              </li>
-              {% endif %}
+
+            {% set support_menu_role_allowed = 'Admin' in session['user']['roles'] or 'User' in session['user']['roles'] %}
+            {% if support_menu_role_allowed and app_settings.enable_support_menu %}
+                {% set show_support_latest_features = app_settings.enable_support_latest_features and app_settings.support_latest_features_has_visible_items %}
+                {% set show_support_send_feedback = app_settings.enable_support_send_feedback and app_settings.support_feedback_recipient_configured %}
+                {% if show_support_latest_features or show_support_send_feedback %}
+                    <div class="top-nav-mobile-section-label">{{ app_settings.support_menu_name or 'Support' }}</div>
+                    <div class="list-group list-group-flush top-nav-mobile-list">
+                        {% if show_support_latest_features %}
+                            <a class="list-group-item list-group-item-action" href="{{ url_for('support_latest_features') }}">
+                                <i class="bi bi-stars me-2"></i>Latest Features
+                            </a>
+                        {% endif %}
+                        {% if show_support_send_feedback %}
+                            <a class="list-group-item list-group-item-action" href="{{ url_for('support_send_feedback') }}">
+                                <i class="bi bi-chat-left-text me-2"></i>Send Feedback
+                            </a>
+                        {% endif %}
+                    </div>
+                {% endif %}
             {% endif %}
-            {# Feedback Review - only show when requirement enabled AND user has role, OR requirement disabled AND user is admin #}
-            {% if app_settings.enable_user_feedback %}
-              {% if (app_settings.require_member_of_feedback_admin and session.get('user') and 'FeedbackAdmin' in session['user']['roles']) or (not app_settings.require_member_of_feedback_admin and 'Admin' in session['user']['roles']) %}
-              <li>
-                <a class="dropdown-item" href="{{ url_for('admin_feedback_review') }}">Feedback Review</a>
-              </li>
-              {% endif %}
+
+            {% if app_settings.enable_external_links and app_settings.external_links %}
+                <div class="top-nav-mobile-section-label">{{ app_settings.external_links_menu_name or 'External Links' }}</div>
+                <div class="list-group list-group-flush top-nav-mobile-list">
+                    {% for link in app_settings.external_links %}
+                        <a class="list-group-item list-group-item-action" href="{{ link.url }}" target="_blank" rel="noopener noreferrer">
+                            <i class="bi bi-box-arrow-up-right me-2"></i>{{ link.label }}
+                        </a>
+                    {% endfor %}
+                </div>
             {% endif %}
-            <li><hr class="dropdown-divider"></li>
-            <li>
-              <a class="dropdown-item" href="{{ url_for('logout') }}">
-                <i class="bi bi-box-arrow-right me-2"></i> Logout
-              </a>
-            </li>
-          </ul>
-        </li>
-      {% else %}
-        <li class="nav-item">
-          <a class="nav-link" href="{{ url_for('login') }}">
-            Login
-          </a>
-        </li>
-      {% endif %}
-    </ul>
-  </div>
-</nav>
\ No newline at end of file
+        {% else %}
+            <div class="list-group list-group-flush top-nav-mobile-list">
+                <a class="list-group-item list-group-item-action" href="{{ url_for('login') }}">
+                    <i class="bi bi-box-arrow-in-right me-2"></i>Login
+                </a>
+            </div>
+        {% endif %}
+    </div>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/application/single_app/templates/admin_settings.html b/application/single_app/templates/admin_settings.html
index 300a6be8..2afbb6bb 100644
--- a/application/single_app/templates/admin_settings.html
+++ b/application/single_app/templates/admin_settings.html
@@ -1579,19 +1579,58 @@ <h5 class="mb-0">
                     </div>
                     <p class="text-muted mb-3">Configure health check endpoint for external monitoring systems.</p>
 
-                    <div class="form-check form-switch mb-2">
-                        <input
-                            type="checkbox"
-                            class="form-check-input"
-                            id="enable_external_healthcheck"
-                            name="enable_external_healthcheck"
-                            {% if settings.enable_external_healthcheck %}checked{% endif %}>
-                        <label class="form-check-label ms-2" for="enable_external_healthcheck">
-                            Enable External Health Check Endpoint (/external/healthcheck)
-                        </label>
-                        <i class="bi bi-info-circle ms-2" data-bs-toggle="tooltip" title="Enable the /external/healthcheck endpoint for external monitoring systems."></i>
+                    <div class="row g-3">
+                        <div class="col-lg-6">
+                            <div class="border rounded p-3 h-100 bg-body-tertiary-subtle">
+                                <div class="d-flex align-items-start justify-content-between gap-2">
+                                    <div>
+                                        <h6 class="mb-1">Authenticated Endpoint</h6>
+                                        <p class="text-muted small mb-0">Use when your monitoring system can reach a protected route and you want the endpoint governed by the normal app access boundary.</p>
+                                    </div>
+                                    <span class="badge text-bg-primary">Protected</span>
+                                </div>
+                                <div class="form-check form-switch mt-3 mb-2">
+                                    <input
+                                        type="checkbox"
+                                        class="form-check-input"
+                                        id="enable_external_healthcheck"
+                                        name="enable_external_healthcheck"
+                                        {% if settings.enable_external_healthcheck %}checked{% endif %}>
+                                    <label class="form-check-label ms-2" for="enable_external_healthcheck">
+                                        Enable /external/healthcheck
+                                    </label>
+                                    <i class="bi bi-info-circle ms-2" data-bs-toggle="tooltip" title="Enable the authenticated /external/healthcheck endpoint for external monitoring systems."></i>
+                                </div>
+                                <p class="text-muted small mb-0">Best for internal monitors or diagnostics tooling that already authenticates to the application.</p>
+                            </div>
+                        </div>
+                        <div class="col-lg-6">
+                            <div class="border rounded p-3 h-100 border-warning-subtle bg-warning-subtle">
+                                <div class="d-flex align-items-start justify-content-between gap-2">
+                                    <div>
+                                        <h6 class="mb-1">Unauthenticated Endpoint</h6>
+                                        <p class="text-muted small mb-0">Use when a platform health probe cannot sign in and only needs a lightweight availability response.</p>
+                                    </div>
+                                    <span class="badge text-bg-warning">No Auth</span>
+                                </div>
+                                <div class="form-check form-switch mt-3 mb-2">
+                                    <input
+                                        type="checkbox"
+                                        class="form-check-input"
+                                        id="enable_no_auth_external_healthcheck"
+                                        name="enable_no_auth_external_healthcheck"
+                                        {% if settings.enable_no_auth_external_healthcheck %}checked{% endif %}>
+                                    <label class="form-check-label ms-2" for="enable_no_auth_external_healthcheck">
+                                        Enable /external/healthcheckz
+                                    </label>
+                                    <i class="bi bi-info-circle ms-2" data-bs-toggle="tooltip" title="Enable the unauthenticated /external/healthcheckz endpoint for probes that cannot authenticate."></i>
+                                </div>
+                                <div class="alert alert-warning small mb-0" role="alert">
+                                    <strong>Security note:</strong> This route is intentionally unauthenticated. Only enable it for trusted health probes or controlled network paths.
+                                </div>
+                            </div>
+                        </div>
                     </div>
-                    <p class="text-muted small mb-0">Health check endpoint for external monitoring systems that require endpoint verification.</p>
                 </div>
 
                 <div class="card p-3 mb-3" id="swagger-section">
diff --git a/application/single_app/templates/base.html b/application/single_app/templates/base.html
index 16028a63..43d13363 100644
--- a/application/single_app/templates/base.html
+++ b/application/single_app/templates/base.html
@@ -48,15 +48,15 @@
   <style>
     /* Add this: if banner is present, increase padding-top */
     #classification-banner + nav.navbar.fixed-top {
-      top: 40px; /* Height of the banner */
+      top: var(--classification-banner-height, 40px);
     }
     #classification-banner {
-      height: 40px;
-      line-height: 40px;
+      height: var(--classification-banner-height, 40px);
+      line-height: var(--classification-banner-height, 40px);
     }
     /* Adjust body padding if banner is present */
     body.has-classification-banner {
-      padding-top: 96px; /* 56px navbar + 40px banner */
+      padding-top: calc(var(--top-nav-height, 56px) + var(--classification-banner-height, 40px));
     }
 
     .main-content {
@@ -64,10 +64,19 @@
     }
     /* Sidebar padding for main content when sidebar is enabled */
     .sidebar-padding {
-      padding-left: var(--sidebar-width, 260px);
       padding-top: 0 !important;
     }
 
+    body:not(.sidebar-nav-enabled) .sidebar-padding {
+      padding-left: var(--sidebar-width, 260px);
+    }
+
+    @media (max-width: 991.98px) {
+      body:not(.sidebar-nav-enabled) .sidebar-padding {
+        padding-left: 0;
+      }
+    }
+
     .modal-body {
       overflow: auto;
     }
@@ -180,7 +189,7 @@
     .editor-toolbar a.fa-question-circle:before { content: "?"; }
 
     .chat-container {
-      max-height: calc(100vh - 56px);
+      max-height: calc(100vh - var(--top-nav-height, 66px));
       display: flex;
       flex-direction: column;
       overflow: hidden;
@@ -254,7 +263,10 @@
   {% block head %}{% endblock %}
 </head>
 
-<body class="d-flex flex-column min-vh-100{% if app_settings.classification_banner_enabled and app_settings.classification_banner_text %} has-classification-banner{% endif %}">
+{% set nav_layout = user_settings.get('settings', {}).get('navLayout') %}
+{% set is_sidebar_layout = nav_layout == 'sidebar' or (not nav_layout and app_settings.enable_left_nav_default) %}
+{% set is_chat_page = request.endpoint == 'chats' %}
+<body class="d-flex flex-column min-vh-100{% if app_settings.classification_banner_enabled and app_settings.classification_banner_text %} has-classification-banner{% endif %}{% if is_chat_page %} chat-shell-page{% endif %}{% if is_chat_page and not is_sidebar_layout %} chat-top-nav-shell{% endif %}">
   {% if app_settings.classification_banner_enabled and app_settings.classification_banner_text %}
     <div id="classification-banner"
          style="background: {{ app_settings.classification_banner_color or '#ffc107' }}; color: {{ app_settings.classification_banner_text_color or '#ffffff' }}; display: flex; align-items: center; justify-content: center; text-align: center; font-weight: bold; padding: 0; height: 40px; font-size: 1.1em; letter-spacing: 0.5px; position: fixed; top: 0; left: 0; width: 100%; z-index: 1051;">
@@ -263,13 +275,12 @@
   {% endif %}
   <!-- Navigation Bar -->
   {% set left_sidebar_enabled = false %}
-  {% set nav_layout = user_settings.get('settings', {}).get('navLayout') %}
-  {% if nav_layout == 'sidebar' or (not nav_layout and app_settings.enable_left_nav_default) %}
+  {% if is_sidebar_layout %}
     {% include "_sidebar_nav.html" %}
     {% set left_sidebar_enabled = true %}
   {% else %}
     {% include "_top_nav.html" %}
-    {% if request.endpoint == 'chats' %}
+    {% if is_chat_page %}
       {% include "_sidebar_short_nav.html" %}
       {% set left_sidebar_enabled = true %}
     {% endif %}
diff --git a/application/single_app/templates/chats.html b/application/single_app/templates/chats.html
index 95c4e306..dfcb1138 100644
--- a/application/single_app/templates/chats.html
+++ b/application/single_app/templates/chats.html
@@ -9,10 +9,7 @@
     <link rel="stylesheet" href="/static/css/chat-speech-input.css">
     {% endif %}
     <style>
-        /* Initial layout styles to prevent shifting when top nav is active */
-        {% set nav_layout = user_settings.get('settings', {}).get('navLayout') %}
-        {% if nav_layout != 'sidebar' and not (not nav_layout and app_settings.enable_left_nav_default) %}
-        /* Top navigation layout - hide left pane and expand right pane (same as sidebar layout) */
+        /* Initial layout styles to prevent chat shell shifting on load */
         #left-pane {
             display: none !important;
         }
@@ -30,26 +27,6 @@
             width: 100% !important;
             max-width: 1000px !important;
         }
-        {% else %}
-        /* Sidebar navigation layout - hide left pane and expand right pane */
-        #left-pane {
-            display: none !important;
-        }
-        
-        #right-pane {
-            width: 100% !important;
-            height: 100% !important;
-            display: flex !important;
-            flex-direction: column !important;
-            align-items: center !important;
-        }
-        
-        /* Center and limit width of right pane content when using sidebar */
-        #right-pane > div {
-            width: 100% !important;
-            max-width: 1000px !important;
-        }
-        {% endif %}
         
         /* Styles for conversation checkboxes */
         .conversation-item {
@@ -261,16 +238,21 @@ <h5>Conversations</h5>
         </div>
 
         <div class="d-flex flex-column h-100 chat-container">
-            <div class="p-3 border-bottom align-items-center justify-content-between flex-shrink-0">
-                <div class="d-flex flex-column">
-                    <div class="d-flex align-items-center">
-                        <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
-                        </h5>
-                        <button id="conversation-info-btn" class="btn btn-link p-0 ms-2" style="color: #6c757d; display: none;" data-bs-toggle="tooltip" data-bs-placement="top" title="View conversation details">
-                            <i class="bi bi-info-circle"></i>
+            <div class="p-3 border-bottom flex-shrink-0 chat-shell-header">
+                <div class="d-flex flex-column w-100 chat-shell-header-content">
+                    <div class="d-flex align-items-center chat-shell-title-row">
+                        <button type="button" id="chat-sidebar-inline-toggle" class="btn btn-outline-secondary btn-sm d-none d-lg-inline-flex align-items-center justify-content-center me-2" data-sidebar-toggle="toggle" aria-expanded="true" aria-label="Toggle chat navigation" title="Toggle chat navigation">
+                            <i class="bi bi-layout-sidebar"></i>
                         </button>
+                        <h5 id="current-conversation-title" class="mb-0 flex-grow-1 text-truncate">
+                        </h5>
+                        <div class="chat-shell-title-actions ms-2">
+                            <button id="conversation-info-btn" class="btn btn-outline-secondary btn-sm chat-shell-icon-button d-none" data-bs-toggle="tooltip" data-bs-placement="top" title="View conversation details" aria-label="View conversation details">
+                                <i class="bi bi-info-circle"></i>
+                            </button>
+                        </div>
                     </div>
-                    <div class="d-flex align-items-center mt-1 gap-2">
+                    <div class="d-flex align-items-center mt-1 gap-2 chat-shell-status-row">
                         <span id="header-scope-lock-btn"
                               class="text-warning"
                               style="display: none; cursor: pointer; font-size: 0.9rem;"
@@ -279,7 +261,7 @@ <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
                               data-bs-target="#scopeLockModal">
                             <i class="bi bi-lock-fill"></i>
                         </span>
-                        <div id="current-conversation-classifications">
+                        <div id="current-conversation-classifications" class="chat-shell-classifications">
                         </div>
                     </div>
                 </div>
@@ -291,16 +273,18 @@ <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
 
             <div class="p-3 border-top flex-shrink-0">
                 
-                      <div class="chat-toolbar mb-2">
-                    <!-- Left side buttons -->
-                          <div class="chat-toolbar-actions">
+                                <div class="chat-toolbar mb-2">
+                    <div class="chat-toolbar-primary-row">
+                        <div id="chat-toolbar-desktop-tools-slot" class="chat-toolbar-desktop-tools-slot">
+                            <div id="chat-toolbar-tools-surface" class="chat-toolbar-secondary-panel chat-toolbar-tools-surface">
+                                <div class="chat-toolbar-actions chat-toolbar-action-rail">
                         {% if settings.enable_image_generation %}
                         <button
                             id="image-generate-btn"
                             class="btn btn-outline-secondary btn-sm search-btn"
                             data-bs-toggle="tooltip" data-bs-placement="top" title="Generate images with AI"
                         >
-                            <i class="bi bi-image"></i> <span class="search-btn-text d-none d-md-inline">Image</span>
+                            <i class="bi bi-image"></i> <span class="search-btn-text">Image</span>
                         </button>
                         {% endif %}
                         {% if settings.enable_user_workspace or settings.enable_group_workspaces %}
@@ -309,12 +293,12 @@ <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
                             class="btn btn-outline-secondary btn-sm search-btn"
                             data-bs-toggle="tooltip" data-bs-placement="top" title="Search workspaces"
                         >
-                            <i class="bi bi-file-earmark-text"></i> <span class="search-btn-text d-none d-md-inline">Workspaces</span>
+                            <i class="bi bi-file-earmark-text"></i> <span class="search-btn-text">Workspaces</span>
                         </button>
                         {% endif %}
                         <input type="file" id="file-input" accept=".txt,.pdf,.doc,.docm,.docx,.xlsx,.xlsm,.pptx,.html,.jpg,.jpeg,.png,.bmp,.tiff,.tif,.heif,.md,.json,.csv,.xml,.yaml,.yml,.log" style="display: none"/>
                         <button id="choose-file-btn" class="btn btn-outline-secondary btn-sm file-btn position-relative" data-bs-toggle="tooltip" data-bs-placement="top" title="Select and automatically upload a file to this conversation (txt, pdf, doc, docm, docx, xlsx, pptx, html, images, md, json, csv, xml, yaml, yml, log)">
-                            <i class="bi bi-paperclip"></i> <span class="file-btn-text d-none d-md-inline">File</span>
+                            <i class="bi bi-paperclip"></i> <span class="file-btn-text">File</span>
                             <span id="cancel-file-selection" class="position-absolute top-50 end-0 translate-middle-y me-1" style="display: none; cursor: pointer;" title="Cancel file selection">
                                 <i class="bi bi-x-circle-fill text-danger"></i>
                             </span>
@@ -326,146 +310,114 @@ <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
                             class="btn btn-outline-secondary btn-sm search-btn"
                             data-bs-toggle="tooltip" data-bs-placement="top" title="Search the web using Bing"
                         >
-                            <i class="bi bi-globe"></i> <span class="search-btn-text d-none d-md-inline">Web</span>
+                            <i class="bi bi-globe"></i> <span class="search-btn-text">Web</span>
                         </button>
                         {% endif %}
                         {% if settings.enable_user_workspace or settings.enable_group_workspaces or settings.enable_public_workspaces %}
                         <button id="search-prompts-btn" class="btn btn-outline-secondary btn-sm search-btn" data-bs-toggle="tooltip" data-bs-placement="top" title="Select a saved prompt">
-                            <i class="bi bi-lightbulb"></i> <span class="search-btn-text d-none d-md-inline">Prompts</span>
+                            <i class="bi bi-lightbulb"></i> <span class="search-btn-text">Prompts</span>
                         </button>
                         {% endif %}
                         {% if settings.enable_semantic_kernel and settings.per_user_semantic_kernel %}
                         <button id="enable-agents-btn" class="btn btn-outline-secondary btn-sm search-btn" data-bs-toggle="tooltip" data-bs-placement="top" title="Enable Agents">
-                            <i class="bi bi-robot"></i> <span class="search-btn-text d-none d-md-inline">Agents</span>
+                            <i class="bi bi-robot"></i> <span class="search-btn-text">Agents</span>
                         </button>
                         {% endif %}
-                    </div>
-                    
-                    <!-- Right side selectors -->
-                    <div class="chat-toolbar-controls">
-                        <!-- Prompt Selector -->
-                        <div class="chat-toolbar-selectors">
-                        {% if settings.enable_user_workspace or settings.enable_group_workspaces or settings.enable_public_workspaces %}
-                        <div id="prompt-selection-container" class="chat-toolbar-selector" style="display: none;">
-                            <label for="prompt-select" class="visually-hidden">Prompt</label>
-                            <div class="dropdown chat-searchable-select" id="prompt-dropdown">
-                                <button class="form-select chat-searchable-select-button"
-                                        type="button"
-                                        id="prompt-dropdown-button"
-                                        data-bs-toggle="dropdown"
-                                        data-bs-auto-close="outside"
-                                        aria-expanded="false">
-                                    <span class="chat-searchable-select-text text-truncate">Select a Prompt...</span>
-                                </button>
-                                <div class="dropdown-menu p-2 chat-searchable-select-menu" id="prompt-dropdown-menu">
-                                    <div class="chat-searchable-select-search mb-2">
-                                        <input type="text"
-                                               class="form-control form-control-sm"
-                                               placeholder="Search prompts..."
-                                               id="prompt-search-input">
-                                    </div>
-                                    <div class="dropdown-items-container chat-searchable-select-items" id="prompt-dropdown-items"></div>
                                 </div>
-                            </div>
-                            <select class="form-select d-none" id="prompt-select"></select>
-                        </div>
-                        {% endif %}
 
+                                <div class="chat-toolbar-toggles">
 
-                        <!-- Agent selector -->
-                        <div id="agent-select-container" class="chat-toolbar-selector" style="display: none;">
-                            <label for="agent-select" class="visually-hidden">Agent</label>
-                            <div class="dropdown chat-searchable-select" id="agent-dropdown">
-                                <button class="form-select chat-searchable-select-button"
-                                        type="button"
-                                        id="agent-dropdown-button"
-                                        data-bs-toggle="dropdown"
-                                        data-bs-auto-close="outside"
-                                        aria-expanded="false">
-                                    <span class="chat-searchable-select-text text-truncate">Select an Agent</span>
+                                <!-- Reasoning effort toggle button -->
+                                <button 
+                                    id="reasoning-toggle-btn" 
+                                    class="btn btn-outline-secondary btn-sm rounded-circle" 
+                                    data-bs-toggle="tooltip" 
+                                    data-bs-placement="top" 
+                                    data-bs-title="Configure reasoning effort"
+                                    aria-label="Configure reasoning effort"
+                                    style="width: 38px; height: 38px; padding: 0; display: flex; align-items: center; justify-content: center;"
+                                >
+                                    <i class="bi bi-reception-2"></i>
                                 </button>
-                                <div class="dropdown-menu p-2 chat-searchable-select-menu" id="agent-dropdown-menu">
-                                    <div class="chat-searchable-select-search mb-2">
-                                        <input type="text"
-                                               class="form-control form-control-sm"
-                                               placeholder="Search agents..."
-                                               id="agent-search-input">
-                                    </div>
-                                    <div class="dropdown-items-container chat-searchable-select-items" id="agent-dropdown-items"></div>
+
+                                <!-- TTS Autoplay toggle button -->
+                                {% if app_settings.enable_text_to_speech %}
+                                <button 
+                                    id="tts-autoplay-toggle-btn" 
+                                    class="btn btn-outline-secondary btn-sm rounded-circle" 
+                                    data-bs-toggle="tooltip" 
+                                    data-bs-placement="top" 
+                                    data-bs-title="Toggle AI voice response"
+                                    title="Auto voice response disabled - click to enable"
+                                    aria-label="Toggle AI voice response"
+                                    style="width: 38px; height: 38px; padding: 0; display: flex; align-items: center; justify-content: center;"
+                                >
+                                    <i class="bi bi-volume-mute"></i>
+                                </button>
+                                {% endif %}
+
                                 </div>
                             </div>
-                            <select id="agent-select" class="form-select d-none">
-                                <!-- Agents will be populated dynamically by JS -->
-                            </select>
                         </div>
-                        
-                        
-                        <!-- Model selector - right aligned -->
-                        <div id="model-select-container" class="chat-toolbar-selector">
-                            <label for="model-select" class="visually-hidden">Model</label>
-                            <div class="dropdown chat-searchable-select" id="model-dropdown">
-                                <button class="form-select chat-searchable-select-button"
-                                        type="button"
-                                        id="model-dropdown-button"
-                                        data-bs-toggle="dropdown"
-                                        data-bs-auto-close="outside"
-                                        aria-expanded="false">
-                                    <span class="chat-searchable-select-text text-truncate">
-                                    {% if enable_multi_model_endpoints and initial_chat_model_selection %}
-                                        {{ initial_chat_model_selection.display_name }}
-                                    {% elif settings.enable_gpt_apim %}
-                                        {% set raw = settings.azure_apim_gpt_deployment or "" %}
-                                        {% set apim_list = raw.split(',') %}
-                                        {% set first_dep = apim_list[0].strip() if apim_list and apim_list[0].strip() else 'Select a Model' %}
-                                        {{ first_dep }}
-                                    {% elif settings.gpt_model.selected %}
-                                        {{ settings.gpt_model.selected[0].modelName }}
-                                    {% else %}
-                                        Select a Model
-                                    {% endif %}
-                                    </span>
-                                </button>
-                                <div class="dropdown-menu p-2 chat-searchable-select-menu" id="model-dropdown-menu">
-                                    <div class="chat-searchable-select-search mb-2">
-                                        <input type="text"
-                                               class="form-control form-control-sm"
-                                               placeholder="Search models..."
-                                               id="model-search-input">
+                    </div>
+
+                    <div class="chat-toolbar-controls">
+                        <div id="chat-toolbar-desktop-primary-slot" class="chat-toolbar-primary-selector">
+                            <div id="chat-toolbar-primary-surface" class="chat-toolbar-primary-surface">
+                            <!-- Model selector - right aligned -->
+                            <div id="model-select-container" class="chat-toolbar-selector">
+                                <label for="model-select" class="visually-hidden">Model</label>
+                                <div class="dropdown chat-searchable-select" id="model-dropdown">
+                                    <button class="form-select chat-searchable-select-button"
+                                            type="button"
+                                            id="model-dropdown-button"
+                                            data-bs-toggle="dropdown"
+                                            data-bs-auto-close="outside"
+                                            aria-expanded="false">
+                                        <span class="chat-searchable-select-text text-truncate">
+                                        {% if enable_multi_model_endpoints and initial_chat_model_selection %}
+                                            {{ initial_chat_model_selection.display_name }}
+                                        {% elif settings.enable_gpt_apim %}
+                                            {% set raw = settings.azure_apim_gpt_deployment or "" %}
+                                            {% set apim_list = raw.split(',') %}
+                                            {% set first_dep = apim_list[0].strip() if apim_list and apim_list[0].strip() else 'Select a Model' %}
+                                            {{ first_dep }}
+                                        {% elif settings.gpt_model.selected %}
+                                            {{ settings.gpt_model.selected[0].modelName }}
+                                        {% else %}
+                                            Select a Model
+                                        {% endif %}
+                                        </span>
+                                    </button>
+                                    <div class="dropdown-menu p-2 chat-searchable-select-menu" id="model-dropdown-menu">
+                                        <div class="chat-searchable-select-search mb-2">
+                                            <input type="text"
+                                                   class="form-control form-control-sm"
+                                                   placeholder="Search models..."
+                                                   id="model-search-input">
+                                        </div>
+                                        <div class="dropdown-items-container chat-searchable-select-items" id="model-dropdown-items"></div>
                                     </div>
-                                    <div class="dropdown-items-container chat-searchable-select-items" id="model-dropdown-items"></div>
                                 </div>
-                            </div>
-                            <select id="model-select" class="form-select d-none">
-                            {% if enable_multi_model_endpoints and initial_chat_model_selection %}
-                                <option
-                                    value="{{ initial_chat_model_selection.option_value }}"
-                                    selected
-                                    data-selection-key="{{ initial_chat_model_selection.selection_key }}"
-                                    data-model-id="{{ initial_chat_model_selection.model_id }}"
-                                    data-display-name="{{ initial_chat_model_selection.display_name }}"
-                                    data-deployment-name="{{ initial_chat_model_selection.deployment_name }}"
-                                    data-endpoint-id="{{ initial_chat_model_selection.endpoint_id }}"
-                                    data-provider="{{ initial_chat_model_selection.provider }}"
-                                    data-scope-type="{{ initial_chat_model_selection.scope_type }}"
-                                    data-scope-id="{{ initial_chat_model_selection.scope_id }}"
-                                    data-scope-name="{{ initial_chat_model_selection.scope_name }}"
-                                    data-search-text="{{ initial_chat_model_selection.search_text }}"
-                                >
-                                    {{ initial_chat_model_selection.display_name }}
-                                </option>
-                            {% elif settings.enable_gpt_apim %}
-                                {# when using APIM, azure_apim_gpt_deployment may be "dep1" or "dep1,dep2,…" #}
-                                {% set raw = settings.azure_apim_gpt_deployment or "" %}
-                                {% set apim_list = raw.split(',') %}
-                                {% for dep in apim_list %}
-                                {% set d = dep.strip() %}
-                                <option value="{{ d }}" {% if loop.first %}selected{% endif %}>
-                                    {{ d }}
-                                </option>
-                                {% endfor %}
-                            {% else %}
-                                {% if settings.enable_gpt_apim %}
-                                    {# when using APIM, azure_apim_gpt_deployment may be "dep1" or "dep1,dep2,…" #}
+                                <select id="model-select" class="form-select d-none">
+                                {% if enable_multi_model_endpoints and initial_chat_model_selection %}
+                                    <option
+                                        value="{{ initial_chat_model_selection.option_value }}"
+                                        selected
+                                        data-selection-key="{{ initial_chat_model_selection.selection_key }}"
+                                        data-model-id="{{ initial_chat_model_selection.model_id }}"
+                                        data-display-name="{{ initial_chat_model_selection.display_name }}"
+                                        data-deployment-name="{{ initial_chat_model_selection.deployment_name }}"
+                                        data-endpoint-id="{{ initial_chat_model_selection.endpoint_id }}"
+                                        data-provider="{{ initial_chat_model_selection.provider }}"
+                                        data-scope-type="{{ initial_chat_model_selection.scope_type }}"
+                                        data-scope-id="{{ initial_chat_model_selection.scope_id }}"
+                                        data-scope-name="{{ initial_chat_model_selection.scope_name }}"
+                                        data-search-text="{{ initial_chat_model_selection.search_text }}"
+                                    >
+                                        {{ initial_chat_model_selection.display_name }}
+                                    </option>
+                                {% elif settings.enable_gpt_apim %}
                                     {% set raw = settings.azure_apim_gpt_deployment or "" %}
                                     {% set apim_list = raw.split(',') %}
                                     {% for dep in apim_list %}
@@ -475,61 +427,122 @@ <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
                                     </option>
                                     {% endfor %}
                                 {% else %}
-                                    {# normal direct-Azure OpenAI flow: show whatever you fetched into settings.gpt_model.selected #}
-                                    {% for model in settings.gpt_model.selected %}
-                                    <option
-                                        value="{{ model.deploymentName }}"
-                                        {% if loop.first %}selected{% endif %}
-                                    >
-                                        {{ model.modelName }}
-                                    </option>
-                                    {% endfor %}
+                                    {% if settings.enable_gpt_apim %}
+                                        {% set raw = settings.azure_apim_gpt_deployment or "" %}
+                                        {% set apim_list = raw.split(',') %}
+                                        {% for dep in apim_list %}
+                                        {% set d = dep.strip() %}
+                                        <option value="{{ d }}" {% if loop.first %}selected{% endif %}>
+                                            {{ d }}
+                                        </option>
+                                        {% endfor %}
+                                    {% else %}
+                                        {% for model in settings.gpt_model.selected %}
+                                        <option
+                                            value="{{ model.deploymentName }}"
+                                            {% if loop.first %}selected{% endif %}
+                                        >
+                                            {{ model.modelName }}
+                                        </option>
+                                        {% endfor %}
+                                    {% endif %}
                                 {% endif %}
-                            {% endif %}
-                            </select>
-                        </div>
+                                </select>
+                            </div>
 
+                            <div id="agent-select-container" class="chat-toolbar-selector" style="display: none;">
+                                <label for="agent-select" class="visually-hidden">Agent</label>
+                                <div class="dropdown chat-searchable-select" id="agent-dropdown">
+                                    <button class="form-select chat-searchable-select-button"
+                                            type="button"
+                                            id="agent-dropdown-button"
+                                            data-bs-toggle="dropdown"
+                                            data-bs-auto-close="outside"
+                                            aria-expanded="false">
+                                        <span class="chat-searchable-select-text text-truncate">Select an Agent</span>
+                                    </button>
+                                    <div class="dropdown-menu p-2 chat-searchable-select-menu" id="agent-dropdown-menu">
+                                        <div class="chat-searchable-select-search mb-2">
+                                            <input type="text"
+                                                   class="form-control form-control-sm"
+                                                   placeholder="Search agents..."
+                                                   id="agent-search-input">
+                                        </div>
+                                        <div class="dropdown-items-container chat-searchable-select-items" id="agent-dropdown-items"></div>
+                                    </div>
+                                </div>
+                                <select id="agent-select" class="form-select d-none">
+                                    <!-- Agents will be populated dynamically by JS -->
+                                </select>
+                            </div>
+                            </div>
                         </div>
 
-                        <div class="chat-toolbar-toggles">
+                        <div id="chat-toolbar-desktop-selectors-slot" class="chat-toolbar-selectors-slot">
+                            <div id="chat-toolbar-selectors-surface" class="chat-toolbar-selectors">
+                            {% if settings.enable_user_workspace or settings.enable_group_workspaces or settings.enable_public_workspaces %}
+                            <div id="prompt-selection-container" class="chat-toolbar-selector" style="display: none;">
+                                <label for="prompt-select" class="visually-hidden">Prompt</label>
+                                <div class="dropdown chat-searchable-select" id="prompt-dropdown">
+                                    <button class="form-select chat-searchable-select-button"
+                                            type="button"
+                                            id="prompt-dropdown-button"
+                                            data-bs-toggle="dropdown"
+                                            data-bs-auto-close="outside"
+                                            aria-expanded="false">
+                                        <span class="chat-searchable-select-text text-truncate">Select a Prompt...</span>
+                                    </button>
+                                    <div class="dropdown-menu p-2 chat-searchable-select-menu" id="prompt-dropdown-menu">
+                                        <div class="chat-searchable-select-search mb-2">
+                                            <input type="text"
+                                                   class="form-control form-control-sm"
+                                                   placeholder="Search prompts..."
+                                                   id="prompt-search-input">
+                                        </div>
+                                        <div class="dropdown-items-container chat-searchable-select-items" id="prompt-dropdown-items"></div>
+                                    </div>
+                                </div>
+                                <select class="form-select d-none" id="prompt-select"></select>
+                            </div>
+                            {% endif %}
 
-                        <!-- Reasoning effort toggle button -->
-                        <button 
-                            id="reasoning-toggle-btn" 
-                            class="btn btn-outline-secondary btn-sm rounded-circle" 
-                            data-bs-toggle="tooltip" 
-                            data-bs-placement="top" 
-                            data-bs-title="Configure reasoning effort"
-                            style="width: 38px; height: 38px; padding: 0; display: flex; align-items: center; justify-content: center;"
-                        >
-                            <i class="bi bi-reception-2"></i>
-                        </button>
+                            </div>
+                        </div>
 
-                        <!-- TTS Autoplay toggle button -->
-                        {% if app_settings.enable_text_to_speech %}
-                        <button 
-                            id="tts-autoplay-toggle-btn" 
-                            class="btn btn-outline-secondary btn-sm rounded-circle" 
-                            data-bs-toggle="tooltip" 
-                            data-bs-placement="top" 
-                            data-bs-title="Toggle AI voice response"
-                            title="Auto voice response disabled - click to enable"
-                            style="width: 38px; height: 38px; padding: 0; display: flex; align-items: center; justify-content: center;"
-                        >
-                            <i class="bi bi-volume-mute"></i>
+                        <button type="button" id="chat-mobile-tools-toggle" class="btn btn-outline-secondary btn-sm d-lg-none chat-mobile-tools-toggle" data-bs-toggle="offcanvas" data-bs-target="#chat-mobile-tools-panel" aria-expanded="false" aria-controls="chat-mobile-tools-panel">
+                            <i class="bi bi-sliders2 me-1"></i>
+                            <span>Tools</span>
                         </button>
-                        {% endif %}
+                    </div>
+                </div>
 
+                <div id="chat-mobile-tools-panel" class="chat-toolbar-mobile-panel offcanvas-lg offcanvas-bottom" tabindex="-1" aria-labelledby="chatMobileToolsLabel">
+                    <div class="offcanvas-header chat-toolbar-tools-header">
+                        <div>
+                            <h5 class="offcanvas-title" id="chatMobileToolsLabel">Chat Tools</h5>
+                            <p class="mb-0 text-muted small">Quick actions and voice controls</p>
                         </div>
+                        <button type="button" class="btn-close" id="chat-mobile-tools-close" aria-label="Close"></button>
+                    </div>
+                    <div class="offcanvas-body">
+                        <div id="chat-toolbar-mobile-tools-slot" class="chat-toolbar-mobile-tools-slot"></div>
+                        <div id="chat-toolbar-mobile-primary-slot" class="chat-toolbar-mobile-primary-slot"></div>
+                        <div id="chat-toolbar-mobile-selectors-slot" class="chat-toolbar-mobile-selectors-slot"></div>
                     </div>
                 </div>
 
                 
                 {% if settings.enable_user_workspace or settings.enable_group_workspaces %}
-                <div id="search-documents-container" class="card p-2 mb-2" style="display: none; border-radius: 0.5rem;">
-                    
-                     <div class="d-flex flex-wrap align-items-end gap-2">
-                         <div class="flex-shrink-0" style="min-width: 120px; max-width: 250px;">
+                <div id="search-documents-container" class="chat-search-panel card p-0 mb-2 offcanvas-lg offcanvas-end" tabindex="-1" aria-labelledby="searchDocumentsDrawerLabel" style="display: none; border-radius: 0.5rem;">
+                    <div class="offcanvas-header chat-search-panel-mobile-header">
+                        <div>
+                            <h5 class="offcanvas-title" id="searchDocumentsDrawerLabel">Grounded Search</h5>
+                            <p class="mb-0 text-muted small">Choose scope, tags, and documents.</p>
+                        </div>
+                    </div>
+                    <div class="offcanvas-body p-2">
+                     <div class="chat-search-panel-grid">
+                         <div class="flex-shrink-0 chat-search-panel-field chat-search-panel-field-narrow" style="min-width: 120px; max-width: 250px;">
                              <label class="form-label mb-1 small text-muted d-flex align-items-center gap-1">
                                 Scope
                                 <span id="scope-lock-indicator"
@@ -565,16 +578,21 @@ <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
                              <!-- Hidden select kept for backwards compat -->
                              <select class="d-none" id="doc-scope-select" multiple></select>
                          </div>
-                         <div class="flex-shrink-0" style="min-width: 150px; max-width: 250px;">
+                         <div class="flex-shrink-0 chat-search-panel-field chat-search-panel-field-narrow" style="min-width: 150px; max-width: 250px;">
                              <label class="form-label mb-1 small text-muted">Tags</label>
-                             <div class="dropdown" id="tags-dropdown" style="display: none;">
+                             <div class="dropdown" id="tags-dropdown">
                                 <button class="form-select form-select-sm d-flex justify-content-between align-items-center"
                                         type="button"
                                         id="tags-dropdown-button"
                                         data-bs-toggle="dropdown"
                                         data-bs-auto-close="outside"
+                                        aria-disabled="true"
+                                        disabled
                                         aria-expanded="false">
-                                    <span class="selected-tags-text text-truncate">All Tags</span>
+                                    <span class="chat-search-dropdown-button-content">
+                                        <span class="spinner-border spinner-border-sm text-secondary chat-search-dropdown-loading-spinner" id="tags-dropdown-loading-spinner" role="status" aria-hidden="true"></span>
+                                        <span class="selected-tags-text text-truncate">Loading tags...</span>
+                                    </span>
                                 </button>
                                 <div class="dropdown-menu p-2" id="tags-dropdown-menu" style="width: 250px; max-height: 300px; overflow-y: auto;">
                                     <div class="chat-dropdown-search mb-2">
@@ -592,7 +610,7 @@ <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
                              <select class="d-none" id="chat-tags-filter" multiple style="display: none;">
                              </select>
                          </div>
-                             <div class="flex-grow-1" style="min-width: 250px;">
+                             <div class="flex-grow-1 chat-search-panel-field chat-search-panel-field-wide" style="min-width: 250px;">
                              <label for="document-select" class="form-label mb-1 small text-muted">Document</label>
                              <div class="dropdown" id="document-dropdown">
                                 <button class="form-select form-select-sm d-flex justify-content-between align-items-center" 
@@ -617,6 +635,10 @@ <h5 id="current-conversation-title" class="mb-0 flex-grow-1">
                          </div>
 
                      </div>
+                    </div>
+                    <div class="chat-search-panel-mobile-footer d-lg-none">
+                        <button type="button" class="btn-close" id="search-documents-mobile-close" aria-label="Close grounded search"></button>
+                    </div>
                 </div>
                 {% endif %}
 
@@ -1109,7 +1131,14 @@ <h5 class="modal-title" id="export-wizard-modal-label">
     </div>
 </div>
 
-<div class="toast-container position-fixed top-0 end-0 p-3" id="toast-container"></div>
+<div
+    class="toast-container position-fixed end-0 p-3"
+    id="chat-toast-container"
+    data-toast-container="preferred"
+    data-toast-anchor="chat-tutorial-launch"
+    data-toast-gap="12"
+    data-toast-default-top="16px"
+></div>
 
 <!-- Scope Lock/Unlock Modal (dual-mode: content set dynamically by JS) -->
 <div class="modal fade" id="scopeLockModal" tabindex="-1" aria-labelledby="scopeLockModalLabel" aria-hidden="true">
@@ -1211,5 +1240,6 @@ <h5 class="modal-title" id="scopeLockModalLabel">
     <script type="module" src="{{ url_for('static', filename='js/chat/chat-agents.js') }}"></script>
     <script type="module" src="{{ url_for('static', filename='js/agents_common.js') }}"></script>
 {% endif %}
+<script type="module" src="{{ url_for('static', filename='js/chat/chat-mobile-toolbar.js') }}"></script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/application/single_app/templates/control_center.html b/application/single_app/templates/control_center.html
index 16b52ff4..709dcdc7 100644
--- a/application/single_app/templates/control_center.html
+++ b/application/single_app/templates/control_center.html
@@ -126,6 +126,208 @@
             opacity: 1;
             transform: translateY(-50%) rotate(180deg);
         }
+
+        .activity-log-layout-toolbar {
+            border-bottom: 1px solid var(--bs-border-color);
+            margin-bottom: 1rem;
+            padding-bottom: 1rem;
+        }
+
+        .activity-log-layout-presets {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 0.5rem;
+        }
+
+        .activity-log-layout-presets .btn {
+            white-space: nowrap;
+        }
+
+        .activity-log-layout-hint {
+            max-width: 40rem;
+        }
+
+        .activity-logs-table {
+            --activity-logs-min-width: 940px;
+            --activity-log-timestamp-width: 18%;
+            --activity-log-activity-type-width: 18%;
+            --activity-log-user-width: 20%;
+            --activity-log-details-width: 32%;
+            --activity-log-workspace-width: 12%;
+            --activity-log-timestamp-min-width: 170px;
+            --activity-log-activity-type-min-width: 170px;
+            --activity-log-user-min-width: 180px;
+            --activity-log-details-min-width: 300px;
+            --activity-log-workspace-min-width: 120px;
+            --activity-log-details-max-height: 3.3rem;
+            width: 100%;
+            min-width: var(--activity-logs-min-width);
+            table-layout: fixed;
+        }
+
+        .activity-logs-table[data-layout-preset="details-focus"] {
+            --activity-logs-min-width: 1020px;
+            --activity-log-timestamp-width: 16%;
+            --activity-log-activity-type-width: 16%;
+            --activity-log-user-width: 18%;
+            --activity-log-details-width: 38%;
+            --activity-log-workspace-width: 12%;
+            --activity-log-details-min-width: 360px;
+            --activity-log-details-max-height: 4.6rem;
+        }
+
+        .activity-logs-table[data-layout-preset="compact"] {
+            --activity-logs-min-width: 880px;
+            --activity-log-timestamp-width: 19%;
+            --activity-log-activity-type-width: 19%;
+            --activity-log-user-width: 18%;
+            --activity-log-details-width: 28%;
+            --activity-log-workspace-width: 16%;
+            --activity-log-details-min-width: 240px;
+            --activity-log-details-max-height: 2.7rem;
+        }
+
+        .activity-logs-table th,
+        .activity-logs-table td {
+            vertical-align: top;
+        }
+
+        .activity-logs-table th:nth-child(1),
+        .activity-logs-table td:nth-child(1) {
+            width: var(--activity-log-timestamp-width);
+            min-width: var(--activity-log-timestamp-min-width);
+        }
+
+        .activity-logs-table th:nth-child(2),
+        .activity-logs-table td:nth-child(2) {
+            width: var(--activity-log-activity-type-width);
+            min-width: var(--activity-log-activity-type-min-width);
+        }
+
+        .activity-logs-table th:nth-child(3),
+        .activity-logs-table td:nth-child(3) {
+            width: var(--activity-log-user-width);
+            min-width: var(--activity-log-user-min-width);
+        }
+
+        .activity-logs-table th:nth-child(4),
+        .activity-logs-table td:nth-child(4) {
+            width: var(--activity-log-details-width);
+            min-width: var(--activity-log-details-min-width);
+        }
+
+        .activity-logs-table th:nth-child(5),
+        .activity-logs-table td:nth-child(5) {
+            width: var(--activity-log-workspace-width);
+            min-width: var(--activity-log-workspace-min-width);
+        }
+
+        .activity-log-cell-text,
+        .activity-log-badge-wrap {
+            display: block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .activity-log-details {
+            display: block;
+            overflow: hidden;
+            max-height: var(--activity-log-details-max-height);
+            line-height: 1.35;
+            word-break: break-word;
+        }
+
+        .activity-log-details small {
+            display: block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .activity-log-row {
+            cursor: pointer;
+        }
+
+        .activity-log-row:hover {
+            background-color: rgba(var(--bs-primary-rgb), 0.04);
+        }
+
+        #rawLogModal .modal-xl {
+            max-width: 1200px;
+        }
+
+        #rawLogModal .card {
+            border: 1px solid var(--bs-border-color);
+            box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+        }
+
+        #rawLogModal .card-header {
+            border-bottom: 1px solid var(--bs-border-color);
+            font-weight: 600;
+        }
+
+        #rawLogModal .badge {
+            font-size: 0.75em;
+        }
+
+        #rawLogModal code,
+        #rawLogModal pre {
+            font-size: 0.875em;
+        }
+
+        #rawLogModal code {
+            background-color: var(--bs-gray-100);
+            border-radius: 0.25rem;
+            display: inline-block;
+            max-width: 100%;
+            overflow-wrap: anywhere;
+            padding: 0.125rem 0.25rem;
+            white-space: normal;
+        }
+
+        #rawLogModal .accordion-button:not(.collapsed) {
+            background-color: rgba(var(--bs-primary-rgb), 0.08);
+            color: var(--bs-primary);
+        }
+
+        .activity-log-detail-label {
+            color: var(--bs-secondary-color);
+            font-size: 0.75rem;
+            font-weight: 600;
+            letter-spacing: 0.04em;
+            margin-bottom: 0.2rem;
+            text-transform: uppercase;
+        }
+
+        .activity-log-detail-value {
+            font-weight: 500;
+            overflow-wrap: anywhere;
+        }
+
+        .activity-log-summary-text {
+            line-height: 1.5;
+        }
+
+        .activity-log-summary-text small {
+            display: block;
+            margin-top: 0.35rem;
+        }
+
+        .activity-log-raw-json pre {
+            background-color: var(--bs-secondary-bg);
+            border: 1px solid var(--bs-border-color);
+            border-radius: 0.5rem;
+            margin-bottom: 0;
+            max-height: 360px;
+            overflow-y: auto;
+            padding: 1rem;
+        }
+
+        [data-bs-theme="dark"] #rawLogModal code {
+            background-color: var(--bs-gray-800);
+            color: var(--bs-gray-200);
+        }
         
         /* Group Management Table Styles */
         .group-table th {
@@ -1168,8 +1370,26 @@ <h5 class="mb-0">
                             <!-- Activity Logs Table -->
                             <div class="card">
                                 <div class="card-body">
+                                    <div class="activity-log-layout-toolbar d-flex flex-column flex-lg-row justify-content-between align-items-lg-center gap-3">
+                                        <div>
+                                            <div class="small text-uppercase text-muted fw-semibold mb-2">Layout Preset</div>
+                                            <div class="activity-log-layout-presets" role="group" aria-label="Activity log layout presets">
+                                                <input type="radio" class="btn-check" name="activityLogsLayoutPreset" id="activityLogsLayoutPresetBalanced" value="balanced" autocomplete="off" checked />
+                                                <label class="btn btn-outline-secondary btn-sm" for="activityLogsLayoutPresetBalanced">Balanced</label>
+
+                                                <input type="radio" class="btn-check" name="activityLogsLayoutPreset" id="activityLogsLayoutPresetDetailsFocus" value="details-focus" autocomplete="off" />
+                                                <label class="btn btn-outline-secondary btn-sm" for="activityLogsLayoutPresetDetailsFocus">Details Focus</label>
+
+                                                <input type="radio" class="btn-check" name="activityLogsLayoutPreset" id="activityLogsLayoutPresetCompact" value="compact" autocomplete="off" />
+                                                <label class="btn btn-outline-secondary btn-sm" for="activityLogsLayoutPresetCompact">Compact</label>
+                                            </div>
+                                        </div>
+                                        <div class="small text-muted activity-log-layout-hint" id="activityLogsLayoutHint">
+                                            Balanced view keeps the five log columns readable. Switch to Details Focus or click a row for the full raw log.
+                                        </div>
+                                    </div>
                                     <div class="table-responsive">
-                                        <table class="table table-hover user-table" id="activityLogsTable">
+                                        <table class="table table-hover user-table activity-logs-table" id="activityLogsTable" data-layout-preset="balanced">
                                             <thead>
                                                 <tr>
                                                     <th>Timestamp</th>
@@ -2801,21 +3021,21 @@ <h5 class="modal-title" id="rawWorkspaceActivityModalTitle">Activity Details</h5
     </div>
 
     <!-- Raw Log Modal -->
-    <div class="modal fade" id="rawLogModal" tabindex="-1" aria-hidden="true">
-        <div class="modal-dialog modal-xl">
+    <div class="modal fade" id="rawLogModal" tabindex="-1" aria-labelledby="rawLogModalTitle" aria-hidden="true">
+        <div class="modal-dialog modal-xl modal-dialog-scrollable">
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title" id="rawLogModalTitle">Activity Log</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
-                    <div class="d-flex justify-content-end mb-2">
-                        <button type="button" class="btn btn-sm btn-outline-primary" onclick="window.controlCenter.copyRawLogToClipboard()">
-                            <i class="bi bi-clipboard me-1"></i>Copy to Clipboard
-                        </button>
-                    </div>
-                    <div id="rawLogModalBody" class="border rounded p-3" style="background-color: var(--bs-secondary-bg);">
-                        <!-- Log JSON will be inserted here -->
+                    <div id="rawLogModalBody">
+                        <div class="text-center p-4">
+                            <div class="spinner-border text-primary" role="status">
+                                <span class="visually-hidden">Loading...</span>
+                            </div>
+                            <p class="mt-2 text-muted mb-0">Loading activity details...</p>
+                        </div>
                     </div>
                 </div>
                 <div class="modal-footer">
diff --git a/application/single_app/templates/group_workspaces.html b/application/single_app/templates/group_workspaces.html
index 91fd3f54..05c8be61 100644
--- a/application/single_app/templates/group_workspaces.html
+++ b/application/single_app/templates/group_workspaces.html
@@ -11,6 +11,7 @@
   rel="stylesheet"
   href="/static/css/simplemde.min.css"
   />
+ <link rel="stylesheet" href="{{ url_for('static', filename='css/workspace-responsive.css') }}" />
 
 <style>
   /* Copy relevant styles from workspace.html for consistency */
@@ -215,12 +216,17 @@
   .tag-badge.text-dark { color: #212529 !important; }
 </style>
 {% endblock %} {% block content %}
-<div class="container">
-  <h2>Group Workspace</h2>
+<div class="container workspace-page">
+  <div class="workspace-page-header">
+    <div>
+      <h2 class="workspace-page-title">Group Workspace</h2>
+      <p class="workspace-page-subtitle">Review shared documents, prompts, agents, actions, and endpoints for the active group.</p>
+    </div>
+  </div>
   <!-- Removed redundant active-group-name heading -->
 
   <!-- Group Selector and Role Display -->
-  <div class="row mb-3">
+  <div class="row mb-3 workspace-toolbar-row">
     <div class="col-sm-6">
       <!-- Custom searchable dropdown -->
       <div class="dropdown" id="group-dropdown">
@@ -243,7 +249,7 @@ <h2>Group Workspace</h2>
         <select class="d-none" id="group-select" autocomplete="off" data-lpignore="true" data-1p-ignore="true" data-bwignore="true"></select>
       </div>
     </div>
-    <div class="col-sm-6">
+    <div class="col-sm-6 workspace-toolbar-actions">
       <!-- Adjusted column size -->
       <button class="btn btn-primary" id="btn-change-group">
         Change Active Group
@@ -262,6 +268,27 @@ <h2>Group Workspace</h2>
     <!-- Content populated by JavaScript -->
   </div>
 
+  <div class="workspace-section-switcher mb-3{% if nav_layout == 'left' %} workspace-section-switcher--persistent{% endif %}" data-workspace-switcher data-tab-list="#groupWorkspaceTab">
+    <div class="w-100">
+      <label class="form-label" for="group-workspace-section-select">Section</label>
+      <select class="form-select" id="group-workspace-section-select" data-workspace-section-select aria-label="Select group workspace section">
+        <option value="documents-tab-btn">Group Documents</option>
+        <option value="prompts-tab-btn">Group Prompts</option>
+        {% if settings.per_user_semantic_kernel and settings.enable_semantic_kernel %}
+          {% if settings.allow_group_agents %}
+            <option value="group-agents-tab-btn">Group Agents</option>
+            {% if settings.enable_semantic_kernel and settings.allow_group_plugins %}
+              <option value="group-plugins-tab-btn">Group Actions</option>
+            {% endif %}
+          {% endif %}
+          {% if settings.enable_semantic_kernel and settings.allow_group_custom_endpoints and settings.enable_multi_model_endpoints %}
+            <option value="group-endpoints-tab-btn">Group Endpoints</option>
+          {% endif %}
+        {% endif %}
+      </select>
+    </div>
+  </div>
+
   <!-- Nav Tabs - Hide when left nav is enabled -->
   <ul class="nav nav-tabs{% if nav_layout == 'left' %} d-none{% endif %}" id="groupWorkspaceTab" role="tablist">
     <li class="nav-item" role="presentation">
@@ -508,9 +535,13 @@ <h2>Group Workspace</h2>
             <label class="btn btn-outline-secondary" for="group-docs-view-list">
               <i class="bi bi-list-ul"></i> List
             </label>
+            <input type="radio" class="btn-check" name="group-docs-view-mode" id="group-docs-view-cards" autocomplete="off">
+            <label class="btn btn-outline-secondary" for="group-docs-view-cards">
+              <i class="bi bi-grid"></i> Cards
+            </label>
             <input type="radio" class="btn-check" name="group-docs-view-mode" id="group-docs-view-grid" autocomplete="off">
             <label class="btn btn-outline-secondary" for="group-docs-view-grid">
-              <i class="bi bi-grid-3x3-gap"></i> Grid
+              <i class="bi bi-folder2-open"></i> Folders
             </label>
           </div>
           <div class="d-flex align-items-center gap-2">
@@ -582,35 +613,33 @@ <h2>Group Workspace</h2>
           </tbody>
         </table>
 
-        <!-- Documents Pagination & Page Size -->
-        <div class="d-flex align-items-center gap-3 mb-3 mt-3">
+        </div>
+        <!-- End Documents List View -->
+
+        <div id="group-documents-card-view" class="row g-3 d-none">
+          <div class="col-12 text-center text-muted py-5">
+            <div class="spinner-border spinner-border-sm me-2" role="status"><span class="visually-hidden">Loading...</span></div>
+            Loading group documents...
+          </div>
+        </div>
+
+        <div id="group-list-controls-bar" class="d-flex align-items-center gap-3 mb-3 mt-3">
           <div>
-            <label for="group-docs-page-size-select" class="visually-hidden"
-              >Items per page:</label
-            >
-            <select
-              id="group-docs-page-size-select"
-              class="form-select form-select-sm d-inline-block"
-              style="width: auto"
-            >
+            <label for="group-docs-page-size-select" class="visually-hidden">Items per page:</label>
+            <select id="group-docs-page-size-select" class="form-select form-select-sm d-inline-block" style="width: auto">
               <option value="10" selected>10</option>
               <option value="20">20</option>
               <option value="50">50</option>
             </select>
             <span class="ms-1 small text-muted">items per page</span>
           </div>
-          <div
-            id="group-docs-pagination-container"
-            class="d-flex gap-1 ms-auto"
-          >
+          <div id="group-docs-pagination-container" class="d-flex gap-1 ms-auto">
             <!-- Populated by JavaScript -->
           </div>
         </div>
-        </div>
-        <!-- End Documents List View -->
 
-        <!-- Documents Grid View (Tag Folders) -->
-        <div id="group-documents-grid-view" style="display: none;">
+        <!-- Documents Folders View -->
+        <div id="group-documents-grid-view" class="d-none">
           <div id="group-tag-folders-container" class="row g-2">
             <div class="col-12 text-center text-muted py-5">
               <div class="spinner-border spinner-border-sm me-2" role="status"><span class="visually-hidden">Loading...</span></div>
@@ -620,7 +649,7 @@ <h2>Group Workspace</h2>
         </div>
 
         <!-- Grid View Controls (sort, page size, pagination) -->
-        <div id="group-grid-controls-bar" class="align-items-center gap-3 mb-3 mt-3" style="display: none;">
+        <div id="group-grid-controls-bar" class="align-items-center gap-3 mb-3 mt-3 d-none">
           <div class="d-flex align-items-center gap-2">
             <small class="text-muted">Sort:</small>
             <button class="btn btn-sm btn-outline-secondary group-grid-sort-btn" data-sort="name">
@@ -1493,6 +1522,7 @@ <h5 class="modal-title" id="groupTagSelectionModalLabel">Select Tags</h5>
 <!-- Include group document sharing JS -->
 <script src="/static/js/workspace/group-documents-sharing.js"></script>
 <script src="/static/js/workspace_sidebar_nav.js"></script>
+<script src="{{ url_for('static', filename='js/workspace_section_switcher.js') }}"></script>
 
 <script>
     window.enableMultiModelEndpoints = {{ 'true' if settings.enable_multi_model_endpoints else 'false' }};
@@ -1684,6 +1714,9 @@ <h5 class="modal-title" id="groupTagSelectionModalLabel">Select Tags</h5>
   let groupCurrentFolderType = null;
   let groupFolderCurrentPage = 1;
   let groupFolderPageSize = 10;
+  let groupLastFetchedDocs = [];
+  let groupLastFetchedDocsError = null;
+  let groupHasFetchedDocuments = false;
   let groupGridSortBy = 'count';
   let groupGridSortOrder = 'desc';
   let groupFolderSortBy = '_ts';
@@ -1928,6 +1961,7 @@ <h5 class="modal-title" id="groupTagSelectionModalLabel">Select Tags</h5>
   const groupDocumentsTableBody = document.querySelector(
     "#group-documents-table tbody"
   );
+  const groupDocumentsCardView = document.getElementById("group-documents-card-view");
   const groupDocsPaginationContainer = document.getElementById(
     "group-docs-pagination-container"
   );
@@ -2209,6 +2243,349 @@ <h5 class="modal-title" id="groupTagSelectionModalLabel">Select Tags</h5>
     return luminance > 0.5;
   }
 
+  function truncateGroupDocumentText(text, maxLength = 150) {
+    if (!text) {
+      return "";
+    }
+
+    return text.length > maxLength ? `${text.slice(0, maxLength).trimEnd()}…` : text;
+  }
+
+  function getGroupDocumentProcessingState(doc) {
+    const pctString = String(doc?.percentage_complete ?? "");
+    const pct = /^\d+(\.\d+)?$/.test(pctString) ? parseFloat(pctString) : 0;
+    const docStatus = doc?.status || "";
+    const normalizedStatus = docStatus.toLowerCase();
+    const hasError = normalizedStatus.includes("error");
+    const isComplete = pct >= 100 || normalizedStatus.includes("complete") || hasError;
+    return { pct, docStatus, hasError, isComplete };
+  }
+
+  function getGroupDocumentIcon(fileName = "") {
+    const extension = (fileName.split('.').pop() || '').toLowerCase();
+    const iconMap = {
+      pdf: 'bi-filetype-pdf',
+      doc: 'bi-file-earmark-word',
+      docx: 'bi-file-earmark-word',
+      ppt: 'bi-file-earmark-slides',
+      pptx: 'bi-file-earmark-slides',
+      xls: 'bi-file-earmark-spreadsheet',
+      xlsx: 'bi-file-earmark-spreadsheet',
+      xlsm: 'bi-file-earmark-spreadsheet',
+      csv: 'bi-filetype-csv',
+      png: 'bi-file-earmark-image',
+      jpg: 'bi-file-earmark-image',
+      jpeg: 'bi-file-earmark-image',
+      gif: 'bi-file-earmark-image',
+      txt: 'bi-file-earmark-text',
+      md: 'bi-file-earmark-richtext',
+      html: 'bi-filetype-html',
+      json: 'bi-filetype-json',
+      xml: 'bi-filetype-xml'
+    };
+
+    return iconMap[extension] || 'bi-file-earmark-text';
+  }
+
+  function getGroupClassificationBadge(doc) {
+    if (!(window.enable_document_classification === true || window.enable_document_classification === "true")) {
+      return '';
+    }
+
+    const currentLabel = doc.document_classification || null;
+    const categories = window.classification_categories || [];
+    const category = categories.find(cat => cat.label === currentLabel);
+
+    if (category) {
+      const bgColor = category.color || '#6c757d';
+      const textColorClass = isGroupColorLight(bgColor) ? 'text-dark' : '';
+      return `<span class="classification-badge ${textColorClass}" style="background-color: ${escapeGroupHtml(bgColor)};">${escapeGroupHtml(category.label)}</span>`;
+    }
+
+    if (currentLabel) {
+      return `<span class="badge bg-warning text-dark">${escapeGroupHtml(currentLabel)}</span>`;
+    }
+
+    return '<span class="badge bg-secondary">None</span>';
+  }
+
+  function getGroupDocumentMetaPills(doc) {
+    const pills = [];
+    const authors = Array.isArray(doc.authors)
+      ? doc.authors.filter(Boolean)
+      : (doc.authors ? [doc.authors] : []);
+
+    if (doc.version) {
+      pills.push(`<span class="document-meta-pill"><i class="bi bi-layers"></i>v${escapeGroupHtml(String(doc.version))}</span>`);
+    }
+    if (doc.number_of_pages) {
+      pills.push(`<span class="document-meta-pill"><i class="bi bi-file-earmark-text"></i>${escapeGroupHtml(String(doc.number_of_pages))} pages</span>`);
+    }
+    if (authors.length) {
+      const authorLabel = authors.length > 2
+        ? `${authors.slice(0, 2).join(', ')} +${authors.length - 2}`
+        : authors.join(', ');
+      pills.push(`<span class="document-meta-pill"><i class="bi bi-people"></i>${escapeGroupHtml(authorLabel)}</span>`);
+    }
+    if (doc.publication_date) {
+      pills.push(`<span class="document-meta-pill"><i class="bi bi-calendar-event"></i>${escapeGroupHtml(String(doc.publication_date))}</span>`);
+    }
+
+    return pills.join('');
+  }
+
+  function getGroupDocumentSummaryText(doc) {
+    const abstractText = truncateGroupDocumentText((doc.abstract || '').trim(), 165);
+    if (abstractText) {
+      return abstractText;
+    }
+
+    const keywords = Array.isArray(doc.keywords)
+      ? doc.keywords.filter(Boolean).join(', ')
+      : (doc.keywords || '');
+
+    if (keywords) {
+      return `Keywords: ${truncateGroupDocumentText(keywords, 165)}`;
+    }
+
+    return 'Use chat, metadata tools, and group actions directly from this document card.';
+  }
+
+  function renderGroupDocumentsEmptyState(filtersActive) {
+    const message = filtersActive
+      ? 'No group documents found matching the current filters.'
+      : 'No documents found in this group.';
+    const resetHtml = filtersActive
+      ? '<br /><button class="btn btn-link btn-sm p-0 group-docs-reset-filter-msg-btn" type="button">Clear filters</button> to see all documents.'
+      : '';
+
+    groupDocumentsTableBody.innerHTML = `<tr><td colspan="4" class="text-center p-4 text-muted">${message}${resetHtml}</td></tr>`;
+    if (groupDocumentsCardView) {
+      groupDocumentsCardView.innerHTML = `
+        <div class="col-12 text-center text-muted py-5">
+          <i class="bi bi-folder2-open display-6 mb-2 d-block"></i>
+          <p class="mb-2">${message}</p>
+          ${filtersActive ? '<button class="btn btn-link btn-sm p-0 group-docs-reset-filter-msg-btn" type="button">Clear filters</button>' : ''}
+        </div>`;
+    }
+
+    document.querySelectorAll('.group-docs-reset-filter-msg-btn').forEach(button => {
+      if (button.dataset.bound === 'true') {
+        return;
+      }
+
+      button.dataset.bound = 'true';
+      button.addEventListener('click', () => onGroupDocsClearFilters());
+    });
+  }
+
+  function renderGroupDocumentsErrorState(message) {
+    groupDocumentsTableBody.innerHTML = `<tr><td colspan="4" class="text-center text-danger p-4">${message}</td></tr>`;
+    if (groupDocumentsCardView) {
+      groupDocumentsCardView.innerHTML = `
+        <div class="col-12 text-center text-danger py-5">
+          <i class="bi bi-exclamation-triangle display-6 mb-2 d-block"></i>
+          <p class="mb-0">${message}</p>
+        </div>`;
+    }
+  }
+
+  function createGroupDocumentCard(doc, userRole) {
+    const docId = doc.id;
+    const { pct, docStatus, hasError, isComplete } = getGroupDocumentProcessingState(doc);
+    const canManage = ["Owner", "Admin", "DocumentManager"].includes(userRole);
+    const groupStatus = window.currentGroupStatus || 'active';
+    const canModify = groupStatus === 'active';
+    const canChat = groupStatus !== 'inactive';
+    const canShare = canManage && (groupStatus === 'active' || groupStatus === 'upload_disabled');
+    const canDelete = canManage && (groupStatus === 'active' || groupStatus === 'upload_disabled');
+    const displayTitle = doc.title && doc.title !== doc.file_name ? doc.title : (doc.file_name || 'Untitled');
+    const subtitle = doc.title && doc.title !== doc.file_name ? (doc.file_name || '') : '';
+    const selected = groupSelectedDocuments.has(docId);
+    const checkboxClass = groupSelectionMode ? '' : ' d-none';
+
+    let statusBadge = '<span class="badge bg-success">Ready</span>';
+    if (hasError) {
+      statusBadge = '<span class="badge bg-danger">Error</span>';
+    } else if (!isComplete) {
+      statusBadge = `<span class="badge bg-info text-dark">Processing ${pct.toFixed(0)}%</span>`;
+    } else if (!canChat) {
+      statusBadge = '<span class="badge bg-secondary">Read Only</span>';
+    }
+
+    let primaryButtonsHtml = '';
+    if (isComplete && !hasError && canChat) {
+      primaryButtonsHtml += `
+        <button class="btn btn-sm btn-primary me-1" onclick="searchGroupDocumentInChat('${docId}')">
+          <i class="bi bi-chat-dots me-1"></i>Chat
+        </button>`;
+    }
+    if (isComplete && !hasError && canManage && canModify) {
+      primaryButtonsHtml += `
+        <button class="btn btn-sm btn-outline-secondary me-1" onclick="onEditGroupDocument('${docId}')">
+          <i class="bi bi-pencil me-1"></i>Edit
+        </button>`;
+    }
+
+    let dropdownItems = '';
+    if (isComplete && !hasError) {
+      dropdownItems += `
+        <li><a class="dropdown-item select-btn" href="#" onclick="toggleGroupSelectionMode(); return false;">
+          <i class="bi bi-check-square me-2"></i>Select
+        </a></li>`;
+
+      if (canManage && canModify && (window.enable_extract_meta_data === true || window.enable_extract_meta_data === "true")) {
+        dropdownItems += `
+          <li><a class="dropdown-item" href="#" onclick="onExtractGroupMetadata('${docId}', event); return false;">
+            <i class="bi bi-magic me-2"></i>Extract Metadata
+          </a></li>`;
+      }
+
+      if (canShare) {
+        const shareCount = Array.isArray(doc.shared_group_ids) ? doc.shared_group_ids.length : 0;
+        dropdownItems += `
+          <li><a class="dropdown-item" href="#" onclick="shareGroupDocument('${docId}', '${escapeGroupHtml(doc.file_name || '')}'); return false;">
+            <i class="bi bi-share-fill me-2"></i>Share
+            <span class="badge bg-secondary ms-1">${shareCount}</span>
+          </a></li>`;
+      }
+
+      if (canDelete) {
+        dropdownItems += `
+          <li><hr class="dropdown-divider"></li>
+          <li><a class="dropdown-item text-danger" href="#" onclick="deleteGroupDocument('${docId}', event); return false;">
+            <i class="bi bi-trash-fill me-2"></i>Delete
+          </a></li>`;
+      }
+    } else if (canManage) {
+      dropdownItems += `
+        <li><a class="dropdown-item text-danger" href="#" onclick="deleteGroupDocument('${docId}', event); return false;">
+          <i class="bi bi-trash-fill me-2"></i>Delete
+        </a></li>`;
+    }
+
+    const dropdownHtml = dropdownItems
+      ? `
+        <div class="dropdown action-dropdown d-inline-block ms-auto">
+          <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+            <i class="bi bi-three-dots-vertical"></i>
+          </button>
+          <ul class="dropdown-menu dropdown-menu-end">${dropdownItems}</ul>
+        </div>`
+      : '';
+
+    const progressHtml = hasError
+      ? `<div class="alert alert-danger py-2 px-3 small mb-0"><i class="bi bi-exclamation-triangle-fill me-1"></i>${escapeGroupHtml(docStatus || 'Processing error')}</div>`
+      : (!isComplete
+        ? `<div class="document-item-card__progress"><div class="progress" style="height: 10px;"><div class="progress-bar progress-bar-striped progress-bar-animated bg-info" role="progressbar" style="width: ${pct}%" aria-valuenow="${pct}" aria-valuemin="0" aria-valuemax="100"></div></div><span class="document-item-card__progress-label">${escapeGroupHtml(docStatus)} (${pct.toFixed(0)}%)</span></div>`
+        : '');
+
+    const column = document.createElement('div');
+    column.className = 'col-12 col-md-6 col-xl-4';
+    column.innerHTML = `
+      <div class="card item-card document-item-card h-100${selected ? ' is-selected' : ''}" data-document-id="${docId}">
+        <div class="card-body d-flex flex-column">
+          <div class="document-item-card__header">
+            <div class="document-item-card__check">
+              <input type="checkbox" class="form-check-input document-checkbox${checkboxClass}" data-document-id="${docId}" ${selected ? 'checked' : ''} />
+            </div>
+            <div class="item-card-icon"><i class="bi ${getGroupDocumentIcon(doc.file_name || '')}" style="font-size: 1.75rem;"></i></div>
+            <div class="document-item-card__title-wrap">
+              <div class="document-item-card__eyebrow">Group document</div>
+              <h6 class="card-title mb-1" title="${escapeGroupHtml(displayTitle)}">${escapeGroupHtml(truncateGroupDocumentText(displayTitle, 60))}</h6>
+              ${subtitle ? `<div class="document-item-card__subtitle" title="${escapeGroupHtml(subtitle)}">${escapeGroupHtml(subtitle)}</div>` : ''}
+            </div>
+            <div class="document-item-card__status">${statusBadge}</div>
+          </div>
+          <div class="document-item-card__summary">${escapeGroupHtml(getGroupDocumentSummaryText(doc))}</div>
+          <div class="document-item-card__meta">${getGroupDocumentMetaPills(doc)}</div>
+          <div class="document-item-card__badges">
+            ${getGroupClassificationBadge(doc)}
+            <span class="badge ${doc.enhanced_citations ? 'bg-success' : 'bg-secondary'}">${doc.enhanced_citations ? 'Enhanced citations' : 'Standard citations'}</span>
+          </div>
+          <div class="document-item-card__tags">${renderGroupTagBadges(doc.tags || [], 4)}</div>
+          ${progressHtml}
+          <div class="item-card-buttons mt-auto d-flex flex-wrap gap-1">
+            ${primaryButtonsHtml}
+            ${dropdownHtml}
+          </div>
+        </div>
+      </div>`;
+
+    return column;
+  }
+
+  function renderGroupDocumentCards(docs) {
+    if (!groupDocumentsCardView) {
+      return;
+    }
+
+    groupDocumentsCardView.innerHTML = '';
+    docs.forEach(doc => {
+      groupDocumentsCardView.appendChild(createGroupDocumentCard(doc, userRoleInActiveGroup));
+    });
+  }
+
+  function syncGroupSelectionModeUI() {
+    const table = document.getElementById('group-documents-table');
+    const bulkActionsBar = document.getElementById('groupBulkActionsBar');
+
+    table?.classList.toggle('selection-mode', groupSelectionMode);
+    groupDocumentsCardView?.classList.toggle('selection-mode', groupSelectionMode);
+
+    document.querySelectorAll('.document-checkbox').forEach(checkbox => {
+      checkbox.classList.toggle('d-none', !groupSelectionMode);
+      checkbox.checked = groupSelectionMode && groupSelectedDocuments.has(checkbox.getAttribute('data-document-id'));
+    });
+
+    document.querySelectorAll('.expand-collapse-container').forEach(container => {
+      container.classList.toggle('d-none', groupSelectionMode);
+      container.classList.toggle('d-inline-block', !groupSelectionMode);
+    });
+
+    document.querySelectorAll('.document-item-card').forEach(card => {
+      const documentId = card.getAttribute('data-document-id');
+      card.classList.toggle('is-selected', groupSelectedDocuments.has(documentId));
+    });
+
+    if (!groupSelectionMode && bulkActionsBar) {
+      bulkActionsBar.style.display = 'none';
+    }
+
+    updateGroupBulkActionButtons();
+  }
+
+  function renderCurrentGroupDocuments() {
+    const filtersActive = groupDocsSearchTerm || groupDocsClassificationFilter || groupDocsAuthorFilter || groupDocsKeywordsFilter || groupDocsAbstractFilter || groupDocsTagsFilter;
+
+    if (!groupHasFetchedDocuments && !groupLastFetchedDocsError) {
+      return;
+    }
+
+    if (groupLastFetchedDocsError) {
+      renderGroupDocumentsErrorState(groupLastFetchedDocsError);
+      return;
+    }
+
+    groupDocumentsTableBody.innerHTML = '';
+    if (groupDocumentsCardView) {
+      groupDocumentsCardView.innerHTML = '';
+    }
+
+    if (!groupLastFetchedDocs.length) {
+      renderGroupDocumentsEmptyState(filtersActive);
+      return;
+    }
+
+    if (groupCurrentView === 'cards') {
+      renderGroupDocumentCards(groupLastFetchedDocs);
+    } else {
+      groupLastFetchedDocs.forEach(doc => renderGroupDocumentRow(doc, userRoleInActiveGroup));
+    }
+
+    syncGroupSelectionModeUI();
+  }
+
   // --- Group Document Selection Functions ---
   function updateGroupSelectedDocuments(documentId, isSelected) {
     if (isSelected) {
@@ -2216,6 +2593,12 @@ <h5 class="modal-title" id="groupTagSelectionModalLabel">Select Tags</h5>
     } else {
       groupSelectedDocuments.delete(documentId);
     }
+    document.querySelectorAll(`.document-checkbox[data-document-id="${documentId}"]`).forEach(checkbox => {
+      checkbox.checked = isSelected;
+    });
+    document.querySelectorAll(`.document-item-card[data-document-id="${documentId}"]`).forEach(card => {
+      card.classList.toggle('is-selected', isSelected);
+    });
     updateGroupBulkActionButtons();
   }
 
@@ -2255,47 +2638,13 @@ <h5 class="modal-title" id="groupTagSelectionModalLabel">Select Tags</h5>
   }
 
   function toggleGroupSelectionMode() {
-    const table = document.getElementById("group-documents-table");
-    const checkboxes = document.querySelectorAll('.document-checkbox');
-    const expandContainers = document.querySelectorAll('.expand-collapse-container');
-    const bulkActionsBar = document.getElementById("groupBulkActionsBar");
-    
     groupSelectionMode = !groupSelectionMode;
-    
-    if (groupSelectionMode) {
-      // Enter selection mode
-      table.classList.add("selection-mode");
-      
-      // Show checkboxes and hide expand buttons
-      checkboxes.forEach(checkbox => {
-        checkbox.style.display = 'inline-block';
-      });
-      
-      expandContainers.forEach(container => {
-        container.style.display = 'none';
-      });
-    } else {
-      // Exit selection mode
-      table.classList.remove("selection-mode");
-      
-      // Hide checkboxes and show expand buttons
-      checkboxes.forEach(checkbox => {
-        checkbox.style.display = 'none';
-        checkbox.checked = false;
-      });
-      
-      expandContainers.forEach(container => {
-        container.style.display = 'inline-block';
-      });
-      
-      // Hide bulk actions bar
-      if (bulkActionsBar) {
-        bulkActionsBar.style.display = 'none';
-      }
-      
-      // Clear selected documents
+
+    if (!groupSelectionMode) {
       groupSelectedDocuments.clear();
     }
+
+    syncGroupSelectionModeUI();
   }
 
   // Clear group selection
@@ -2305,7 +2654,7 @@ <h5 class="modal-title" id="groupTagSelectionModalLabel">Select Tags</h5>
       checkbox.checked = false;
     });
     groupSelectedDocuments.clear();
-    updateGroupBulkActionButtons();
+    syncGroupSelectionModeUI();
   }
 
   function deleteGroupSelectedDocuments() {
@@ -3076,6 +3425,13 @@ <h5 class="modal-title" id="groupDocumentDeleteModalLabel">Delete Group Document
           Loading group documents...
         </td>
       </tr>`;
+    if (groupDocumentsCardView) {
+      groupDocumentsCardView.innerHTML = `
+        <div class="col-12 text-center text-muted py-5">
+          <div class="spinner-border spinner-border-sm me-2" role="status"><span class="visually-hidden">Loading...</span></div>
+          Loading group documents...
+        </div>`;
+    }
     if (groupDocsPaginationContainer) groupDocsPaginationContainer.innerHTML = "";
 
     const params = new URLSearchParams({
@@ -3124,33 +3480,10 @@ <h5 class="modal-title" id="groupDocumentDeleteModalLabel">Delete Group Document
           );
           placeholder?.querySelector("#group-legacy-update-alert")?.remove();
         }
-        groupDocumentsTableBody.innerHTML = ""; // Clear loading/existing rows
-        if (!data.documents || data.documents.length === 0) {
-          const filtersActive =
-            groupDocsSearchTerm ||
-            groupDocsClassificationFilter ||
-            groupDocsAuthorFilter ||
-            groupDocsKeywordsFilter ||
-            groupDocsAbstractFilter ||
-            groupDocsTagsFilter;
-          groupDocumentsTableBody.innerHTML = `<tr><td colspan="4" class="text-center p-4 text-muted">
-                    ${
-                      filtersActive
-                        ? "No group documents found matching filters."
-                        : "No documents found in this group."
-                    }
-                    ${
-                      filtersActive
-                        ? '<br><button class="btn btn-link btn-sm p-0" onclick="onGroupDocsClearFilters()">Clear filters</button>.'
-                        : ""
-                    }
-                 </td></tr>`;
-        } else {
-          // IMPORTANT: Pass userRoleInActiveGroup to render function for permission checks
-          data.documents.forEach((doc) =>
-            renderGroupDocumentRow(doc, userRoleInActiveGroup)
-          );
-        }
+        groupLastFetchedDocs = data.documents || [];
+        groupLastFetchedDocsError = null;
+        groupHasFetchedDocuments = true;
+        renderCurrentGroupDocuments();
         renderGroupDocsPaginationControls(
           data.page,
           data.page_size,
@@ -3159,9 +3492,12 @@ <h5 class="modal-title" id="groupDocumentDeleteModalLabel">Delete Group Document
       })
       .catch((error) => {
         console.error("Error fetching group documents:", error);
-        groupDocumentsTableBody.innerHTML = `<tr><td colspan="4" class="text-center text-danger p-4">Error loading group documents: ${escapeHtml(
+        groupLastFetchedDocs = [];
+        groupLastFetchedDocsError = `Error loading group documents: ${escapeHtml(
           error.error || error.message || "Unknown error"
-        )}</td></tr>`;
+        )}`;
+        groupHasFetchedDocuments = true;
+        renderGroupDocumentsErrorState(groupLastFetchedDocsError);
         renderGroupDocsPaginationControls(1, groupDocsPageSize, 0);
       });
   }
@@ -3188,7 +3524,7 @@ <h5 class="modal-title" id="groupDocumentDeleteModalLabel">Delete Group Document
     // First column with checkbox and expand/collapse
     let firstColumnHtml = `
         <td class="align-middle">
-            <input type="checkbox" class="document-checkbox" data-document-id="${docId}" style="display: none;">
+            <input type="checkbox" class="form-check-input document-checkbox${groupSelectionMode ? '' : ' d-none'}" data-document-id="${docId}" ${groupSelectedDocuments.has(docId) ? 'checked' : ''}>
             <span class="expand-collapse-container">
             ${isComplete && !hasError ?
                 `<button class="btn btn-link p-0" onclick="toggleGroupDetails('${docId}')" title="Show/Hide Details">
@@ -3324,9 +3660,9 @@ <h5 class="modal-title" id="groupDocumentDeleteModalLabel">Delete Group Document
     // Complete row HTML
     docRow.innerHTML = `
         ${firstColumnHtml}
-        <td class="align-middle" title="${escapeHtml(doc.file_name || "")}">${escapeHtml(doc.file_name || "")}</td>
-        <td class="align-middle" title="${escapeHtml(doc.title || "")}">${escapeHtml(doc.title || "N/A")}</td>
-        <td class="align-middle">
+      <td class="align-middle document-file-cell" title="${escapeHtml(doc.file_name || "")}">${escapeHtml(doc.file_name || "")}</td>
+      <td class="align-middle document-title-cell" title="${escapeHtml(doc.title || "")}">${escapeHtml(doc.title || "N/A")}</td>
+      <td class="align-middle document-actions-cell">
             ${chatButton}
             ${actionsDropdown}
         </td>
@@ -3338,6 +3674,7 @@ <h5 class="modal-title" id="groupDocumentDeleteModalLabel">Delete Group Document
     if (isComplete && !hasError) {
       const detailsRow = document.createElement("tr");
       detailsRow.id = `group-details-row-${docId}`; // Distinct prefix
+      detailsRow.classList.add("document-details-row");
       detailsRow.style.display = "none";
 
       let classificationDisplayHTML = "";
@@ -3425,6 +3762,7 @@ <h5 class="modal-title" id="groupDocumentDeleteModalLabel">Delete Group Document
     if (!isComplete || hasError) {
       const statusRow = document.createElement("tr");
       statusRow.id = `group-status-row-${docId}`; // Distinct prefix
+      statusRow.classList.add("document-status-row");
       if (hasError) {
         statusRow.innerHTML = `<td colspan="4"><div class="alert alert-danger alert-sm py-1 px-2 mb-0 small"><i class="bi bi-exclamation-triangle-fill me-1"></i> Error: ${escapeHtml(
           docStatus
@@ -4460,23 +4798,43 @@ <h5 class="alert-heading">
 
   function setupGroupViewSwitcher() {
     const listRadio = document.getElementById('group-docs-view-list');
+    const cardsRadio = document.getElementById('group-docs-view-cards');
     const gridRadio = document.getElementById('group-docs-view-grid');
     if (listRadio) listRadio.addEventListener('change', () => { if (listRadio.checked) switchGroupView('list'); });
+    if (cardsRadio) cardsRadio.addEventListener('change', () => { if (cardsRadio.checked) switchGroupView('cards'); });
     if (gridRadio) gridRadio.addEventListener('change', () => { if (gridRadio.checked) switchGroupView('grid'); });
   }
 
   function switchGroupView(view) {
-    groupCurrentView = view;
+    groupCurrentView = view === 'grid' || view === 'cards' ? view : 'list';
     localStorage.setItem('groupWorkspaceViewPreference', view);
     const listView = document.getElementById('group-documents-list-view');
+    const cardView = document.getElementById('group-documents-card-view');
     const gridView = document.getElementById('group-documents-grid-view');
     const viewInfo = document.getElementById('group-docs-view-info');
+    const listControls = document.getElementById('group-list-controls-bar');
     const gridControls = document.getElementById('group-grid-controls-bar');
     const filterBtn = document.getElementById('group-docs-filters-toggle-btn');
     const filterCollapse = document.getElementById('group-docs-filters-collapse');
     const bulkBar = document.getElementById('groupBulkActionsBar');
 
-    if (view === 'list') {
+    const showElement = (element, displayClass = '') => {
+      if (!element) return;
+      element.classList.remove('d-none');
+      if (displayClass) {
+        element.classList.add(displayClass);
+      }
+    };
+
+    const hideElement = (element, displayClass = '') => {
+      if (!element) return;
+      element.classList.add('d-none');
+      if (displayClass) {
+        element.classList.remove(displayClass);
+      }
+    };
+
+    if (groupCurrentView === 'list' || groupCurrentView === 'cards') {
       groupCurrentFolder = null;
       groupCurrentFolderType = null;
       groupFolderCurrentPage = 1;
@@ -4485,22 +4843,39 @@ <h5 class="alert-heading">
       groupFolderSearchTerm = '';
       const tagContainer = document.getElementById('group-tag-folders-container');
       if (tagContainer) tagContainer.className = 'row g-2';
-      if (listView) listView.style.display = 'block';
-      if (gridView) gridView.style.display = 'none';
-      if (gridControls) gridControls.style.display = 'none';
-      if (filterBtn) filterBtn.style.display = '';
-      if (viewInfo) viewInfo.textContent = '';
-      fetchGroupDocuments();
+
+      if (groupCurrentView === 'list') {
+        showElement(listView);
+        hideElement(cardView);
+        if (viewInfo) viewInfo.textContent = '';
+      } else {
+        hideElement(listView);
+        showElement(cardView);
+        if (viewInfo) viewInfo.textContent = 'Cards surface status, metadata, and quick actions.';
+      }
+
+      hideElement(gridView);
+      showElement(listControls, 'd-flex');
+      hideElement(gridControls, 'd-flex');
+      if (filterBtn) filterBtn.classList.remove('d-none');
+      renderCurrentGroupDocuments();
     } else {
-      if (listView) listView.style.display = 'none';
-      if (gridView) gridView.style.display = 'block';
-      if (gridControls) gridControls.style.display = 'flex';
-      if (filterBtn) filterBtn.style.display = 'none';
+      hideElement(listView);
+      hideElement(cardView);
+      showElement(gridView);
+      hideElement(listControls, 'd-flex');
+      showElement(gridControls, 'd-flex');
+      if (filterBtn) filterBtn.classList.add('d-none');
       if (filterCollapse) {
         const bsCollapse = bootstrap.Collapse.getInstance(filterCollapse);
         if (bsCollapse) bsCollapse.hide();
       }
-      if (bulkBar) bulkBar.style.display = 'none';
+      if (viewInfo) viewInfo.textContent = 'Browse documents by tag and classification folders.';
+      if (groupSelectionMode) {
+        toggleGroupSelectionMode();
+      } else if (bulkBar) {
+        bulkBar.style.display = 'none';
+      }
       renderGroupGridView();
     }
   }
@@ -5044,10 +5419,17 @@ <h5 class="alert-heading">
 
     // Load saved view preference
     const savedView = localStorage.getItem('groupWorkspaceViewPreference');
-    if (savedView === 'grid') {
+    const defaultView = savedView === 'grid' || savedView === 'cards'
+      ? savedView
+      : (window.matchMedia && window.matchMedia('(max-width: 991.98px)').matches ? 'cards' : 'list');
+    if (defaultView === 'cards') {
+      const cardsRadio = document.getElementById('group-docs-view-cards');
+      if (cardsRadio) cardsRadio.checked = true;
+    } else if (defaultView === 'grid') {
       const gridRadio = document.getElementById('group-docs-view-grid');
-      if (gridRadio) { gridRadio.checked = true; switchGroupView('grid'); }
+      if (gridRadio) gridRadio.checked = true;
     }
+    switchGroupView(defaultView);
 
     // Wire sortable headers in list view
     document.querySelectorAll('#group-documents-table .sortable-header').forEach(th => {
diff --git a/application/single_app/templates/profile.html b/application/single_app/templates/profile.html
index 42826cde..4c802a20 100644
--- a/application/single_app/templates/profile.html
+++ b/application/single_app/templates/profile.html
@@ -179,6 +179,14 @@
     .fact-memory-pagination-summary {
         min-height: 1.5rem;
     }
+
+    .fact-memory-delete-modal-stacked {
+        --bs-modal-zindex: 1065;
+    }
+
+    .modal-backdrop.fact-memory-delete-backdrop-stacked {
+        --bs-backdrop-zindex: 1060;
+    }
     
     @keyframes spin {
         0% { transform: rotate(0deg); }
@@ -590,7 +598,7 @@ <h5 class="mb-3"><i class="bi bi-volume-up-fill me-2"></i>Text-to-Speech Setting
                 <button type="button" class="btn btn-sm btn-outline-primary" id="tts-preview-btn" onclick="playVoicePreview()">
                     <i class="bi bi-play-circle me-1"></i>Play Sample
                 </button>
-                <button type="button" class="btn btn-sm btn-outline-danger" id="tts-stop-btn" onclick="stopVoicePreview()" style="display: none;">
+                <button type="button" class="btn btn-sm btn-outline-danger d-none" id="tts-stop-btn" onclick="stopVoicePreview()">
                     <i class="bi bi-stop-circle me-1"></i>Stop
                 </button>
                 <span id="tts-preview-status" class="text-muted small"></span>
@@ -871,13 +879,16 @@ <h5 class="modal-title" id="exportActivityModalLabel">
 let factMemoryEntries = [];
 let filteredFactMemoryEntries = [];
 let factMemoryCurrentPage = 1;
+let pendingFactMemoryDeleteId = null;
+let factMemoryDeleteModalInstance = null;
+let factMemoryManagerModalInstance = null;
 const FACT_MEMORY_PAGE_SIZE = 5;
 const FACT_MEMORY_TYPE_INSTRUCTION = 'instruction';
 const FACT_MEMORY_TYPE_FACT = 'fact';
 const FACT_MEMORY_TYPE_LEGACY_DESCRIBER = 'describer';
-let pendingFactMemoryDeleteId = null;
-let factMemoryDeleteModalInstance = null;
-let factMemoryManagerModalInstance = null;
+let pendingFactMemoryDeleteTrigger = null;
+const FACT_MEMORY_DELETE_MODAL_STACKED_CLASS = 'fact-memory-delete-modal-stacked';
+const FACT_MEMORY_DELETE_BACKDROP_STACKED_CLASS = 'fact-memory-delete-backdrop-stacked';
 
 console.log('Profile page script loaded - preparing to initialize');
 
@@ -949,6 +960,7 @@ <h5 class="modal-title" id="exportActivityModalLabel">
     loadRetentionSettings();
     handleProfileFeatureAction();
     loadTutorialPreferences();
+    initializeFactMemoryModalInstances();
     loadFactMemory();
     loadMicrophoneSettings();
     loadUserMetrics();
@@ -1132,6 +1144,100 @@ <h5 class="modal-title" id="exportActivityModalLabel">
     return `${getFactMemoryTypeLabel(fact.memory_type)} memory · Updated ${formatFactMemoryDate(fact.updated_at)}`;
 }
 
+function initializeFactMemoryModalInstances() {
+    if (typeof bootstrap === 'undefined') {
+        return;
+    }
+
+    const managerModalElement = document.getElementById('factMemoryManagerModal');
+    const deleteModalElement = document.getElementById('factMemoryDeleteModal');
+
+    if (managerModalElement) {
+        factMemoryManagerModalInstance = bootstrap.Modal.getOrCreateInstance(managerModalElement);
+    }
+
+    if (!deleteModalElement) {
+        return;
+    }
+
+    if (deleteModalElement.parentElement !== document.body) {
+        document.body.appendChild(deleteModalElement);
+    }
+
+    factMemoryDeleteModalInstance = bootstrap.Modal.getOrCreateInstance(deleteModalElement);
+
+    if (!deleteModalElement.dataset.bound) {
+        deleteModalElement.addEventListener('show.bs.modal', handleFactMemoryDeleteModalShow);
+        deleteModalElement.addEventListener('shown.bs.modal', handleFactMemoryDeleteModalShown);
+        deleteModalElement.addEventListener('hidden.bs.modal', handleFactMemoryDeleteModalHidden);
+        deleteModalElement.dataset.bound = 'true';
+    }
+}
+
+function isFactMemoryManagerModalOpen() {
+    const managerModalElement = document.getElementById('factMemoryManagerModal');
+    return Boolean(managerModalElement && managerModalElement.classList.contains('show'));
+}
+
+function getLatestModalBackdrop() {
+    const backdrops = document.querySelectorAll('.modal-backdrop');
+    return backdrops.length ? backdrops[backdrops.length - 1] : null;
+}
+
+function handleFactMemoryDeleteModalShow() {
+    const deleteModalElement = document.getElementById('factMemoryDeleteModal');
+    if (!deleteModalElement) {
+        return;
+    }
+
+    const shouldStackAboveManager = isFactMemoryManagerModalOpen();
+    deleteModalElement.classList.toggle(FACT_MEMORY_DELETE_MODAL_STACKED_CLASS, shouldStackAboveManager);
+    deleteModalElement.dataset.stackWithManager = shouldStackAboveManager ? 'true' : 'false';
+}
+
+function handleFactMemoryDeleteModalShown() {
+    const deleteModalElement = document.getElementById('factMemoryDeleteModal');
+    if (!deleteModalElement || deleteModalElement.dataset.stackWithManager !== 'true') {
+        return;
+    }
+
+    const latestBackdrop = getLatestModalBackdrop();
+    if (latestBackdrop) {
+        latestBackdrop.classList.add(FACT_MEMORY_DELETE_BACKDROP_STACKED_CLASS);
+    }
+}
+
+function handleFactMemoryDeleteModalHidden() {
+    const deleteModalElement = document.getElementById('factMemoryDeleteModal');
+    const searchInput = document.getElementById('fact-memory-search-input');
+    const focusTarget = pendingFactMemoryDeleteTrigger && document.contains(pendingFactMemoryDeleteTrigger)
+        ? pendingFactMemoryDeleteTrigger
+        : searchInput;
+
+    if (deleteModalElement) {
+        deleteModalElement.classList.remove(FACT_MEMORY_DELETE_MODAL_STACKED_CLASS);
+        deleteModalElement.dataset.stackWithManager = 'false';
+    }
+
+    document.querySelectorAll(`.modal-backdrop.${FACT_MEMORY_DELETE_BACKDROP_STACKED_CLASS}`).forEach((backdrop) => {
+        backdrop.classList.remove(FACT_MEMORY_DELETE_BACKDROP_STACKED_CLASS);
+    });
+
+    pendingFactMemoryDeleteId = null;
+    pendingFactMemoryDeleteTrigger = null;
+
+    if (!isFactMemoryManagerModalOpen()) {
+        return;
+    }
+
+    document.body.classList.add('modal-open');
+    if (focusTarget) {
+        window.setTimeout(() => {
+            focusTarget.focus({ preventScroll: true });
+        }, 0);
+    }
+}
+
 function updateFactMemorySummary() {
     const countElement = document.getElementById('fact-memory-count');
     const updatedElement = document.getElementById('fact-memory-last-updated');
@@ -1287,7 +1393,7 @@ <h5 class="modal-title" id="exportActivityModalLabel">
         deleteButton.className = 'btn btn-outline-danger btn-sm';
         deleteButton.setAttribute('aria-label', 'Delete memory');
         deleteButton.innerHTML = '<i class="bi bi-trash me-1"></i>Delete';
-        deleteButton.addEventListener('click', () => requestFactMemoryDelete(fact.id));
+        deleteButton.addEventListener('click', () => requestFactMemoryDelete(fact.id, deleteButton));
 
         actions.appendChild(saveButton);
         actions.appendChild(deleteButton);
@@ -1303,15 +1409,12 @@ <h5 class="modal-title" id="exportActivityModalLabel">
 }
 
 function openFactMemoryModal() {
+    initializeFactMemoryModalInstances();
     const modalElement = document.getElementById('factMemoryManagerModal');
-    if (!modalElement || typeof bootstrap === 'undefined') {
+    if (!modalElement || typeof bootstrap === 'undefined' || !factMemoryManagerModalInstance) {
         return;
     }
 
-    if (!factMemoryManagerModalInstance) {
-        factMemoryManagerModalInstance = new bootstrap.Modal(modalElement);
-    }
-
     factMemoryCurrentPage = 1;
     renderFactMemoryModalList();
     factMemoryManagerModalInstance.show();
@@ -1466,17 +1569,22 @@ <h5 class="modal-title" id="exportActivityModalLabel">
     }
 }
 
-function requestFactMemoryDelete(factId) {
+function requestFactMemoryDelete(factId, triggerElement = null) {
     pendingFactMemoryDeleteId = factId;
+    pendingFactMemoryDeleteTrigger = triggerElement && document.contains(triggerElement)
+        ? triggerElement
+        : null;
+
+    initializeFactMemoryModalInstances();
+
     const modalElement = document.getElementById('factMemoryDeleteModal');
-    if (!modalElement || typeof bootstrap === 'undefined') {
+    if (!modalElement || typeof bootstrap === 'undefined' || !factMemoryDeleteModalInstance) {
+        pendingFactMemoryDeleteId = null;
+        pendingFactMemoryDeleteTrigger = null;
+        updateFactMemoryStatus('Delete confirmation dialog is unavailable. Refresh the page and try again.', 'danger');
         return;
     }
 
-    if (!factMemoryDeleteModalInstance) {
-        factMemoryDeleteModalInstance = new bootstrap.Modal(modalElement);
-    }
-
     factMemoryDeleteModalInstance.show();
 }
 
@@ -1504,6 +1612,7 @@ <h5 class="modal-title" id="exportActivityModalLabel">
         }
 
         if (factMemoryDeleteModalInstance) {
+            pendingFactMemoryDeleteTrigger = null;
             factMemoryDeleteModalInstance.hide();
         }
         pendingFactMemoryDeleteId = null;
@@ -2382,8 +2491,21 @@ <h5 class="modal-title" id="exportActivityModalLabel">
 let ttsVoices = [];
 let currentAudio = null;
 
+function setTtsPreviewButtonState(isPlaying) {
+    const previewButton = document.getElementById('tts-preview-btn');
+    const stopButton = document.getElementById('tts-stop-btn');
+    if (!previewButton || !stopButton) {
+        return;
+    }
+
+    previewButton.classList.toggle('d-none', isPlaying);
+    stopButton.classList.toggle('d-none', !isPlaying);
+}
+
 async function loadTTSSettings() {
     try {
+        setTtsPreviewButtonState(false);
+
         // Load available voices
         const voicesResponse = await fetch('/api/chat/tts/voices');
         const voicesData = await voicesResponse.json();
@@ -2459,9 +2581,9 @@ <h5 class="modal-title" id="exportActivityModalLabel">
     if (currentAudio) {
         currentAudio.pause();
         currentAudio = null;
-        document.getElementById('tts-preview-btn').style.display = 'inline-block';
-        document.getElementById('tts-stop-btn').style.display = 'none';
     }
+
+    setTtsPreviewButtonState(false);
 }
 
 async function playVoicePreview() {
@@ -2475,7 +2597,6 @@ <h5 class="modal-title" id="exportActivityModalLabel">
     
     const speed = parseFloat(document.getElementById('tts-speed-slider').value);
     const previewBtn = document.getElementById('tts-preview-btn');
-    const stopBtn = document.getElementById('tts-stop-btn');
     const statusSpan = document.getElementById('tts-preview-status');
     
     try {
@@ -2509,20 +2630,17 @@ <h5 class="modal-title" id="exportActivityModalLabel">
         
         currentAudio = new Audio(audioUrl);
         currentAudio.onplay = () => {
-            previewBtn.style.display = 'none';
-            stopBtn.style.display = 'inline-block';
+            setTtsPreviewButtonState(true);
             statusSpan.textContent = 'Playing...';
         };
         currentAudio.onended = () => {
-            previewBtn.style.display = 'inline-block';
-            stopBtn.style.display = 'none';
+            setTtsPreviewButtonState(false);
             previewBtn.disabled = false;
             statusSpan.textContent = '';
             URL.revokeObjectURL(audioUrl);
         };
         currentAudio.onerror = () => {
-            previewBtn.style.display = 'inline-block';
-            stopBtn.style.display = 'none';
+            setTtsPreviewButtonState(false);
             previewBtn.disabled = false;
             statusSpan.textContent = '';
             showToastMessage('Error playing audio', 'danger');
@@ -2533,6 +2651,7 @@ <h5 class="modal-title" id="exportActivityModalLabel">
     } catch (error) {
         console.error('Error playing voice preview:', error);
         showToastMessage('Failed to play voice preview', 'danger');
+        setTtsPreviewButtonState(false);
         previewBtn.disabled = false;
         statusSpan.textContent = '';
     }
@@ -2542,10 +2661,10 @@ <h5 class="modal-title" id="exportActivityModalLabel">
     if (currentAudio) {
         currentAudio.pause();
         currentAudio = null;
-        document.getElementById('tts-preview-btn').style.display = 'inline-block';
-        document.getElementById('tts-stop-btn').style.display = 'none';
         document.getElementById('tts-preview-status').textContent = '';
     }
+
+    setTtsPreviewButtonState(false);
 }
 
 async function saveTTSSettings() {
diff --git a/application/single_app/templates/workspace.html b/application/single_app/templates/workspace.html
index d79cae14..01c171ce 100644
--- a/application/single_app/templates/workspace.html
+++ b/application/single_app/templates/workspace.html
@@ -5,6 +5,7 @@
   <!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/simplemde/dist/simplemde.min.css" />
    LOCAL VERSION BELOW -->
    <link rel="stylesheet" href="/static/css/simplemde.min.css" />
+  <link rel="stylesheet" href="{{ url_for('static', filename='css/workspace-responsive.css') }}" />
 
   <style>
     /* Keep fixed layout for document and prompt tables only. */
@@ -437,8 +438,13 @@
 {% endblock %}
 
 {% block content %}
-  <div class="container">
-    <h2>Personal Workspace</h2>
+  <div class="container workspace-page">
+    <div class="workspace-page-header">
+      <div>
+        <h2 class="workspace-page-title">Personal Workspace</h2>
+        <p class="workspace-page-subtitle">Manage documents, prompts, agents, actions, and model endpoints from one place.</p>
+      </div>
+    </div>
 
     <!-- Migration Banner (Hidden by default) -->
     <div id="migration-banner" class="alert alert-info alert-dismissible fade show" role="alert" style="display: none;">
@@ -463,6 +469,27 @@ <h2>Personal Workspace</h2>
       </div>
     </div>
 
+    <div class="workspace-section-switcher mb-3{% if nav_layout == 'left' %} workspace-section-switcher--persistent{% endif %}" data-workspace-switcher data-tab-list="#workspaceTab">
+      <div class="w-100">
+        <label class="form-label" for="workspace-section-select">Section</label>
+        <select class="form-select" id="workspace-section-select" data-workspace-section-select aria-label="Select workspace section">
+          <option value="documents-tab-btn">Your Documents</option>
+          <option value="prompts-tab-btn">Your Prompts</option>
+          {% if settings.per_user_semantic_kernel and settings.enable_semantic_kernel %}
+            {% if settings.allow_user_agents %}
+              <option value="agents-tab-btn">Your Agents</option>
+              {% if settings.allow_user_plugins %}
+                <option value="plugins-tab-btn">Your Actions</option>
+              {% endif %}
+            {% endif %}
+          {% endif %}
+          {% if settings.allow_user_custom_endpoints and settings.enable_multi_model_endpoints %}
+            <option value="endpoints-tab-btn">Your Endpoints</option>
+          {% endif %}
+        </select>
+      </div>
+    </div>
+
     <!-- Nav Tabs - Hide when left nav is enabled -->
     <ul class="nav nav-tabs{% if nav_layout == 'left' %} d-none{% endif %}" id="workspaceTab" role="tablist">
       <li class="nav-item" role="presentation">
@@ -658,10 +685,14 @@ <h2>Personal Workspace</h2>
               <label class="btn btn-outline-secondary" for="docs-view-list">
                 <i class="bi bi-list-ul"></i> List
               </label>
+              <input type="radio" class="btn-check" name="docs-view-mode" id="docs-view-cards" autocomplete="off">
+              <label class="btn btn-outline-secondary" for="docs-view-cards">
+                <i class="bi bi-grid"></i> Cards
+              </label>
               
               <input type="radio" class="btn-check" name="docs-view-mode" id="docs-view-grid" autocomplete="off">
               <label class="btn btn-outline-secondary" for="docs-view-grid">
-                <i class="bi bi-grid-3x3-gap"></i> Grid
+                <i class="bi bi-folder2-open"></i> Folders
               </label>
             </div>
             <div class="d-flex align-items-center gap-2">
@@ -726,8 +757,15 @@ <h2>Personal Workspace</h2>
             </table>
           </div>
 
-          <!-- Documents Grid View (Tag Folders) -->
-          <div id="documents-grid-view" style="display: none;">
+          <div id="documents-card-view" class="row g-3 d-none">
+            <div class="col-12 text-center text-muted py-5">
+              <div class="spinner-border spinner-border-sm me-2" role="status"><span class="visually-hidden">Loading...</span></div>
+              Loading documents...
+            </div>
+          </div>
+
+          <!-- Documents Folders View -->
+          <div id="documents-grid-view" class="d-none">
             <div id="tag-folders-container" class="row g-2">
               <!-- Populated by JavaScript -->
               <div class="col-12 text-center text-muted py-5">
@@ -738,7 +776,7 @@ <h2>Personal Workspace</h2>
           </div>
 
           <!-- List View Controls (pagination & page size) -->
-          <div id="list-controls-bar" class="align-items-center gap-3 mb-3 mt-3" style="display: flex;">
+          <div id="list-controls-bar" class="d-flex align-items-center gap-3 mb-3 mt-3">
             <div>
               <label for="docs-page-size-select" class="visually-hidden">Items per page:</label>
               <select id="docs-page-size-select" class="form-select form-select-sm d-inline-block" style="width:auto;">
@@ -754,7 +792,7 @@ <h2>Personal Workspace</h2>
           </div>
 
           <!-- Grid View Controls (sort, page size, pagination) -->
-          <div id="grid-controls-bar" class="align-items-center gap-3 mb-3 mt-3" style="display: none;">
+          <div id="grid-controls-bar" class="align-items-center gap-3 mb-3 mt-3 d-none">
             <div class="d-flex align-items-center gap-2">
               <small class="text-muted">Sort:</small>
               <button class="btn btn-sm btn-outline-secondary grid-sort-btn" data-sort="name">
@@ -1754,6 +1792,7 @@ <h5 class="modal-title" id="approveSharedModalLabel">Approve Shared Document</h5
   <script type="module" src="{{ url_for('static', filename='js/workspace/workspace-prompts.js') }}"></script>
   <script type="module" src="{{ url_for('static', filename='js/plugin_modal_stepper.js') }}"></script>
   <script src="{{ url_for('static', filename='js/workspace_sidebar_nav.js') }}"></script>
+  <script src="{{ url_for('static', filename='js/workspace_section_switcher.js') }}"></script>
   <script type="module" src="{{ url_for('static', filename='js/workspace/workspace-migration.js') }}"></script>
   <script type="module" src="{{ url_for('static', filename='js/workspace/workspace-init.js') }}"></script>
   <script type="module" src="{{ url_for('static', filename='js/workspace/workspace-tutorial.js') }}"></script>
diff --git a/docs/explanation/features/ACTIVITY_LOG_LAYOUT_PRESETS.md b/docs/explanation/features/ACTIVITY_LOG_LAYOUT_PRESETS.md
new file mode 100644
index 00000000..b829edfe
--- /dev/null
+++ b/docs/explanation/features/ACTIVITY_LOG_LAYOUT_PRESETS.md
@@ -0,0 +1,67 @@
+# Activity Log Layout Presets
+
+Fixed/Implemented in version: **0.241.016**
+
+## Overview and Purpose
+
+The Control Center Activity Logs tab now includes layout presets so users can choose between balanced scanning, longer detail visibility, or denser column presentation without manually resizing the browser.
+
+This feature improves readability for wide and narrow viewports while keeping the existing raw-log modal available for full detail inspection.
+
+Dependencies: `application/single_app/templates/control_center.html`, `application/single_app/static/js/control-center.js`, browser `localStorage`, Bootstrap button styling, the existing Activity Logs raw-log modal.
+
+## Technical Specifications
+
+Architecture overview:
+
+- The Activity Logs table in `application/single_app/templates/control_center.html` now exposes three presets: `Balanced`, `Details Focus`, and `Compact`.
+- The table keeps the existing fixed-layout approach, but the column widths are now driven by CSS custom properties instead of hard-coded width blocks only.
+- `application/single_app/static/js/control-center.js` applies the active preset by setting `data-layout-preset` on `#activityLogsTable` and updates the helper hint text.
+
+Configuration options:
+
+- Default preset: `balanced`
+- Browser persistence key: `simplechat_activityLogsLayoutPreset`
+- Preset values: `balanced`, `details-focus`, `compact`
+
+File structure:
+
+- `application/single_app/templates/control_center.html` — preset controls, helper text, preset-aware table styling.
+- `application/single_app/static/js/control-center.js` — preset load/apply/save logic and hint updates.
+- `functional_tests/test_control_center_activity_logs_layout_presets.py` — source-level regression coverage.
+- `ui_tests/test_control_center_activity_logs_layout_presets.py` — browser workflow and persistence validation.
+
+## Usage Instructions
+
+How to use:
+
+- Open Control Center and switch to the Activity Logs tab.
+- Choose `Balanced` for the default five-column layout.
+- Choose `Details Focus` to widen the Details column and show more multiline content.
+- Choose `Compact` to prioritize quicker scanning across surrounding columns.
+- Click any Activity Logs row to open the existing raw-log modal for the full JSON payload.
+
+Integration points:
+
+- Preset changes are applied immediately in the browser with no server round-trip.
+- The selected preset is restored from `localStorage` after a page reload.
+- The feature builds on top of the Activity Logs hardening work documented in `docs/explanation/fixes/v0.241.015/CONTROL_CENTER_ACTIVITY_LOGS_HARDENING_FIX.md`.
+
+## Testing and Validation
+
+Test coverage:
+
+- `functional_tests/test_control_center_activity_logs_layout_presets.py`
+- `ui_tests/test_control_center_activity_logs_layout_presets.py`
+
+Validation highlights:
+
+- Confirms the template exposes preset controls, helper text, and preset-aware CSS variables.
+- Confirms the client stores the selected preset in `localStorage` and reapplies it on reload.
+- Confirms the browser-visible preset changes update table layout characteristics without breaking Activity Logs loading.
+
+Known limitations:
+
+- Preset persistence is local to the current browser and device.
+- This release does not add draggable column resizing.
+- Mobile and narrow layouts still rely on the existing responsive wrapper and row-to-modal flow for full details.
\ No newline at end of file
diff --git a/docs/explanation/features/index.md b/docs/explanation/features/index.md
index 800ebdae..c50c1fd1 100644
--- a/docs/explanation/features/index.md
+++ b/docs/explanation/features/index.md
@@ -13,4 +13,5 @@ category: Version History
 
 ## Admin Experience Features
 
-- [AI Voice Conversations Setup Guide](AI_VOICE_CONVERSATIONS_SETUP_GUIDE.md)
\ No newline at end of file
+- [AI Voice Conversations Setup Guide](AI_VOICE_CONVERSATIONS_SETUP_GUIDE.md)
+- [Activity Log Layout Presets](ACTIVITY_LOG_LAYOUT_PRESETS.md)
\ No newline at end of file
diff --git a/docs/explanation/fixes/ADMIN_ACTIVITY_LOG_USER_ID_FIX.md b/docs/explanation/fixes/ADMIN_ACTIVITY_LOG_USER_ID_FIX.md
new file mode 100644
index 00000000..d0ad692d
--- /dev/null
+++ b/docs/explanation/fixes/ADMIN_ACTIVITY_LOG_USER_ID_FIX.md
@@ -0,0 +1,57 @@
+# Admin Activity Log User ID Fix
+
+## Overview
+
+Fixed a Control Center activity log failure caused by some `admin_action` records storing `user_id` as a full session identity object instead of a string identifier.
+
+Fixed in version: **0.241.021**
+
+## Root Cause
+
+The admin settings route passed the entire `session['user']` payload into `log_general_admin_action(...)` for the multi-model endpoint migration event. That helper persisted the value directly into the activity log record, so some `admin_action` rows were written with a dictionary-valued `user_id`.
+
+The Control Center activity log API later built a user lookup cache with those values as dictionary keys, which raised `TypeError: unhashable type: 'dict'`.
+
+## Technical Details
+
+Files modified:
+
+- `application/single_app/functions_activity_logging.py`
+- `application/single_app/route_frontend_admin_settings.py`
+- `application/single_app/route_backend_control_center.py`
+- `application/single_app/config.py`
+- `functional_tests/test_admin_action_activity_log.py`
+- `functional_tests/test_control_center_activity_logs_hardening.py`
+
+Code changes summary:
+
+- Added `coerce_activity_log_user_id(...)` to extract a stable string id from session-style identity objects.
+- Updated `log_general_admin_action(...)` to normalize `admin_user_id` before persisting the activity record.
+- Fixed the admin settings route to pass the scalar `user_id` returned by `get_current_user_id()`.
+- Hardened Control Center activity log normalization and user-map building so older malformed records no longer crash the reader path.
+
+Testing approach:
+
+- Updated activity logging regression coverage to assert user id normalization in the writer path.
+- Updated Control Center activity log hardening checks to assert malformed user id normalization support.
+
+Impact analysis:
+
+- Newly created admin action records now store string user identifiers consistently.
+- Existing malformed activity log records remain readable without requiring an immediate data migration.
+
+## Validation
+
+Before:
+
+- Loading the Control Center activity log page could fail with `TypeError: unhashable type: 'dict'`.
+
+After:
+
+- The writer normalizes admin identifiers before persistence.
+- The reader normalizes legacy malformed records before user lookup.
+
+Related functional tests:
+
+- `functional_tests/test_admin_action_activity_log.py`
+- `functional_tests/test_control_center_activity_logs_hardening.py`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.007/LOCAL_AGENT_COGNITIVE_SERVICES_SCOPE_FIX.md b/docs/explanation/fixes/v0.241.007/LOCAL_AGENT_COGNITIVE_SERVICES_SCOPE_FIX.md
new file mode 100644
index 00000000..1b218938
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.007/LOCAL_AGENT_COGNITIVE_SERVICES_SCOPE_FIX.md
@@ -0,0 +1,51 @@
+# Local Agent Cognitive Services Scope Fix
+
+Fixed/Implemented in version: **0.241.007**
+
+## Issue Description
+
+Local agents using Azure OpenAI managed identity or service principal authentication always requested the commercial Cognitive Services audience from the shared Semantic Kernel loader.
+
+That behavior ignored the configured `cognitive_services_scope` in `config.py`, so non-public environments such as Azure Government and custom cloud deployments could fail to acquire tokens for local agent execution.
+
+## Root Cause Analysis
+
+`resolve_agent_config()` in `application/single_app/semantic_kernel_loader.py` builds token providers for local and Foundry agents through a nested `build_token_provider()` helper.
+
+The Foundry branch already resolved provider-specific `ai.azure*` scopes, but the Azure OpenAI branch hardcoded `https://cognitiveservices.azure.com/.default` instead of reading `cognitive_services_scope` from `application/single_app/config.py`.
+
+Because personal, group, and global local agents all resolve through the same shared loader helper, the hardcoded commercial audience affected every local-agent scope.
+
+## Technical Details
+
+Files modified: `application/single_app/semantic_kernel_loader.py`, `application/single_app/config.py`, `functional_tests/test_local_agent_cognitive_services_scope.py`
+
+Code changes summary:
+
+- Imported `cognitive_services_scope` from `config.py` into the shared Semantic Kernel loader.
+- Added a shared Azure OpenAI scope helper inside `resolve_agent_config()` so local token providers consistently use the configured Cognitive Services scope.
+- Preserved `resolve_foundry_scope()` for `aifoundry` and `new_foundry` providers so Foundry runtime behavior remains provider-specific.
+- Left personal, group, and global agent storage code unchanged because all three local agent scopes already converge on the same loader path.
+
+Impact analysis:
+
+- Local agents now honor the configured Cognitive Services audience in public, government, and custom Azure environments.
+- Foundry agent scope resolution remains unchanged and isolated from the local Azure OpenAI fix.
+
+## Validation
+
+Test coverage: `functional_tests/test_local_agent_cognitive_services_scope.py`
+
+Test results:
+
+- Validates that the loader imports and uses `cognitive_services_scope` from `config.py` for Azure OpenAI token providers.
+- Validates that the local agent path no longer hardcodes the commercial Cognitive Services scope.
+- Validates that Foundry providers still use `resolve_foundry_scope()`.
+- Validates that personal, group, and global local agents all resolve through the same shared loader helper.
+
+Before/after comparison:
+
+- Before: Local agents always requested the commercial Cognitive Services audience regardless of environment configuration.
+- After: Local agents use the configured `cognitive_services_scope`, while Foundry agents keep their provider-specific scope behavior.
+
+Related config.py version update: `VERSION = "0.241.007"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.008/PROFILE_FACT_MEMORY_DELETE_MODAL_STACKING_FIX.md b/docs/explanation/fixes/v0.241.008/PROFILE_FACT_MEMORY_DELETE_MODAL_STACKING_FIX.md
new file mode 100644
index 00000000..3bc5473d
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.008/PROFILE_FACT_MEMORY_DELETE_MODAL_STACKING_FIX.md
@@ -0,0 +1,52 @@
+# Profile Fact Memory Delete Modal Stacking Fix
+
+Fixed/Implemented in version: **0.241.008**
+
+## Issue Description
+
+The profile page fact-memory manager opens a delete-confirmation modal from inside the larger Manage Fact Memories modal.
+
+That confirm dialog could render behind the manager modal content, which made the destructive action difficult or impossible to click. The same profile template also used `display: none` style toggles for the text-to-speech preview controls instead of Bootstrap's `d-none` class pattern.
+
+## Root Cause Analysis
+
+`requestFactMemoryDelete()` and `openFactMemoryModal()` in `application/single_app/templates/profile.html` both relied on default Bootstrap modal instances without any stacked-modal coordination.
+
+Because `factMemoryDeleteModal` and `factMemoryManagerModal` shared the same default Bootstrap modal z-index behavior, the child confirmation modal could lose the stacking order battle against the already-open manager modal.
+
+Separately, the TTS preview controls in the same profile template hid and showed the stop button through `style.display` assignments, which diverged from the repo's Bootstrap visibility guidance.
+
+## Technical Details
+
+Files modified: `application/single_app/templates/profile.html`, `application/single_app/config.py`, `ui_tests/test_profile_fact_memory_editor.py`
+
+Code changes summary:
+
+- Added explicit stacked-modal classes and lifecycle handlers for the fact-memory delete confirmation modal so it renders above the manager modal while the manager remains visible behind it.
+- Switched fact-memory modal initialization to `bootstrap.Modal.getOrCreateInstance(...)`, moved the delete modal to the document body, and restored `modal-open` state when closing the child confirm over an open manager modal.
+- Added fail-closed status messaging if the delete confirmation modal is unavailable.
+- Replaced the profile TTS preview button visibility toggles with a shared helper that uses Bootstrap's `d-none` class instead of `style.display`.
+- Extended the existing profile UI regression to assert stacked z-index behavior, stacked backdrop classes, retained manager-modal visibility after delete, and the hidden TTS stop button class contract.
+
+Impact analysis:
+
+- Users can now reliably confirm fact-memory deletes from the profile modal workflow without the confirm dialog being hidden behind the parent modal.
+- The profile page now follows the repo's Bootstrap visibility pattern for the TTS preview controls.
+
+## Validation
+
+Test coverage: `ui_tests/test_profile_fact_memory_editor.py`
+
+Test results:
+
+- Validates that the profile page still supports create, edit, retag, and delete operations for fact memories.
+- Validates that the delete confirm dialog is stacked above the manager modal and that the stacked backdrop class is applied.
+- Validates that the manager modal remains open after a successful delete and that the page keeps `modal-open` state.
+- Validates that the hidden TTS stop button uses Bootstrap's `d-none` class when the TTS section is available in the environment.
+
+Before/after comparison:
+
+- Before: The delete confirmation dialog could appear behind the Manage Fact Memories modal, blocking clicks, and the TTS preview controls used `style.display` toggles.
+- After: The delete confirmation dialog explicitly stacks above the manager modal, and the TTS preview controls use Bootstrap `d-none` visibility toggles.
+
+Related config.py version update: `VERSION = "0.241.008"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.009/ENHANCED_CITATIONS_PDF_ERROR_LOGGING_FIX.md b/docs/explanation/fixes/v0.241.009/ENHANCED_CITATIONS_PDF_ERROR_LOGGING_FIX.md
new file mode 100644
index 00000000..5910931f
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.009/ENHANCED_CITATIONS_PDF_ERROR_LOGGING_FIX.md
@@ -0,0 +1,55 @@
+# Enhanced Citations PDF Error Logging Fix
+
+Fixed/Implemented in version: **0.241.009**
+
+## Issue Description
+
+Enhanced citation PDF requests could fail with a 500 response at `/api/enhanced_citations/pdf` even when the cited document still existed and the user had access to it.
+
+The failing response body showed `name 'get_document_blob_storage_info' is not defined`, and the backend console only emitted the request entry trace plus a generic helper call trace. The browser-side PDF modal also hid the backend JSON error because it relied on a direct iframe request to load the PDF.
+
+## Root Cause Analysis
+
+`get_blob_name()` in `application/single_app/route_enhanced_citations.py` called `get_document_blob_storage_info(raw_doc)` but the module only imported `get_document_metadata` from `functions_documents.py`.
+
+That left the PDF and shared blob-serving code paths vulnerable to a `NameError` before the blob lookup completed.
+
+The same route file also used `print(...)` in `serve_enhanced_citation_content()` and `serve_enhanced_citation_pdf_content()` instead of `log_event(...)`, so failures did not emit structured diagnostics with request and blob context.
+
+On the browser side, `showPdfModal()` in `application/single_app/static/js/chat/chat-enhanced-citations.js` assigned the backend URL directly to the iframe. That meant the JSON error body from a failed fetch never became visible to the toast workflow.
+
+## Technical Details
+
+Files modified: `application/single_app/route_enhanced_citations.py`, `application/single_app/static/js/chat/chat-enhanced-citations.js`, `application/single_app/config.py`, `functional_tests/test_enhanced_citations_csp_fix.py`, `functional_tests/test_enhanced_citations_pdf_error_logging_fix.py`, `ui_tests/test_enhanced_citations_pdf_error_toast.py`
+
+Code changes summary:
+
+- Added the missing `get_document_blob_storage_info` import to `route_enhanced_citations.py` so enhanced citations can resolve stored blob metadata before falling back to legacy blob paths.
+- Added tagged debug and error helpers around the enhanced citations blob-resolution and PDF-serving path using `log_event(...)`.
+- Replaced the `print(...)`-based exception handling in the shared blob-serving helpers with structured logging that includes document, container, blob-name, and PDF page context.
+- Updated `showPdfModal()` to fetch the PDF endpoint first, extract backend JSON error messages when present, and only then create a blob-backed iframe URL for successful PDF responses.
+- Preserved the text-citation fallback path so failed PDF previews still have a readable fallback.
+- Updated the existing CSP-focused regression and added new functional and UI regression coverage for the dependency fix and toast-based error reporting path.
+
+Impact analysis:
+
+- Enhanced citation PDFs now load without the missing-helper `NameError`.
+- Backend failures now emit tagged diagnostics that are visible in local debug output and structured logging sinks.
+- Users now see the backend PDF error message in the toast UI instead of only seeing a failed iframe GET in the browser console.
+
+## Validation
+
+Test coverage: `functional_tests/test_enhanced_citations_csp_fix.py`, `functional_tests/test_enhanced_citations_pdf_error_logging_fix.py`, `ui_tests/test_enhanced_citations_pdf_error_toast.py`
+
+Test results:
+
+- Validates that the enhanced citations route imports `get_document_blob_storage_info` and emits `[EnhancedCitations]` logging markers through `log_event`.
+- Validates that the PDF modal now fetches first, reads `X-Sub-PDF-Page`, creates a blob-backed iframe URL, and preserves the text fallback path.
+- Validates that a failing `/api/enhanced_citations/pdf` response surfaces the backend error message in a toast instead of showing the modal.
+
+Before/after comparison:
+
+- Before: `/api/enhanced_citations/pdf` could fail with `name 'get_document_blob_storage_info' is not defined`, the route used thin print-based exception logging, and the PDF modal hid the JSON error body behind a failed iframe request.
+- After: The route imports the helper correctly, emits structured diagnostics through `log_event`, and `showPdfModal` exposes backend PDF errors through a toast while still falling back to text citations.
+
+Related config.py version update: `VERSION = "0.241.009"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.010/ENHANCED_CITATIONS_PDF_BLOB_CSP_AND_TOAST_POSITION_FIX.md b/docs/explanation/fixes/v0.241.010/ENHANCED_CITATIONS_PDF_BLOB_CSP_AND_TOAST_POSITION_FIX.md
new file mode 100644
index 00000000..7b709449
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.010/ENHANCED_CITATIONS_PDF_BLOB_CSP_AND_TOAST_POSITION_FIX.md
@@ -0,0 +1,50 @@
+# Enhanced Citations PDF Blob CSP and Toast Position Fix
+
+Fixed/Implemented in version: **0.241.010**
+
+## Issue Description
+
+After moving enhanced citation PDF previews to a fetch-first blob-backed iframe flow, successful PDF responses still failed to render in the browser because the page-level Content Security Policy blocked `blob:` frame sources.
+
+At the same time, chat error toasts could render underneath the floating Chat Tutorial launcher because the chat page defined a top-right toast container in the same region as the tutorial button.
+
+## Root Cause Analysis
+
+The page CSP in `application/single_app/config.py` allowed `blob:` for images and media, but it did not explicitly allow `blob:` in `frame-src`. That caused the browser to fall back to `default-src 'self'` for the iframe navigation and reject the blob URL created by `showPdfModal()`.
+
+The chat template also used a duplicate `toast-container` ID while positioning its local chat toasts in the same top-right corner as the tutorial launcher. That made the toast target ambiguous and left no layout rule ensuring the toast stack stayed below the floating tutorial entry point.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `application/single_app/static/css/chats.css`, `application/single_app/static/js/chat/chat-toast.js`, `functional_tests/test_enhanced_citations_csp_fix.py`, `functional_tests/test_enhanced_citations_pdf_error_logging_fix.py`, `ui_tests/test_enhanced_citations_pdf_error_toast.py`
+
+Code changes summary:
+
+- Added `frame-src 'self' blob:` to the app-level Content Security Policy so blob-backed PDF iframes can render under the existing fetch-first enhanced citations workflow.
+- Replaced the chat page's duplicate `toast-container` ID with a dedicated `chat-toast-container` that declares anchor metadata for the tutorial launcher.
+- Updated `chat-toast.js` to prefer page-specific toast containers marked as preferred, fall back to the global base container elsewhere, and dynamically reposition anchored containers below their configured launch element.
+- Added a default chat toast offset and preserved the existing toast rendering behavior for non-chat pages.
+- Updated static and UI regressions to verify the blob CSP allowance, the anchored chat toast container wiring, and the on-screen toast position relative to the tutorial button.
+
+Impact analysis:
+
+- Enhanced citation PDFs now render successfully from blob URLs without regressing the fetch-first error handling path.
+- Chat toasts now stack beneath the tutorial launcher instead of appearing partially underneath it.
+- Other pages that rely on the shared toast helper continue to fall back to the global base toast container.
+
+## Validation
+
+Test coverage: `functional_tests/test_enhanced_citations_csp_fix.py`, `functional_tests/test_enhanced_citations_pdf_error_logging_fix.py`, `ui_tests/test_enhanced_citations_pdf_error_toast.py`
+
+Test results:
+
+- Validates that the page CSP includes `frame-src 'self' blob:` alongside the existing same-origin frame-ancestor rule.
+- Validates that chats use a dedicated anchored toast container and that the shared toast helper prefers and repositions it.
+- Validates that a failed enhanced citations PDF request still surfaces the backend error toast and that the toast container stays below the Chat Tutorial launcher.
+
+Before/after comparison:
+
+- Before: Blob-backed enhanced citations PDFs fetched successfully but the browser blocked the blob iframe render under page CSP, and chat toasts could overlap the floating tutorial button.
+- After: Blob-backed enhanced citations PDFs render under the page CSP, and chat toasts consistently appear below the tutorial launcher.
+
+Related config.py version update: `VERSION = "0.241.010"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.011/CHAT_SIDEBAR_COLLAPSE_CONTROL_FIX.md b/docs/explanation/fixes/v0.241.011/CHAT_SIDEBAR_COLLAPSE_CONTROL_FIX.md
new file mode 100644
index 00000000..f85b545c
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.011/CHAT_SIDEBAR_COLLAPSE_CONTROL_FIX.md
@@ -0,0 +1,52 @@
+# Chat Sidebar Collapse Control Fix
+
+Fixed/Implemented in version: **0.241.011**
+
+## Issue Description
+
+On mobile chat layouts, the left-navigation collapse control was effectively missing on initial load, which left users without an obvious way to dismiss the sidebar.
+
+On larger screens, the existing collapse button sat on top of the logo and app-title row, and the title was constrained with hard-coded truncation widths that made customized names look cramped or broken.
+
+## Root Cause Analysis
+
+The full sidebar template in `application/single_app/templates/_sidebar_nav.html` rendered the collapse button as an absolutely positioned icon button with the Bootstrap class `d-none d-sm-block`, which hid it below the `sm` breakpoint.
+
+The same template also injected inline title-truncation styles that capped the brand title at `140px` or `80px`, even while `application/single_app/static/css/sidebar.css` forced the brand text to render at `20px`. That created unnecessary overlap pressure in the header row.
+
+The chat-only short sidebar in `application/single_app/templates/_sidebar_short_nav.html` duplicated the collapse logic but did not render a matching primary toggle button, so chats using top navigation and the short sidebar variant were inconsistent with the full left-nav experience.
+
+## Technical Details
+
+Files modified: `application/single_app/templates/_sidebar_nav.html`, `application/single_app/templates/_sidebar_short_nav.html`, `application/single_app/static/css/sidebar.css`, `application/single_app/static/js/sidebar.js`, `application/single_app/config.py`, `ui_tests/test_chat_sidebar_toggle_controls.py`
+
+Code changes summary:
+
+- Moved the primary collapse control out of the full sidebar brand row and into a dedicated full-width control row underneath the logo/title area.
+- Added the same full-width collapse control to the short chat sidebar so both sidebar variants expose a consistent primary toggle.
+- Centralized the collapse and reopen behavior in `application/single_app/static/js/sidebar.js` and kept `window.toggleSidebar` available for existing integrations such as the chat tutorial.
+- Moved the shared collapse-state, floating reopen button, sidebar-header, and title-truncation styling into `application/single_app/static/css/sidebar.css`.
+- Added a UI regression that validates the control at both desktop and mobile viewport widths.
+
+Impact analysis:
+
+- Mobile users now see a clear collapse button on initial sidebar load instead of relying on a control that only appeared after collapse.
+- Long or branded application titles have more available header space and no longer compete with an overlaid top-right collapse icon.
+- Full sidebar and short chat sidebar modes now share one toggle implementation instead of carrying slightly different template-local behavior.
+
+## Validation
+
+Test coverage: `ui_tests/test_chat_sidebar_toggle_controls.py`
+
+Test results:
+
+- Validates that `#sidebar-toggle-btn` is visible when `/chats` loads at desktop and mobile viewport sizes.
+- Validates that toggling collapse adds the expected collapsed sidebar state and reveals `#floating-expand-btn`.
+- Validates that reopening the sidebar clears the collapsed body state without page or console errors.
+
+Before/after comparison:
+
+- Before: mobile chat users had no primary visible collapse control, and desktop brand rows could show a cramped title next to an overlaid icon button.
+- After: both responsive layouts expose a clear primary collapse control, and the full sidebar header separates branding from navigation controls.
+
+Related config.py version update: `VERSION = "0.241.011"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.012/WORKSPACE_MOBILE_RESPONSIVE_REFRESH_FIX.md b/docs/explanation/fixes/v0.241.012/WORKSPACE_MOBILE_RESPONSIVE_REFRESH_FIX.md
new file mode 100644
index 00000000..7bf0fb73
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.012/WORKSPACE_MOBILE_RESPONSIVE_REFRESH_FIX.md
@@ -0,0 +1,87 @@
+# WORKSPACE MOBILE RESPONSIVE REFRESH FIX
+
+Fixed in version: **0.241.012**
+
+## Overview
+
+This fix refreshes the mobile workspace experience without changing the desktop top-nav model.
+Version `0.241.012` in `application/single_app/config.py` is the configuration version that introduced these changes.
+
+## Issue Description
+
+Several workspace surfaces were difficult to use on smaller screens:
+
+- Top navigation in top-nav mode wrapped inside the fixed header instead of collapsing into a mobile-friendly control.
+- Workspace section tabs became cramped or disappeared in ways that made navigation unclear across top-nav and left-nav layouts.
+- Documents rendered as compressed tables that were hard to scan on phones.
+- Agents and actions defaulted to list/table views that worked on desktop but felt cramped on mobile.
+
+## Root Cause
+
+The existing navigation and workspace layouts relied on desktop-first inline tab and table structures:
+
+- The top nav had no dedicated mobile container or drawer pattern.
+- Workspace section changes depended on hidden Bootstrap tabs and left-nav links without a shared mobile switcher.
+- Document, prompt, agent, and action views were optimized for wide table layouts instead of stacked mobile summaries.
+
+## Technical Details
+
+### Files Modified
+
+- `application/single_app/templates/_top_nav.html`
+- `application/single_app/templates/base.html`
+- `application/single_app/static/css/navigation.css`
+- `application/single_app/static/js/navigation.js`
+- `application/single_app/templates/workspace.html`
+- `application/single_app/templates/group_workspaces.html`
+- `application/single_app/static/css/workspace-responsive.css`
+- `application/single_app/static/js/workspace_section_switcher.js`
+- `application/single_app/static/js/workspace_sidebar_nav.js`
+- `application/single_app/static/js/workspace/view-utils.js`
+- `application/single_app/static/js/workspace/workspace_agents.js`
+- `application/single_app/static/js/workspace/workspace_plugins.js`
+- `application/single_app/static/js/workspace/group_agents.js`
+- `application/single_app/static/js/workspace/group_plugins.js`
+- `application/single_app/static/js/workspace/workspace-documents.js`
+- `ui_tests/test_workspace_mobile_navigation_layout.py`
+- `application/single_app/config.py`
+
+### Code Changes Summary
+
+- Added a mobile offcanvas drawer for top-nav mode while keeping the desktop top-nav layout intact.
+- Moved workspace section navigation to a shared mobile/left-nav switcher backed by the same Bootstrap tab state used by existing page logic.
+- Added a shared responsive workspace stylesheet for personal and group workspaces.
+- Converted mobile document rendering from compressed rows into stacked card-style rows using responsive table transforms.
+- Made agent and action views prefer the existing grid/card renderer on mobile for both personal and group workspaces.
+- Synchronized left-nav workspace submenu state with top-tab changes so mobile and left-nav navigation stay aligned.
+
+## Testing Approach
+
+- Added a mobile UI regression in `ui_tests/test_workspace_mobile_navigation_layout.py`.
+- Validated changed JavaScript and CSS files with editor diagnostics.
+- Reviewed template diagnostics and confirmed the remaining warnings are pre-existing inline-style issues outside the scope of this fix.
+
+## Impact Analysis
+
+- Improves mobile navigation discoverability for workspace pages in top-nav mode.
+- Preserves desktop navigation patterns rather than replacing them with a mobile-first desktop regression.
+- Reduces horizontal compression in document, agent, action, and prompt surfaces on smaller screens.
+
+## Validation
+
+### Before
+
+- Mobile top-nav mode wrapped links inside the fixed header.
+- Workspace tabs were hard to use or hidden without a clear replacement.
+- Document and agent tables were difficult to read on phones.
+
+### After
+
+- Mobile top-nav mode uses a dedicated drawer with primary navigation links.
+- Workspace pages expose a clear section switcher on mobile and left-nav layouts.
+- Documents render in stacked mobile cards and agents/actions default to card/grid views on mobile.
+
+## Related Validation
+
+- UI regression: `ui_tests/test_workspace_mobile_navigation_layout.py`
+- Related earlier sidebar fix: `docs/explanation/fixes/v0.241.011/CHAT_SIDEBAR_COLLAPSE_CONTROL_FIX.md`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.013/WORKSPACE_LAYOUT_REFINEMENTS_FIX.md b/docs/explanation/fixes/v0.241.013/WORKSPACE_LAYOUT_REFINEMENTS_FIX.md
new file mode 100644
index 00000000..0b66688e
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.013/WORKSPACE_LAYOUT_REFINEMENTS_FIX.md
@@ -0,0 +1,47 @@
+# WORKSPACE LAYOUT REFINEMENTS FIX
+
+Fixed in version: **0.241.013**
+
+## Overview
+
+This refinement tightens several workspace navigation issues introduced during the broader mobile workspace refresh.
+Version `0.241.013` in `application/single_app/config.py` is the version associated with these updates.
+
+## Issue Description
+
+- Group workspace placed the section switcher too far above the selected pane, especially on narrow layouts.
+- Left-nav workspace menus omitted personal and group endpoint entries even when endpoint tabs were enabled.
+- Workspace tabs used a rounded pill-style edge that did not match the established workspace tab look.
+
+## Root Cause Analysis
+
+- The group workspace section switcher was attached to the page header instead of the tab area it controlled.
+- Sidebar workspace submenu items were added for documents, prompts, agents, and actions, but endpoint items were never added.
+- Shared responsive workspace CSS introduced a custom `border-radius` on nav tabs instead of preserving the flatter style already used in the app.
+
+## Technical Details
+
+### Files Modified
+
+- `application/single_app/templates/_sidebar_nav.html`
+- `application/single_app/templates/group_workspaces.html`
+- `application/single_app/static/css/workspace-responsive.css`
+- `application/single_app/config.py`
+- `ui_tests/test_workspace_sidebar_endpoint_links.py`
+
+### Code Changes Summary
+
+- Added `Your Endpoints` and `Group Endpoints` entries to the left-nav workspace submenus when the corresponding endpoint tabs are enabled.
+- Moved the group workspace section switcher below the shared group controls and immediately above the group tab area.
+- Restored square workspace tab corners by removing the pill-style border radius from the shared responsive workspace stylesheet.
+
+## Validation
+
+- Added UI regression coverage in `ui_tests/test_workspace_sidebar_endpoint_links.py` for square tab styling and endpoint sidebar entries.
+- Verified the changed CSS file with editor diagnostics.
+
+## Impact Analysis
+
+- Workspace section selection now feels visually connected to the pane it controls.
+- Endpoint management is reachable from left-nav layouts again.
+- Workspace tabs match the prior visual language instead of appearing as rounded pills.
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.014/WORKSPACE_DOCUMENT_CARDS_AND_HEALTHCHECK_SETTINGS_FIX.md b/docs/explanation/fixes/v0.241.014/WORKSPACE_DOCUMENT_CARDS_AND_HEALTHCHECK_SETTINGS_FIX.md
new file mode 100644
index 00000000..e8f4bada
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.014/WORKSPACE_DOCUMENT_CARDS_AND_HEALTHCHECK_SETTINGS_FIX.md
@@ -0,0 +1,61 @@
+# WORKSPACE DOCUMENT CARDS AND HEALTHCHECK SETTINGS FIX
+
+Fixed in version: **0.241.014**
+
+## Overview
+
+This update restores the default rounded workspace tabs on desktop, closes the remaining personal workspace switcher spacing issue, introduces a true document card view for personal and group workspaces, and adds admin wiring for the unauthenticated external healthcheck route.
+Version `0.241.014` in `application/single_app/config.py` is the version associated with these updates.
+
+## Issue Description
+
+- Desktop workspace tabs had drifted into an intentionally square treatment instead of the app's normal rounded tab shape.
+- Personal workspace still left a visible gap between the migration banner and the section switcher.
+- Documents only had a list view and a folder browser, but no action-oriented card view.
+- The unauthenticated `/external/healthcheckz` route existed without matching admin defaults, persistence, or UI controls.
+
+## Root Cause Analysis
+
+- Shared workspace CSS still carried a custom tab radius override from the previous refinement pass.
+- The personal section switcher remained attached to the header area rather than the document area it controlled.
+- Document rendering logic only supported table rows, so the new cards toggle needed cache-aware render paths and shared selection logic.
+- Admin settings only persisted the authenticated healthcheck setting and never exposed a separate setting for the no-auth route.
+
+## Technical Details
+
+### Files Modified
+
+- `application/single_app/functions_settings.py`
+- `application/single_app/route_frontend_admin_settings.py`
+- `application/single_app/templates/admin_settings.html`
+- `application/single_app/templates/workspace.html`
+- `application/single_app/templates/group_workspaces.html`
+- `application/single_app/static/js/workspace/workspace-tags.js`
+- `application/single_app/static/js/workspace/workspace-documents.js`
+- `application/single_app/static/css/workspace-responsive.css`
+- `application/single_app/config.py`
+- `functional_tests/test_no_auth_external_healthcheck_admin_setting.py`
+- `ui_tests/test_workspace_document_cards_layout.py`
+- `ui_tests/test_workspace_sidebar_endpoint_links.py`
+
+### Code Changes Summary
+
+- Removed the custom square tab override so desktop workspace tabs inherit the normal rounded Bootstrap shape again.
+- Moved the personal workspace section switcher below the migration banner and aligned it with the active pane controls.
+- Added a new Cards view alongside List and Folders for personal and group workspaces.
+- Rendered document cards with status badges, metadata pills, tag badges, quick actions, and selection-mode support.
+- Added default settings, admin persistence, and admin UI controls for `enable_no_auth_external_healthcheck` and `/external/healthcheckz`.
+
+## Validation
+
+- Added functional regression coverage in `functional_tests/test_no_auth_external_healthcheck_admin_setting.py`.
+- Added UI regression coverage in `ui_tests/test_workspace_document_cards_layout.py`.
+- Updated `ui_tests/test_workspace_sidebar_endpoint_links.py` to verify rounded desktop tabs instead of square tabs.
+- Verified the changed HTML, CSS, JavaScript, and Python files with editor diagnostics.
+
+## Impact Analysis
+
+- Workspace document browsing now has a denser, more actionable card presentation without removing the folder browser.
+- Personal workspace layout feels more coherent because the switcher now sits closer to the content it controls.
+- Administrators can independently enable authenticated and unauthenticated external health probes.
+- Desktop workspace tabs match the expected visual language again.
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.015/CONTROL_CENTER_ACTIVITY_LOGS_HARDENING_FIX.md b/docs/explanation/fixes/v0.241.015/CONTROL_CENTER_ACTIVITY_LOGS_HARDENING_FIX.md
new file mode 100644
index 00000000..efbcdd1d
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.015/CONTROL_CENTER_ACTIVITY_LOGS_HARDENING_FIX.md
@@ -0,0 +1,58 @@
+# Control Center Activity Logs Hardening Fix
+
+Fixed/Implemented in version: **0.241.015**
+
+## Issue Description
+
+The Control Center Activity Logs tab had two related problems.
+
+When the page width became narrower, the Activity Logs table relied on the generic table layout with no column contract, so the Details column could expand unpredictably and squeeze the other columns into unreadable widths.
+
+Separately, customers could hit 500 errors while paging activity logs or exporting them. The browser logs only showed failures from `/api/admin/control-center/activity-logs`, including an export path that requested `per_page=10000`, but they did not prove that the logs were empty or corrupted.
+
+## Root Cause Analysis
+
+The Activity Logs table in `application/single_app/templates/control_center.html` only used Bootstrap `table-responsive` with generic `.user-table` styling. It had no fixed table layout, no column width ratios, and no truncation wrappers for long user or details content.
+
+The backend route in `application/single_app/route_backend_control_center.py` returned raw Cosmos activity log documents directly through the interactive paging endpoint. It also reused that endpoint for export by fetching a `per_page=10000` JSON payload from `application/single_app/static/js/control-center.js`. That left three failure classes open:
+
+- Oversized interactive requests for export.
+- Generic 500 handling with very little diagnostic detail.
+- Page-specific failures if a historical activity log document shape was valid in Cosmos but not safe to serialize or consume as-is in the browser.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/route_backend_control_center.py`, `application/single_app/templates/control_center.html`, `application/single_app/static/js/control-center.js`, `functional_tests/test_control_center_activity_logs_hardening.py`, `ui_tests/test_control_center_activity_logs_layout.py`
+
+Code changes summary:
+
+- Added Activity Logs-specific pagination validation, query construction, response normalization, and structured diagnostics in `route_backend_control_center.py`.
+- Moved activity log export onto a dedicated `/api/admin/control-center/activity-logs/export` route so export no longer depends on the interactive paged JSON API or a `per_page=10000` fetch.
+- Normalized activity log records before returning them to the browser so heterogeneous historical log shapes can degrade safely instead of failing the entire page response.
+- Added Activity Logs-specific table layout rules in `control_center.html`, including a fixed table layout, explicit column widths, minimum table width, truncation wrappers, and hover styling.
+- Updated `control-center.js` to remove leftover debug console logging, show server-provided error messages, clear stale pagination UI on failure, and use the dedicated export endpoint.
+
+Impact analysis:
+
+- The Activity Logs table stays readable on smaller page widths while preserving horizontal scroll as a fallback.
+- Export requests no longer overload the interactive API path with a 10000-row JSON request.
+- Paging failures now have server-side diagnostics that can distinguish validation problems from backend exceptions.
+- A single unexpected activity log document shape is less likely to break page 2 while page 1 still works.
+
+## Validation
+
+Test coverage: `functional_tests/test_control_center_activity_logs_hardening.py`, `ui_tests/test_control_center_activity_logs_layout.py`
+
+Test results:
+
+- Validates that the backend exposes activity log pagination validation, shared query helpers, normalized response handling, and a dedicated export route.
+- Validates that the template includes Activity Logs-specific fixed-layout and truncation hooks.
+- Validates that the client uses the dedicated export route, removes the old `per_page=10000` export pattern, and clears stale pagination UI when loading fails.
+- Validates in the browser that the Activity Logs table uses the fixed layout, preserves overflow handling on a narrow viewport, keeps the raw-log modal path available, and issues export through the dedicated export endpoint.
+
+Before/after comparison:
+
+- Before: Narrower layouts could distort the Activity Logs columns, export reused the paged JSON endpoint with `per_page=10000`, and backend failures surfaced as generic 500s with limited diagnostic context.
+- After: The Activity Logs table has a stable responsive layout contract, export uses a dedicated backend CSV route, and the backend emits structured diagnostics while returning normalized log payloads.
+
+Related config.py version update: `VERSION = "0.241.015"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.018/CHAT_NAVIGATION_UNIFICATION_FIX.md b/docs/explanation/fixes/v0.241.018/CHAT_NAVIGATION_UNIFICATION_FIX.md
new file mode 100644
index 00000000..c3acacd8
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.018/CHAT_NAVIGATION_UNIFICATION_FIX.md
@@ -0,0 +1,53 @@
+# Chat Navigation Unification Fix
+
+Fixed/Implemented in version: **0.241.018**
+
+## Issue Description
+
+The chats page had overlapping navigation systems that broke down across desktop and mobile layouts.
+
+In top-nav mode, chats rendered the global top navigation, a chat-specific short sidebar, a hamburger drawer nested inside the navbar, and a floating reopen control. Those layers competed for space and z-index, which caused the mobile drawer content to bleed into desktop layouts, the hamburger and profile menu to interfere with each other, and the floating reopen control to feel disconnected from the chat shell.
+
+## Root Cause Analysis
+
+The shell composition in `application/single_app/templates/base.html` treated chats as a special case by including both `application/single_app/templates/_top_nav.html` and `application/single_app/templates/_sidebar_short_nav.html` at the same time.
+
+At the same time, the mobile drawer markup lived inside the `.navbar-expand-lg` structure in `application/single_app/templates/_top_nav.html`. Bootstrap applies responsive `.navbar-expand-lg .offcanvas` rules that convert nested offcanvas content into visible static content at desktop widths, which is why mobile drawer content could appear in the desktop header.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/base.html`, `application/single_app/templates/_top_nav.html`, `application/single_app/templates/_sidebar_short_nav.html`, `application/single_app/templates/chats.html`, `application/single_app/static/css/chats.css`, `application/single_app/static/css/sidebar.css`, `application/single_app/static/js/navigation.js`, `application/single_app/static/js/sidebar.js`, `functional_tests/test_chat_navigation_unified_shell.py`, `ui_tests/test_chat_sidebar_toggle_controls.py`
+
+Code changes summary:
+
+- Added chat-specific shell body classes in `base.html` and limited `sidebar-padding` to non-sidebar layouts and desktop widths.
+- Moved the standard top-nav mobile drawer out of the navbar DOM in `_top_nav.html` so Bootstrap no longer leaks drawer content into desktop layouts.
+- Changed the chats top-nav hamburger to target the chat rail instead of the standard top-nav drawer.
+- Converted `_sidebar_short_nav.html` into the adaptive chat rail by adding offcanvas behavior for mobile, a dedicated mobile header, and a static footer layout instead of the old absolutely positioned footer.
+- Removed the floating reopen control from the short chat rail and added an inline desktop toggle in the chat header inside `chats.html`.
+- Added overlay coordination in `navigation.js` so opening the profile dropdown closes any open navigation drawer and opening a drawer closes open dropdown menus.
+- Added mobile drawer dismissal behavior in `sidebar.js` for chat rail navigation actions.
+
+Impact analysis:
+
+- Desktop chat now uses one docked navigation rail instead of a mixed header-plus-drawer-plus-floating-button arrangement.
+- Mobile chat now uses the same rail as the hamburger drawer, so navigation behavior is consistent across breakpoints.
+- The top-nav profile menu and mobile drawer no longer share the same broken structural container.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_navigation_unified_shell.py`, `ui_tests/test_chat_sidebar_toggle_controls.py`
+
+Test results:
+
+- Validates the base template emits the new chat shell classes and desktop-only sidebar padding behavior.
+- Validates the top-nav hamburger routes to the chat rail on chats and that the old top-nav drawer stays out of the chat shell.
+- Validates the short chat rail uses the adaptive offcanvas pattern and exposes the inline desktop toggle.
+- Validates in the browser that desktop chat uses the inline reopen path and mobile chat uses the chat rail drawer while coordinating correctly with the profile dropdown.
+
+Before/after comparison:
+
+- Before: The chats page mixed multiple navigation surfaces, and the mobile drawer markup could leak into desktop layouts because it was nested inside the responsive navbar.
+- After: Chats use a single adaptive rail that docks on desktop and becomes the hamburger drawer on mobile, with a smaller inline desktop toggle replacing the disconnected floating reopen control.
+
+Related config.py version update: `VERSION = "0.241.018"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.019/CHAT_MOBILE_TOOLBAR_COMPACTION_FIX.md b/docs/explanation/fixes/v0.241.019/CHAT_MOBILE_TOOLBAR_COMPACTION_FIX.md
new file mode 100644
index 00000000..8e7f8668
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.019/CHAT_MOBILE_TOOLBAR_COMPACTION_FIX.md
@@ -0,0 +1,51 @@
+# Chat Mobile Toolbar Compaction Fix
+
+Fixed/Implemented in version: **0.241.019**
+
+## Issue Description
+
+The chats page still felt like a desktop toolbar compressed into a phone-sized column even after the navigation shell was unified.
+
+On smaller screens, action buttons, selectors, and toggle controls competed for the same horizontal space. That forced the toolbar to wrap into multiple dense rows and made prompt or agent controls feel disconnected from the primary message composer.
+
+## Root Cause Analysis
+
+The mobile chat composer reused the same flat toolbar grouping as desktop in `application/single_app/templates/chats.html`.
+
+That layout worked for wide viewports, but it kept too many controls visible at the same time on mobile. The prompt, agent, model, reasoning, and TTS controls all lived in the same visual layer, with no progressive disclosure for lower-frequency actions.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `application/single_app/static/css/chats.css`, `application/single_app/static/js/chat/chat-conversation-info-button.js`, `application/single_app/static/js/chat/chat-mobile-toolbar.js`, `functional_tests/test_chat_toolbar_layout.py`, `functional_tests/test_chat_navigation_unified_shell.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Reshaped the chats toolbar into a mobile quick-action rail plus a secondary tools panel in `chats.html` while preserving the existing button and selector IDs used by chat modules.
+- Kept the model selector as the primary always-available control and moved prompt, agent, reasoning, and TTS controls into a collapsible mobile tools region.
+- Added responsive toolbar styling in `chats.css` so mobile actions scroll horizontally instead of wrapping into a dense stack.
+- Added `chat-mobile-toolbar.js` to automatically expand the mobile tools panel when prompt or agent selectors become visible.
+- Switched the conversation info button visibility handling to Bootstrap-friendly `d-none` class toggling.
+
+Impact analysis:
+
+- Mobile chat now exposes the most common actions without forcing the full selector stack into view.
+- Secondary controls remain available but no longer dominate the initial composer layout.
+- Prompt and agent flows still reveal their selectors automatically, so the new compaction does not hide active controls behind a closed panel.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_toolbar_layout.py`, `functional_tests/test_chat_navigation_unified_shell.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- Validates the template exposes the quick-action rail, primary model selector wrapper, and collapsible mobile tools panel.
+- Validates the responsive CSS enables horizontal action scrolling and stacked secondary controls at mobile breakpoints.
+- Validates the mobile toolbar coordination script expands the tools panel when prompt or agent selectors are activated.
+- Validates in the browser that the mobile tools panel starts collapsed, opens on demand, and auto-reveals when prompt controls are activated.
+
+Before/after comparison:
+
+- Before: Mobile chat reused the full desktop toolbar with wrapping controls and no progressive disclosure.
+- After: Mobile chat presents a compact quick-action rail, keeps the model selector prominent, and reveals the remaining controls through an explicit tools panel.
+
+Related config.py version update: `VERSION = "0.241.019"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.022/CHAT_NAVIGATION_AND_GROUNDED_SEARCH_DRAWER_FIX.md b/docs/explanation/fixes/v0.241.022/CHAT_NAVIGATION_AND_GROUNDED_SEARCH_DRAWER_FIX.md
new file mode 100644
index 00000000..be6a6ee1
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.022/CHAT_NAVIGATION_AND_GROUNDED_SEARCH_DRAWER_FIX.md
@@ -0,0 +1,59 @@
+# Chat Navigation And Grounded Search Drawer Fix
+
+Fixed/Implemented in version: **0.241.022**
+
+## Issue Description
+
+The chat shell still had two visible problems after the earlier navigation unification work.
+
+On mobile, the chat navigation drawer could crash when the user clicked the close button in the drawer header. The browser surfaced a Bootstrap error about reading `backdrop` from an undefined object.
+
+On desktop, users in top-nav mode could land on chats with no obvious header navigation, because the desktop top-nav link surface had been removed while the mobile hamburger remained mobile-only.
+
+The grounded-search panel also still behaved like an inline desktop filter row on phones. It consumed too much vertical space and did not match the drawer-first mobile interaction model already used elsewhere in the chat shell.
+
+## Root Cause Analysis
+
+The mobile chat rail offcanvas in `application/single_app/templates/_sidebar_short_nav.html` was being initialized through both `application/single_app/static/js/navigation.js` and `application/single_app/static/js/sidebar.js`. That duplicate ownership corrupted the Bootstrap offcanvas lifecycle and could break close-button dismissal on mobile.
+
+Separately, `application/single_app/templates/_top_nav.html` explicitly removed the desktop primary navigation when `request.endpoint == 'chats'`, which left top-nav users without a visible desktop navigation surface on the chats page.
+
+The grounded-search panel in `application/single_app/templates/chats.html` still used the same inline container for every viewport, while several JS paths in `application/single_app/static/js/chat/chat-documents.js` and `application/single_app/static/js/chat/chat-onload.js` opened it with direct `style.display = 'block'` writes. That made it difficult to present the same surface as a drawer on mobile.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/static/js/sidebar.js`, `application/single_app/templates/_top_nav.html`, `application/single_app/static/css/navigation.css`, `application/single_app/templates/chats.html`, `application/single_app/static/js/chat/chat-documents.js`, `application/single_app/static/js/chat/chat-onload.js`, `application/single_app/static/css/chats.css`, `functional_tests/test_chat_navigation_unified_shell.py`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_sidebar_toggle_controls.py`, `ui_tests/test_chat_search_panel_mobile_drawer.py`
+
+Code changes summary:
+
+- Stopped `sidebar.js` from creating a second Bootstrap offcanvas instance for the chat rail and changed it to dismiss only the existing instance created through Bootstrap’s normal lifecycle.
+- Restored desktop top-nav links on chats by rendering the desktop nav surface for chat pages again and adding compact chat-specific header styling.
+- Converted the grounded-search surface into a shared inline desktop and `offcanvas-end` mobile container in `chats.html`.
+- Added `showSearchDocumentsPanel()` and `hideSearchDocumentsPanel()` helpers in `chat-documents.js` so toolbar clicks, URL-parameter flows, and feature launches all open the same search surface consistently.
+- Updated the mobile onload flows in `chat-onload.js` to stop bypassing the new shared search-panel open logic.
+- Added responsive search-panel styling in `chats.css` so the grounded-search controls remain inline on desktop but open as an end-side drawer on mobile.
+
+Impact analysis:
+
+- Mobile chat drawer close-button interactions no longer depend on duplicate Bootstrap offcanvas ownership.
+- Desktop top-nav users regain a visible chat header navigation surface without bringing back the old nested top-nav drawer behavior.
+- Grounded search now follows the same mobile drawer interaction model as the rest of the chat shell, while preserving the existing selector IDs and desktop inline workflow.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_navigation_unified_shell.py`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_sidebar_toggle_controls.py`, `ui_tests/test_chat_search_panel_mobile_drawer.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_navigation_unified_shell.py`: passed `4/4` checks.
+- `functional_tests/test_chat_searchable_selectors.py`: passed `8/8` checks.
+- `ui_tests/test_chat_sidebar_toggle_controls.py`: skipped in the current environment because the authenticated UI state was not available.
+- `ui_tests/test_chat_search_panel_mobile_drawer.py`: skipped in the current environment because the authenticated UI state was not available.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: skipped in the current environment because the authenticated UI state was not available.
+
+Before/after comparison:
+
+- Before: The mobile chat drawer could crash on close, desktop top-nav chat had no clear header navigation, and the grounded-search panel stayed inline on mobile.
+- After: The chat rail uses a single Bootstrap offcanvas lifecycle, desktop chat restores compact header navigation for top-nav users, and grounded search opens as a mobile end-side drawer while staying inline on desktop.
+
+Related config.py version update: `VERSION = "0.241.022"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.023/CHAT_SHELL_MOBILE_DRAWER_AND_TOOLS_SHEET_FIX.md b/docs/explanation/fixes/v0.241.023/CHAT_SHELL_MOBILE_DRAWER_AND_TOOLS_SHEET_FIX.md
new file mode 100644
index 00000000..98976210
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.023/CHAT_SHELL_MOBILE_DRAWER_AND_TOOLS_SHEET_FIX.md
@@ -0,0 +1,62 @@
+# Chat Shell Mobile Drawer And Tools Sheet Fix
+
+Fixed/Implemented in version: **0.241.023**
+
+## Issue Description
+
+The chat shell still had a final cluster of responsive issues after the earlier navigation unification work.
+
+Desktop top-nav pages could still render content slightly underneath the fixed header because different parts of the shell were using different header heights.
+
+On mobile, the chat drawer could open underneath the fixed header, which clipped the drawer header and made the surface feel broken.
+
+The chat drawer also did not expose the workspace and global navigation routes that top-nav users needed, which forced users to bounce through Home just to reach Personal, Groups, or Public pages.
+
+Finally, the mobile chat toolbar still rendered a cramped inline strip of low-frequency action buttons and relied on a collapse panel instead of a drawer-first mobile interaction model.
+
+## Root Cause Analysis
+
+The top navigation height contract was inconsistent across `application/single_app/static/css/navigation.css`, `application/single_app/static/css/sidebar.css`, and inline shell rules in `application/single_app/templates/base.html`. Some paths still padded for `56px`, while others positioned fixed chat surfaces using `66px` and `98px` offsets.
+
+The mobile chat rail in `application/single_app/templates/_sidebar_short_nav.html` focused on conversations and support actions, but it did not reuse the workspace and external-link navigation content already present in `application/single_app/templates/_top_nav.html`.
+
+The mobile chat toolbar in `application/single_app/templates/chats.html` still treated the low-frequency action buttons as an inline horizontal rail and used a `collapse`-based secondary panel. That was the wrong abstraction for small screens, because it expanded within the page flow instead of behaving like a bounded sheet above the selector row.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/static/css/navigation.css`, `application/single_app/static/css/sidebar.css`, `application/single_app/static/css/chats.css`, `application/single_app/templates/base.html`, `application/single_app/templates/_sidebar_short_nav.html`, `application/single_app/templates/chats.html`, `application/single_app/static/js/navigation.js`, `application/single_app/static/js/sidebar.js`, `application/single_app/static/js/chat/chat-mobile-toolbar.js`, `functional_tests/test_chat_navigation_unified_shell.py`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_sidebar_toggle_controls.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Normalized the top-nav height to `66px` in `navigation.css` and reused that shared variable for drawer and rail offsets instead of keeping multiple hardcoded header heights.
+- Offset the standard mobile top-nav drawer and the mobile chat rail below the fixed header so their headers are fully visible when opened.
+- Added a mobile-only workspace and external-links section to the chat drawer in `_sidebar_short_nav.html` so top-nav chat users can navigate directly to Personal, Groups, Public, Chat, and external destinations from the drawer.
+- Kept the chat rail out of the generic offcanvas initializer in `navigation.js` so the chat drawer retains a single Bootstrap ownership path.
+- Reworked the chat toolbar in `chats.html` so the `Tools` trigger sits alongside the selector row on mobile while the low-frequency actions now live inside an `offcanvas-top` tools sheet.
+- Replaced the old collapse-based mobile toolbar logic in `chat-mobile-toolbar.js` with offcanvas-based state management and dismiss-on-action behavior for the mobile tools sheet.
+- Updated responsive toolbar styling in `chats.css` so the mobile tools sheet presents action buttons in a readable grid while desktop continues to render the same controls inline.
+
+Impact analysis:
+
+- Desktop top-nav pages and chat shells now share a consistent fixed-header spacing contract.
+- Mobile chat and top-nav drawers open below the header instead of clipping behind it.
+- Mobile top-nav chat users regain direct workspace and global navigation without leaving the chat shell.
+- The chat toolbar no longer compresses low-frequency actions into a narrow inline strip on mobile.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_navigation_unified_shell.py`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_sidebar_toggle_controls.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_navigation_unified_shell.py`: passed `4/4` checks.
+- `functional_tests/test_chat_searchable_selectors.py`: passed `8/8` checks.
+- `ui_tests/test_chat_sidebar_toggle_controls.py`: updated for the new mobile drawer content and offset behavior.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: updated for the mobile tools-sheet behavior.
+
+Before/after comparison:
+
+- Before: Header offsets were inconsistent, the mobile chat drawer clipped behind the fixed header, the mobile chat drawer omitted workspace navigation, and mobile toolbar actions stayed inline.
+- After: Header offsets are shared, mobile drawers open below the header, the chat drawer exposes workspace routes directly, and the low-frequency mobile chat actions open in a dedicated tools sheet.
+
+Related config.py version update: `VERSION = "0.241.023"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.024/CHAT_TOOLBAR_DESKTOP_MOBILE_PARITY_FIX.md b/docs/explanation/fixes/v0.241.024/CHAT_TOOLBAR_DESKTOP_MOBILE_PARITY_FIX.md
new file mode 100644
index 00000000..d82563e0
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.024/CHAT_TOOLBAR_DESKTOP_MOBILE_PARITY_FIX.md
@@ -0,0 +1,54 @@
+# Chat Toolbar Desktop Mobile Parity Fix
+
+Fixed/Implemented in version: **0.241.024**
+
+## Issue Description
+
+The previous chat toolbar change still treated desktop and mobile as the same layout surface.
+
+That caused desktop tool buttons to be grouped and repositioned in ways that did not match the intended inline toolbar, while mobile prompts and agents still behaved inconsistently with the new drawer-based interaction model.
+
+The mobile tools drawer itself also rendered the action buttons in a cramped presentation that made the surface feel unfinished.
+
+## Root Cause Analysis
+
+`application/single_app/templates/chats.html` still used a single toolbar surface for both the desktop rail and the mobile tools drawer.
+
+`application/single_app/static/css/chats.css` then had to style that same surface for conflicting breakpoint behaviors, which leaked mobile drawer structure back into desktop layout.
+
+`application/single_app/static/js/chat/chat-mobile-toolbar.js` only managed offcanvas open and close state. It did not relocate the shared toolbar controls by breakpoint, so prompt and agent selectors could still appear outside the mobile drawer flow.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `application/single_app/static/css/chats.css`, `application/single_app/static/js/chat/chat-mobile-toolbar.js`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Split the chat toolbar into explicit desktop and mobile destinations in `chats.html` instead of keeping a shared inline and offcanvas container.
+- Restored a stable desktop tools rail on the left side of the toolbar.
+- Converted the mobile tools surface to an `offcanvas-bottom` drawer so it slides upward from the bottom instead of dropping from the top.
+- Added dedicated mobile selector slots so prompt and agent selectors stay inside the mobile drawer rather than reopening inline.
+- Updated `chat-mobile-toolbar.js` to move the shared toolbar surfaces between desktop and mobile slots at the `lg` breakpoint and to keep prompt and agent interactions inside the mobile drawer.
+- Reworked the mobile drawer styling in `chats.css` so action buttons render as readable full-width controls instead of compressed icon pills.
+
+Impact analysis:
+
+- Desktop chat no longer inherits the mobile drawer grouping behavior.
+- Mobile tools now open from the bottom in a format that is visually closer to the composer-driven chat flow.
+- Prompt and agent selection now follow the same mobile drawer interaction instead of mixing drawer and inline patterns.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_searchable_selectors.py`: updated to validate the split desktop/mobile toolbar contract.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: updated to validate that the prompt selector stays inside the mobile drawer.
+
+Before/after comparison:
+
+- Before: Desktop inherited the mobile drawer grouping, the tools sheet opened from the top, and mobile prompt selection escaped back into the inline toolbar row.
+- After: Desktop keeps a fixed inline tool rail, the mobile tools drawer opens upward from the bottom, and mobile prompt or agent selection stays within the drawer.
+
+Related config.py version update: `VERSION = "0.241.024"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.025/CHAT_MOBILE_TOOLBAR_SELECTOR_REVEAL_AND_CLOSE_FIX.md b/docs/explanation/fixes/v0.241.025/CHAT_MOBILE_TOOLBAR_SELECTOR_REVEAL_AND_CLOSE_FIX.md
new file mode 100644
index 00000000..bab5ad78
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.025/CHAT_MOBILE_TOOLBAR_SELECTOR_REVEAL_AND_CLOSE_FIX.md
@@ -0,0 +1,54 @@
+# Chat Mobile Toolbar Selector Reveal And Close Fix
+
+Fixed/Implemented in version: **0.241.025**
+
+## Issue Description
+
+The mobile chat tools drawer still had three usability defects after the desktop and mobile toolbar split.
+
+Unselected toolbar buttons could render without visible text inside the mobile drawer, prompt and agent activation could leave the actual selector controls below the fold, and the drawer close button could still trigger a Bootstrap offcanvas error even though tapping outside the drawer worked.
+
+## Root Cause Analysis
+
+The mobile drawer reused button classes that were originally designed for the desktop compact pill behavior.
+
+Those desktop rules hid label text by default using `opacity: 0` and `width: 0`, which meant the mobile drawer could still inherit invisible labels even after forcing the label spans to display.
+
+The prompt and agent selector containers were already moved into the mobile drawer, but the activation flow in `application/single_app/static/js/chat/chat-prompts.js` and `application/single_app/static/js/chat/chat-agents.js` did not tell the drawer to reveal or focus those selectors.
+
+The drawer close button in `application/single_app/templates/chats.html` still relied on Bootstrap's declarative `data-bs-dismiss="offcanvas"` path, which continued to produce the `backdrop` lifecycle error in this specific mobile tools drawer path.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `application/single_app/static/js/chat/chat-mobile-toolbar.js`, `application/single_app/static/js/chat/chat-prompts.js`, `application/single_app/static/js/chat/chat-agents.js`, `application/single_app/static/css/chats.css`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Replaced the mobile tools drawer header close button with an explicit JavaScript close path instead of Bootstrap's `data-bs-dismiss` data API.
+- Added a mobile-toolbar helper that closes open prompt and agent dropdowns before hiding the drawer.
+- Added a mobile-toolbar reveal helper that scrolls the active selector into view and opens the prompt or agent dropdown after activation.
+- Updated the prompt and agent activation handlers to dispatch a shared mobile selector activation event.
+- Added mobile-specific toolbar rules so unselected button labels remain visible inside the drawer while desktop buttons keep their compact hidden-label behavior.
+
+Impact analysis:
+
+- Mobile users can see button labels before selection.
+- Prompt and agent activation now leads directly to the relevant chooser instead of forcing users to hunt for it lower in the drawer.
+- The mobile drawer close button now uses the same stable programmatic offcanvas hide path that already worked when dismissing the drawer externally.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_searchable_selectors.py`: passed `9/9` checks after adding assertions for safe close wiring and selector reveal behavior.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: updated to verify the dedicated mobile close button and prompt dropdown reveal behavior.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: skipped in the current environment because `SIMPLECHAT_UI_BASE_URL` and authenticated UI state are not configured.
+
+Before/after comparison:
+
+- Before: Mobile button labels could disappear, prompt and agent toggles did not reliably reveal their selectors, and the drawer X could still throw a Bootstrap `backdrop` error.
+- After: Mobile button labels remain readable, prompt and agent toggles scroll and open their selector controls inside the drawer, and the drawer X uses a stable programmatic close path.
+
+Related config.py version update: `VERSION = "0.241.025"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.026/CHAT_MOBILE_TOOLBAR_LABEL_VISIBILITY_FIX.md b/docs/explanation/fixes/v0.241.026/CHAT_MOBILE_TOOLBAR_LABEL_VISIBILITY_FIX.md
new file mode 100644
index 00000000..8a4479f3
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.026/CHAT_MOBILE_TOOLBAR_LABEL_VISIBILITY_FIX.md
@@ -0,0 +1,45 @@
+# Chat Mobile Toolbar Label Visibility Fix
+
+Fixed/Implemented in version: **0.241.026**
+
+## Issue Description
+
+The mobile chat tools drawer still showed wide buttons with only icons when the buttons were not active.
+
+That left large amounts of dead space in each row and made the drawer feel unfinished even though the layout and close behavior were already working.
+
+## Root Cause Analysis
+
+The toolbar button labels in `application/single_app/templates/chats.html` still included the Bootstrap utility classes `d-none d-md-inline`.
+
+Those classes were originally added for the compact desktop toolbar behavior, but once the same buttons were moved into the mobile drawer they created a markup-level hidden state that conflicted with the mobile-specific CSS rules.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `functional_tests/test_chat_searchable_selectors.py`
+
+Code changes summary:
+
+- Removed `d-none d-md-inline` from the chat tools button labels so visibility is controlled by the toolbar CSS instead of hardcoded Bootstrap utility classes.
+- Added a regression assertion to ensure the hidden desktop utility classes do not return to the shared toolbar labels.
+- Bumped the application version to `0.241.026`.
+
+Impact analysis:
+
+- Mobile users now see readable labels for inactive drawer buttons instead of empty horizontal space.
+- Desktop still keeps its compact inactive button behavior because that visibility is controlled by the existing toolbar CSS, not the removed Bootstrap utility classes.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_searchable_selectors.py`
+
+Test results:
+
+- `functional_tests/test_chat_searchable_selectors.py`: passed `9/9` checks after adding the label visibility regression assertion.
+
+Before/after comparison:
+
+- Before: Inactive mobile drawer buttons could render as icon-only rows with large empty space.
+- After: Inactive mobile drawer buttons show their labels normally while desktop still hides inactive labels.
+
+Related config.py version update: `VERSION = "0.241.026"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.027/CHAT_MOBILE_SELECTOR_OWNERSHIP_AND_LABEL_VISIBILITY_FIX.md b/docs/explanation/fixes/v0.241.027/CHAT_MOBILE_SELECTOR_OWNERSHIP_AND_LABEL_VISIBILITY_FIX.md
new file mode 100644
index 00000000..b013c16c
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.027/CHAT_MOBILE_SELECTOR_OWNERSHIP_AND_LABEL_VISIBILITY_FIX.md
@@ -0,0 +1,52 @@
+# Chat Mobile Selector Ownership And Label Visibility Fix
+
+Fixed/Implemented in version: **0.241.027**
+
+## Issue Description
+
+The chat toolbar still had one mobile inconsistency after the earlier drawer fixes.
+
+The model selector remained on the main page while the prompt and agent selectors lived inside the mobile drawer, which created two competing selector locations on small screens.
+
+At the same time, inactive mobile drawer buttons could still render with missing labels because the compact desktop pill styles were continuing to collapse the text.
+
+## Root Cause Analysis
+
+`application/single_app/static/js/chat/chat-mobile-toolbar.js` only moved the prompt and agent selector surface into the drawer on mobile. The model selector stayed in its desktop wrapper, so mobile users had split selector ownership between the page and the drawer.
+
+`application/single_app/static/css/chats.css` already contained a mobile label override, but the later base `.search-btn .search-btn-text` and `.file-btn .file-btn-text` rules still applied `opacity: 0` and `width: 0`, which could override the earlier mobile intent.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `application/single_app/static/js/chat/chat-mobile-toolbar.js`, `application/single_app/static/css/chats.css`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Added dedicated desktop and mobile slots for the model selector in `chats.html`.
+- Updated `chat-mobile-toolbar.js` to move the model selector into the mobile drawer at small breakpoints and restore it to the desktop slot at larger breakpoints.
+- Added a later mobile-only label visibility override in `chats.css` so the base compact button rules cannot collapse text inside the mobile drawer.
+- Simplified the mobile toolbar control row because selector ownership now lives entirely inside the drawer.
+- Updated source and UI regressions to validate mobile selector ownership and label visibility expectations.
+
+Impact analysis:
+
+- Mobile users now see model, prompt, and agent selection in one consistent location.
+- Mobile tool buttons keep their labels visible while inactive.
+- Desktop retains the existing inline model selector and compact inactive button behavior.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_searchable_selectors.py`: passed `9/9` checks after updating the selector ownership and label visibility assertions.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: updated to assert the model selector appears inside the mobile drawer.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: skipped in the current environment because `SIMPLECHAT_UI_BASE_URL` and authenticated UI state are not configured.
+
+Before/after comparison:
+
+- Before: The model selector stayed on the mobile page while prompt and agent selection moved into the drawer, and inactive mobile tool buttons could still appear as icon-only rows.
+- After: All toolbar selectors live in the drawer on mobile, and inactive mobile tool buttons display readable labels.
+
+Related config.py version update: `VERSION = "0.241.027"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.028/CHAT_MODEL_AGENT_SHARED_PRIMARY_SELECTOR_FIX.md b/docs/explanation/fixes/v0.241.028/CHAT_MODEL_AGENT_SHARED_PRIMARY_SELECTOR_FIX.md
new file mode 100644
index 00000000..0f41c9d6
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.028/CHAT_MODEL_AGENT_SHARED_PRIMARY_SELECTOR_FIX.md
@@ -0,0 +1,49 @@
+# Chat Model Agent Shared Primary Selector Fix
+
+Fixed/Implemented in version: **0.241.028**
+
+## Issue Description
+
+The chat toolbar still had one selector-placement inconsistency.
+
+When agents were enabled, the model selector occupied the primary selector space while the agent selector appeared below prompts in the secondary selector area. That created an unnecessary layout jump and made the toolbar feel inconsistent across both desktop and mobile.
+
+## Root Cause Analysis
+
+`application/single_app/templates/chats.html` rendered the model selector inside the primary selector slot, but rendered the agent selector inside the secondary selector surface with prompts.
+
+`application/single_app/static/js/chat/chat-mobile-toolbar.js` then moved the model selector and the secondary selector surface independently between desktop and mobile, which preserved that mismatch instead of normalizing it.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `application/single_app/static/js/chat/chat-mobile-toolbar.js`, `application/single_app/static/css/chats.css`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Added a shared primary selector surface in `chats.html` that now contains both the model selector and the agent selector.
+- Left prompts in the secondary selector surface so they remain a separate optional filter rather than competing with model or agent selection.
+- Updated `chat-mobile-toolbar.js` to move the shared primary selector surface between desktop and mobile instead of moving only the model selector.
+- Added CSS for the shared primary surface so both selectors use the same slot sizing rules.
+- Updated the source and UI regressions to validate the shared primary selector contract.
+
+Impact analysis:
+
+- Enabling agents now swaps the primary selector space from model to agent instead of adding a second selector below prompts.
+- Desktop and mobile now use the same selector hierarchy: primary slot for model or agent, secondary slot for prompts.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_searchable_selectors.py`: passed `9/9` checks after updating the shared primary selector contract.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: updated to version `0.241.028` and continues to validate mobile drawer ownership.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: skipped in the current environment because `SIMPLECHAT_UI_BASE_URL` and authenticated UI state are not configured.
+
+Before/after comparison:
+
+- Before: Model selection used the primary slot while agent selection appeared below prompts in the secondary area.
+- After: Model and agent selection share the same primary slot, with prompts remaining below as a secondary selector.
+
+Related config.py version update: `VERSION = "0.241.028"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.029/CHAT_FLOATING_SEARCH_DROPDOWN_FIX.md b/docs/explanation/fixes/v0.241.029/CHAT_FLOATING_SEARCH_DROPDOWN_FIX.md
new file mode 100644
index 00000000..8232cfa9
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.029/CHAT_FLOATING_SEARCH_DROPDOWN_FIX.md
@@ -0,0 +1,52 @@
+# Chat Floating Search Dropdown Fix
+
+Fixed/Implemented in version: **0.241.029**
+
+## Issue Description
+
+Two mobile dropdown behaviors in chat were still inconsistent.
+
+`Scope` and `Tags` in the grounded-search panel could render clipped behind surrounding UI, while `Documents` opened correctly. Separately, the model and agent selectors inside the mobile tools drawer rendered as if they were trapped inside the drawer instead of floating above it.
+
+## Root Cause Analysis
+
+`application/single_app/static/js/chat/chat-documents.js` initialized `Documents` with a viewport-bound Bootstrap dropdown using fixed positioning, but `Scope` and `Tags` were still using the default dropdown behavior.
+
+`application/single_app/static/js/chat/chat-searchable-select.js` also hard-coded the default Bootstrap dropdown configuration for searchable single-select controls, so model and agent selectors had no way to opt into the same fixed, viewport-safe positioning.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/static/js/chat/chat-documents.js`, `application/single_app/static/js/chat/chat-searchable-select.js`, `application/single_app/static/js/chat/chat-model-selector.js`, `application/single_app/static/js/chat/chat-agents.js`, `application/single_app/static/css/chats.css`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Added a shared viewport-safe dropdown initializer in `chat-documents.js` for `Scope`, `Tags`, and `Documents`.
+- Standardized grounded-search dropdowns on `boundary: 'viewport'`, `reference: 'toggle'`, and `popperConfig.strategy: 'fixed'`.
+- Added sizing and cleanup helpers so search dropdowns constrain themselves to the visible viewport on mobile.
+- Extended `createSearchableSingleSelect()` to accept an optional dropdown configuration.
+- Updated the model and agent selectors to use a floating dropdown configuration so their menus can render above the mobile tools drawer.
+- Added z-index rules for the search filters and mobile selector menus to keep them above the surrounding drawer surfaces.
+- Updated source-level and UI test headers/contracts to version `0.241.029`.
+
+Impact analysis:
+
+- `Scope` and `Tags` now use the same mobile-safe dropdown behavior as `Documents`.
+- Model and agent menus are no longer limited to the visual bounds of the tools drawer when opened on mobile.
+- The dropdown behavior is now controlled through shared configuration instead of separate one-off implementations.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_searchable_selectors.py`: passed `9/9` checks after the dropdown behavior updates.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: updated to version `0.241.029`.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: still skips in the current environment because `SIMPLECHAT_UI_BASE_URL` and authenticated UI state are not configured.
+
+Before/after comparison:
+
+- Before: `Documents` floated safely, but `Scope` and `Tags` could clip inside the mobile search UI, and model or agent menus stayed visually confined to the tools drawer.
+- After: all three grounded-search filters use the same viewport-safe dropdown path, and model or agent menus can float above the drawer surface.
+
+Related config.py version update: `VERSION = "0.241.029"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.030/CHAT_SEARCH_DRAWER_CLOSE_FIX.md b/docs/explanation/fixes/v0.241.030/CHAT_SEARCH_DRAWER_CLOSE_FIX.md
new file mode 100644
index 00000000..2fc7f5f0
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.030/CHAT_SEARCH_DRAWER_CLOSE_FIX.md
@@ -0,0 +1,51 @@
+# Chat Search Drawer Close Fix
+
+Fixed/Implemented in version: **0.241.030**
+
+## Issue Description
+
+The grounded-search mobile drawer could still throw a Bootstrap offcanvas error when users pressed the close button.
+
+The error path appeared specifically on the mobile `X` control for the grounded-search slider. The same control was also positioned high enough on the panel that it could be obscured by the floating tutorial launcher.
+
+## Root Cause Analysis
+
+`application/single_app/templates/chats.html` still used a `data-bs-dismiss="offcanvas"` close button for the grounded-search drawer even though the panel was already being opened and managed through explicit JavaScript in `application/single_app/static/js/chat/chat-documents.js`.
+
+That meant the grounded-search drawer still relied on Bootstrap's declarative dismiss path while the rest of the mobile drawer lifecycle was being controlled programmatically. This reproduced the same offcanvas ownership issue that had already been fixed for the tools drawer.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `application/single_app/static/js/chat/chat-documents.js`, `application/single_app/static/css/chats.css`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Removed the Bootstrap auto-dismiss button from the grounded-search mobile header.
+- Added a dedicated mobile footer close button in the bottom-right corner of the grounded-search slider.
+- Updated `chat-documents.js` to use an explicit click handler for the new close control.
+- Aligned the grounded-search offcanvas instance with the tools drawer pattern by using `toggle: false`.
+- Closed open scope, tag, and document dropdowns before hiding the drawer and after the drawer finishes hiding.
+- Updated functional and UI regressions to validate the explicit close wiring and the absence of uncaught page errors for the mobile drawer flow.
+
+Impact analysis:
+
+- Closing grounded search on mobile now uses one owner for the offcanvas lifecycle.
+- The mobile close control sits at the bottom-right of the slider instead of being vulnerable to overlap with the tutorial launcher.
+- The drawer leaves less stale dropdown state behind when it closes.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_searchable_selectors.py`: passed `10/10` checks after updating the mobile grounded-search close contract.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: updated to exercise the grounded-search mobile close path and assert there are no uncaught page errors.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: still skips in the current environment because `SIMPLECHAT_UI_BASE_URL` and authenticated UI state are not configured.
+
+Before/after comparison:
+
+- Before: the grounded-search mobile `X` used Bootstrap auto-dismiss and could trigger a `backdrop` error while also sitting near the tutorial launcher.
+- After: the grounded-search drawer closes through explicit JavaScript and the close control now lives in a bottom mobile footer.
+
+Related config.py version update: `VERSION = "0.241.030"`
\ No newline at end of file
diff --git a/docs/explanation/fixes/v0.241.031/CHAT_TAGS_LOADING_STATE_FIX.md b/docs/explanation/fixes/v0.241.031/CHAT_TAGS_LOADING_STATE_FIX.md
new file mode 100644
index 00000000..d421d0e3
--- /dev/null
+++ b/docs/explanation/fixes/v0.241.031/CHAT_TAGS_LOADING_STATE_FIX.md
@@ -0,0 +1,51 @@
+# Chat Tags Loading State Fix
+
+Fixed/Implemented in version: **0.241.031**
+
+## Issue Description
+
+On the first grounded-search drawer open, the Tags control could appear to be missing until the initial scope refresh finished.
+
+The control eventually appeared after the first tag request completed, but the initial empty space looked like a broken UI because users were given no indication that tag data was still loading.
+
+## Root Cause Analysis
+
+`application/single_app/templates/chats.html` rendered the Tags control hidden by default.
+
+`application/single_app/static/js/chat/chat-documents.js` then opened the grounded-search drawer before the async document and tag refresh pipeline had completed. Because the tag filter was hidden rather than shown in a disabled loading state, the first open looked incomplete until the backend-backed tag requests finished.
+
+## Technical Details
+
+Files modified: `application/single_app/config.py`, `application/single_app/templates/chats.html`, `application/single_app/static/js/chat/chat-documents.js`, `application/single_app/static/css/chats.css`, `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Code changes summary:
+
+- Kept the Tags control visible in the grounded-search drawer instead of hiding it by default.
+- Added a disabled loading presentation with an inline spinner and `Loading tags...` label.
+- Added explicit loading, ready, and empty-state helpers in `chat-documents.js`.
+- Introduced a shared document or tag refresh helper so scope changes and first drawer open use the same loading-state workflow.
+- Preserved the previously loaded ready state on plain drawer reopen so the control does not flicker unnecessarily.
+- Updated source and UI regressions to validate the visible Tags control on first drawer open.
+
+Impact analysis:
+
+- The first grounded-search drawer open now communicates that tag data is loading instead of making the control appear broken.
+- Scope changes reuse the same loading-state behavior consistently.
+- Reopening the drawer without changing scope keeps the already-resolved Tags state visible.
+
+## Validation
+
+Test coverage: `functional_tests/test_chat_searchable_selectors.py`, `ui_tests/test_chat_mobile_toolbar_compaction.py`
+
+Test results:
+
+- `functional_tests/test_chat_searchable_selectors.py`: passed `11/11` checks after adding the Tags loading-state contract.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: updated to assert the Tags control is visible when the search drawer opens on mobile.
+- `ui_tests/test_chat_mobile_toolbar_compaction.py`: still skips in the current environment because `SIMPLECHAT_UI_BASE_URL` and authenticated UI state are not configured.
+
+Before/after comparison:
+
+- Before: the Tags control was hidden on first drawer open and only appeared after the async tag request completed.
+- After: the Tags control is visible immediately, shows a disabled loading state while tag data is being fetched, and transitions to ready or empty messaging when the request finishes.
+
+Related config.py version update: `VERSION = "0.241.031"`
\ No newline at end of file
diff --git a/functional_tests/storage_state.json b/functional_tests/storage_state.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/functional_tests/storage_state.json
@@ -0,0 +1 @@
+{}
diff --git a/functional_tests/test_admin_action_activity_log.py b/functional_tests/test_admin_action_activity_log.py
index 5530f4c1..bd68c0a6 100644
--- a/functional_tests/test_admin_action_activity_log.py
+++ b/functional_tests/test_admin_action_activity_log.py
@@ -2,11 +2,11 @@
 #!/usr/bin/env python3
 """
 Functional test for general admin action logging.
-Version: 0.236.017
-Implemented in: 0.236.017
+Version: 0.241.021
+Implemented in: 0.241.021
 
-This test ensures a helper exists for logging general admin actions with
-admin identity fields and a description for activity log display.
+This test ensures admin activity logging normalizes admin user identifiers
+before persistence and that the admin settings route passes a string user id.
 """
 
 import os
@@ -20,14 +20,21 @@ def read_file_text(file_path):
 def test_admin_action_activity_log_helper():
     repo_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
     log_path = os.path.join(repo_root, 'application', 'single_app', 'functions_activity_logging.py')
+    route_path = os.path.join(repo_root, 'application', 'single_app', 'route_frontend_admin_settings.py')
     content = read_file_text(log_path)
+    route_content = read_file_text(route_path)
 
     assert 'def log_general_admin_action' in content, "Missing admin action logging helper."
+    assert 'def coerce_activity_log_user_id' in content, "Missing user id normalization helper."
+    assert 'normalized_admin_user_id = coerce_activity_log_user_id(admin_user_id)' in content, (
+        "Admin action logging should normalize admin_user_id before storage."
+    )
     assert "activity_type': 'admin_action'" in content, "Expected admin_action activity type."
     assert "'admin':" in content, "Expected admin identity metadata in activity record."
     assert "'description':" in content, "Expected description for activity display."
+    assert 'admin_user_id=user_id' in route_content, "Admin settings route should pass a scalar user_id."
 
-    print("✅ Admin action activity logging helper verified.")
+    print("✅ Admin action activity logging user id normalization verified.")
 
 
 if __name__ == "__main__":
diff --git a/functional_tests/test_chat_navigation_unified_shell.py b/functional_tests/test_chat_navigation_unified_shell.py
new file mode 100644
index 00000000..dcc3808c
--- /dev/null
+++ b/functional_tests/test_chat_navigation_unified_shell.py
@@ -0,0 +1,179 @@
+# test_chat_navigation_unified_shell.py
+#!/usr/bin/env python3
+"""
+Functional test for the unified chat navigation shell.
+Version: 0.241.023
+Implemented in: 0.241.023
+
+This test ensures that chats in top-nav mode now use a single adaptive rail,
+route the mobile hamburger into that rail, and keep the new inline desktop
+toggle instead of the old floating reopen control while avoiding duplicate
+Bootstrap offcanvas ownership for the chat rail while keeping the mobile
+drawer offset below the fixed header.
+"""
+
+from pathlib import Path
+import sys
+
+
+ROOT = Path(__file__).resolve().parents[1]
+APP_DIR = ROOT / "application" / "single_app"
+
+if str(APP_DIR) not in sys.path:
+    sys.path.insert(0, str(APP_DIR))
+
+
+def read_text(relative_path: str) -> str:
+    """Read a repository file as UTF-8 text."""
+    return (ROOT / relative_path).read_text(encoding="utf-8")
+
+
+def test_base_template_marks_chat_top_nav_shell() -> bool:
+    """Validate the base template exposes chat shell body classes and desktop-only sidebar padding."""
+    print("Testing base template chat shell markers...")
+    base_template = read_text("application/single_app/templates/base.html")
+
+    required_snippets = [
+        "chat-shell-page",
+        "chat-top-nav-shell",
+        "body:not(.sidebar-nav-enabled) .sidebar-padding",
+        "{% set is_sidebar_layout = nav_layout == 'sidebar' or (not nav_layout and app_settings.enable_left_nav_default) %}",
+    ]
+
+    missing_snippets = [snippet for snippet in required_snippets if snippet not in base_template]
+    if missing_snippets:
+        print(f"Missing base template chat shell snippets: {missing_snippets}")
+        return False
+
+    print("Base template chat shell markers found.")
+    return True
+
+
+def test_top_nav_routes_chat_hamburger_to_chat_rail() -> bool:
+    """Validate the top nav routes mobile chat into the rail and keeps desktop chat links visible."""
+    top_nav_template = read_text("application/single_app/templates/_top_nav.html")
+
+    required_snippets = [
+        "{% set is_chat_page = request.endpoint == 'chats' %}",
+        "top-nav-chat-nav",
+        'data-bs-target="#sidebar-nav"',
+        'aria-label="Open chat navigation"',
+        'data-navigation-drawer="top-nav"',
+        '{% if not is_chat_page %}',
+    ]
+
+    missing_snippets = [snippet for snippet in required_snippets if snippet not in top_nav_template]
+    if missing_snippets:
+        print(f"Missing top nav chat routing snippets: {missing_snippets}")
+        return False
+
+    print("Top nav chat drawer routing found.")
+    return True
+
+
+def test_chat_sidebar_is_adaptive_and_inline_toggle_exists() -> bool:
+    """Validate the chat sidebar and scripts implement the adaptive rail pattern."""
+    sidebar_template = read_text("application/single_app/templates/_sidebar_short_nav.html")
+    chats_template = read_text("application/single_app/templates/chats.html")
+    sidebar_css = read_text("application/single_app/static/css/sidebar.css")
+    navigation_css = read_text("application/single_app/static/css/navigation.css")
+    navigation_js = read_text("application/single_app/static/js/navigation.js")
+    sidebar_js = read_text("application/single_app/static/js/sidebar.js")
+
+    required_sidebar_snippets = [
+        "chat-sidebar-nav offcanvas-lg offcanvas-start",
+        'data-navigation-drawer="chat-rail"',
+        "chat-sidebar-mobile-header",
+        "chat-sidebar-user-account",
+        "chat-sidebar-mobile-sections",
+        'top-nav-mobile-section-label">Workspace</div>',
+        "url_for('workspace')",
+        "url_for('group_workspaces')",
+        "url_for('public_directory')",
+    ]
+    required_chat_snippets = [
+        'id="chat-sidebar-inline-toggle"',
+        'data-sidebar-toggle="toggle"',
+    ]
+    required_css_snippets = [
+        "body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav",
+        "body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav.show",
+        "body.chat-top-nav-shell #sidebar-nav.chat-sidebar-nav .chat-sidebar-mobile-header",
+        "height: calc(100vh - var(--chat-sidebar-top));",
+        "top: var(--chat-sidebar-top);",
+    ]
+    required_navigation_js_snippets = [
+        "initializeNavigationOverlayCoordination()",
+        "getNavigationOffcanvasElements()",
+        "closeOpenDropdowns()",
+        "isChatRailNavigationDrawer(offcanvasElement)",
+    ]
+    required_navigation_css_snippets = [
+        "--top-nav-height: 66px;",
+        ".top-nav-mobile-drawer.offcanvas-start {",
+        "height: calc(100vh - var(--top-nav-height));",
+        "top: var(--top-nav-height);",
+        "z-index: 1046;",
+    ]
+    required_sidebar_js_snippets = [
+        "initializeChatSidebarDrawer()",
+        "#sidebar-nav[data-navigation-drawer=\"chat-rail\"]",
+        "bootstrap.Offcanvas.getInstance(sidebar)",
+    ]
+
+    missing_snippets = [snippet for snippet in required_sidebar_snippets if snippet not in sidebar_template]
+    missing_snippets.extend(snippet for snippet in required_chat_snippets if snippet not in chats_template)
+    missing_snippets.extend(snippet for snippet in required_css_snippets if snippet not in sidebar_css)
+    missing_snippets.extend(snippet for snippet in required_navigation_css_snippets if snippet not in navigation_css)
+    missing_snippets.extend(snippet for snippet in required_navigation_js_snippets if snippet not in navigation_js)
+    missing_snippets.extend(snippet for snippet in required_sidebar_js_snippets if snippet not in sidebar_js)
+
+    if missing_snippets:
+        print(f"Missing adaptive chat rail snippets: {missing_snippets}")
+        return False
+
+    if 'id="floating-expand-btn"' in sidebar_template:
+        print("Short chat sidebar still contains the floating expand button markup")
+        return False
+
+    if 'bootstrap.Offcanvas.getOrCreateInstance(sidebar)' in sidebar_js:
+        print("Chat sidebar drawer still creates a duplicate Bootstrap offcanvas instance")
+        return False
+
+    if "if (isChatRailNavigationDrawer(offcanvasElement))" not in navigation_js:
+        print("Generic navigation drawer initialization still attempts to own the chat rail")
+        return False
+
+    print("Adaptive chat rail snippets found.")
+    return True
+
+
+def test_config_version_bumped_for_chat_navigation_shell() -> bool:
+    """Validate the repository version bump for the chat navigation shell work."""
+    print("Testing config version bump for chat navigation shell...")
+    config_content = read_text("application/single_app/config.py")
+
+    if 'VERSION = "0.241.023"' not in config_content:
+        print("Config version was not bumped to 0.241.023")
+        return False
+
+    print("Config version bump found.")
+    return True
+
+
+if __name__ == "__main__":
+    checks = [
+        test_base_template_marks_chat_top_nav_shell,
+        test_top_nav_routes_chat_hamburger_to_chat_rail,
+        test_chat_sidebar_is_adaptive_and_inline_toggle_exists,
+        test_config_version_bumped_for_chat_navigation_shell,
+    ]
+
+    results = []
+    for check in checks:
+        print(f"\nRunning {check.__name__}...")
+        results.append(check())
+
+    success = all(results)
+    print(f"\nResults: {sum(results)}/{len(results)} checks passed")
+    raise SystemExit(0 if success else 1)
diff --git a/functional_tests/test_chat_searchable_selectors.py b/functional_tests/test_chat_searchable_selectors.py
index 7e6d70a3..5c709d52 100644
--- a/functional_tests/test_chat_searchable_selectors.py
+++ b/functional_tests/test_chat_searchable_selectors.py
@@ -2,14 +2,15 @@
 # test_chat_searchable_selectors.py
 """
 Functional test for grouped searchable chat selectors.
-Version: 0.239.199
-Implemented in: 0.239.197
+Version: 0.241.031
+Implemented in: 0.241.031
 
 This test ensures that the chat page exposes grouped searchable selectors for
 documents, prompts, models, and agents, that grouped headers are preserved by
 the shared renderer during search, and that chat prompt data is preloaded for
 personal, group, and public workspace scopes while locked conversations hide
-unavailable agents and models.
+unavailable agents and models while grounded search becomes a mobile drawer
+with an explicit mobile close control and a visible loading state for tags.
 """
 
 import os
@@ -78,6 +79,15 @@
     'css',
     'chats.css',
 )
+CHAT_MOBILE_TOOLBAR_FILE = os.path.join(
+    ROOT_DIR,
+    'application',
+    'single_app',
+    'static',
+    'js',
+    'chat',
+    'chat-mobile-toolbar.js',
+)
 ROUTE_FRONTEND_CHATS_FILE = os.path.join(
     ROOT_DIR,
     'application',
@@ -113,11 +123,31 @@ def test_chat_template_contains_searchable_selectors():
         required_snippets = [
             'id="scope-search-input"',
             'id="tags-search-input"',
+            'id="search-documents-container" class="chat-search-panel card p-0 mb-2 offcanvas-lg offcanvas-end"',
+            'id="searchDocumentsDrawerLabel"',
+            'class="chat-search-panel-grid"',
+            'id="search-documents-mobile-close"',
+            'class="chat-search-panel-mobile-footer d-lg-none"',
+            'id="tags-dropdown-loading-spinner"',
+            'Loading tags...',
             'class="chat-toolbar mb-2"',
-            'class="chat-toolbar-actions"',
+            'class="chat-toolbar-primary-row"',
+            'id="chat-toolbar-desktop-tools-slot"',
+            'id="chat-toolbar-tools-surface" class="chat-toolbar-secondary-panel chat-toolbar-tools-surface"',
+            'class="chat-toolbar-actions chat-toolbar-action-rail"',
             'class="chat-toolbar-controls"',
+            'id="chat-toolbar-desktop-primary-slot" class="chat-toolbar-primary-selector"',
+            'id="chat-toolbar-primary-surface" class="chat-toolbar-primary-surface"',
+            'id="chat-toolbar-desktop-selectors-slot"',
+            'id="chat-toolbar-selectors-surface" class="chat-toolbar-selectors"',
+            'id="chat-mobile-tools-panel" class="chat-toolbar-mobile-panel offcanvas-lg offcanvas-bottom"',
+            'id="chatMobileToolsLabel"',
+            'chat-toolbar-tools-header',
+            'id="chat-mobile-tools-close"',
+            'id="chat-toolbar-mobile-tools-slot"',
+            'id="chat-toolbar-mobile-primary-slot"',
+            'id="chat-toolbar-mobile-selectors-slot"',
             'class="chat-toolbar-toggles"',
-            'class="chat-toolbar-selectors"',
             'id="prompt-dropdown"',
             'id="prompt-search-input"',
             'id="model-dropdown"',
@@ -131,13 +161,16 @@ def test_chat_template_contains_searchable_selectors():
             'id="prompt-select"',
             'id="model-select"',
             'id="agent-select"',
-            'window.chatPromptOptions = JSON.parse',
-            'window.chatAgentOptions = JSON.parse',
-            'window.chatModelOptions = JSON.parse',
+            'data-bs-toggle="offcanvas"',
+            'window.chatPromptOptions =',
+            'window.chatAgentOptions =',
+            'window.chatModelOptions =',
         ]
 
         missing = [snippet for snippet in required_snippets if snippet not in content]
         assert not missing, f'Missing searchable selector markup: {missing}'
+        assert 'search-btn-text d-none d-md-inline' not in content, 'Expected mobile drawer labels to rely on CSS visibility instead of Bootstrap d-none utilities'
+        assert 'file-btn-text d-none d-md-inline' not in content, 'Expected mobile drawer file label to rely on CSS visibility instead of Bootstrap d-none utilities'
 
         print('✅ Chat template searchable selector markup passed')
         return True
@@ -158,15 +191,26 @@ def test_chat_toolbar_layout_supports_wrapping_without_button_compression():
 
         required_snippets = [
             '.chat-toolbar {',
+            '#chat-toolbar-desktop-tools-slot,',
             '.chat-toolbar-actions,',
             '.chat-toolbar-controls {',
-            '.chat-toolbar-selectors {',
+            '.chat-toolbar-tools-surface {',
+            '.chat-toolbar-mobile-panel {',
+            '.chat-toolbar-selectors-slot {',
             '.chat-toolbar-selector {',
             '.chat-toolbar-selector .chat-searchable-select {',
+            '.chat-toolbar-primary-surface {',
+            '.chat-toolbar-primary-surface .chat-toolbar-selector {',
+            '.chat-toolbar-mobile-panel .offcanvas-body {',
+            '.chat-toolbar-mobile-primary-slot,',
+            '.chat-toolbar-mobile-tools-slot .chat-toolbar-tools-surface {',
+            '.chat-toolbar-mobile-tools-slot .search-btn:not(.active) .search-btn-text,',
+            '#chat-toolbar-mobile-tools-slot .search-btn .search-btn-text,',
             '.search-btn,',
             '.file-btn {',
             '@media (max-width: 1200px) {',
-            '@media (max-width: 768px) {',
+            '@media (max-width: 991.98px) {',
+            '@media (min-width: 992px) {',
         ]
 
         missing = [snippet for snippet in required_snippets if snippet not in content]
@@ -182,6 +226,152 @@ def test_chat_toolbar_layout_supports_wrapping_without_button_compression():
         return False
 
 
+def test_mobile_toolbar_safe_close_and_selector_reveal_wiring():
+    """Verify the mobile tools drawer safely closes and reveals selectors on activation."""
+    print('🔍 Testing mobile toolbar selector reveal and safe close wiring...')
+
+    try:
+        toolbar_content = read_file(CHAT_MOBILE_TOOLBAR_FILE)
+        prompts_content = read_file(CHAT_PROMPTS_FILE)
+        agents_content = read_file(CHAT_AGENTS_FILE)
+
+        required_toolbar_snippets = [
+            "const mobileToolsClose = document.getElementById('chat-mobile-tools-close');",
+            "const primarySurface = document.getElementById('chat-toolbar-primary-surface');",
+            "const desktopPrimarySlot = document.getElementById('chat-toolbar-desktop-primary-slot');",
+            "const mobilePrimarySlot = document.getElementById('chat-toolbar-mobile-primary-slot');",
+            "function closeOpenMobileSelectorDropdowns() {",
+            "hideMobileSelectorDropdown('model-dropdown-button');",
+            "function revealSelectorInMobileDrawer({ selectorId, dropdownButtonId }) {",
+            "selectorElement.scrollIntoView({ behavior: 'smooth', block: 'nearest' });",
+            "window.addEventListener('chat:toolbar-selector-activated', (event) => {",
+            "bootstrap.Dropdown.getOrCreateInstance(dropdownButton, {",
+            "mobileToolsClose?.addEventListener('click', (event) => {",
+            "moveSurfaceToSlot(primarySurface, mobilePrimarySlot);",
+            "moveSurfaceToSlot(primarySurface, desktopPrimarySlot);",
+        ]
+        required_prompt_snippets = [
+            'function notifyMobileSelectorActivated(selectorId, dropdownButtonId) {',
+            'loadAllPrompts().finally(() => {',
+            'notifyMobileSelectorActivated("prompt-selection-container", "prompt-dropdown-button");',
+        ]
+        required_agent_snippets = [
+            "function notifyMobileSelectorActivated(selectorId, dropdownButtonId) {",
+            "notifyMobileSelectorActivated('agent-select-container', 'agent-dropdown-button');",
+        ]
+
+        missing_toolbar = [snippet for snippet in required_toolbar_snippets if snippet not in toolbar_content]
+        missing_prompts = [snippet for snippet in required_prompt_snippets if snippet not in prompts_content]
+        missing_agents = [snippet for snippet in required_agent_snippets if snippet not in agents_content]
+
+        assert not missing_toolbar, f'Missing mobile toolbar wiring: {missing_toolbar}'
+        assert not missing_prompts, f'Missing prompt reveal wiring: {missing_prompts}'
+        assert not missing_agents, f'Missing agent reveal wiring: {missing_agents}'
+
+        print('✅ Mobile toolbar selector reveal and safe close wiring passed')
+        return True
+
+    except Exception as exc:
+        print(f'❌ Test failed: {exc}')
+        import traceback
+        traceback.print_exc()
+        return False
+
+
+def test_grounded_search_mobile_drawer_uses_explicit_close_wiring():
+    """Verify grounded search mobile close uses explicit JS instead of Bootstrap auto-dismiss."""
+    print('🔍 Testing grounded search mobile drawer close wiring...')
+
+    try:
+        template_content = read_file(CHATS_TEMPLATE)
+        documents_content = read_file(CHAT_DOCUMENTS_FILE)
+
+        search_container_start = template_content.index('id="search-documents-container"')
+        search_container_end = template_content.index('{% endif %}', search_container_start)
+        search_container_markup = template_content[search_container_start:search_container_end]
+
+        required_template_snippets = [
+            'id="search-documents-mobile-close"',
+            'class="chat-search-panel-mobile-footer d-lg-none"',
+        ]
+        required_js_snippets = [
+            'const searchDocumentsMobileClose = document.getElementById("search-documents-mobile-close");',
+            'function closeSearchDocumentsDropdowns() {',
+            "return bootstrap.Offcanvas.getOrCreateInstance(searchDocumentsContainer, { toggle: false });",
+            'closeSearchDocumentsDropdowns();',
+            "searchDocumentsMobileClose?.addEventListener('click', (event) => {",
+            'event.preventDefault();',
+            'event.stopPropagation();',
+            'hideSearchDocumentsPanel();',
+        ]
+
+        missing_template = [snippet for snippet in required_template_snippets if snippet not in search_container_markup]
+        missing_js = [snippet for snippet in required_js_snippets if snippet not in documents_content]
+
+        assert 'data-bs-dismiss="offcanvas"' not in search_container_markup, 'Expected grounded search drawer to avoid Bootstrap auto-dismiss wiring'
+        assert not missing_template, f'Missing grounded search mobile drawer markup: {missing_template}'
+        assert not missing_js, f'Missing grounded search mobile drawer JS wiring: {missing_js}'
+
+        print('✅ Grounded search mobile drawer close wiring passed')
+        return True
+
+    except Exception as exc:
+        print(f'❌ Test failed: {exc}')
+        import traceback
+        traceback.print_exc()
+        return False
+
+
+def test_tags_dropdown_loading_state_is_visible_before_tag_results_arrive():
+    """Verify the tags filter exposes visible loading and empty states instead of hiding itself."""
+    print('🔍 Testing tags dropdown loading-state wiring...')
+
+    try:
+        template_content = read_file(CHATS_TEMPLATE)
+        documents_content = read_file(CHAT_DOCUMENTS_FILE)
+        css_content = read_file(CHAT_CSS_FILE)
+
+        required_template_snippets = [
+            'id="tags-dropdown-loading-spinner"',
+            'aria-disabled="true"',
+            'disabled',
+            'Loading tags...',
+        ]
+        required_js_snippets = [
+            "let hasResolvedTagsState = false;",
+            "let tagsDropdownState = 'loading';",
+            'function setTagsDropdownLoadingState(message = \'Loading tags...\') {',
+            'function setTagsDropdownReadyState() {',
+            "function setTagsDropdownEmptyState(message = 'No tags available for this scope') {",
+            'function refreshDocumentsAndTags({ source = null, showLoading = true } = {}) {',
+            'await refreshDocumentsAndTags({ showLoading: !hasResolvedTagsState });',
+            "if (tagsDropdownState !== 'ready' || !tagsDropdownItems || !tagsDropdownItems.children.length) {",
+            "hideTagsDropdown('Unable to load tags');",
+        ]
+        required_css_snippets = [
+            '.chat-search-dropdown-button-content {',
+            '.chat-search-dropdown-loading-spinner {',
+        ]
+
+        missing_template = [snippet for snippet in required_template_snippets if snippet not in template_content]
+        missing_js = [snippet for snippet in required_js_snippets if snippet not in documents_content]
+        missing_css = [snippet for snippet in required_css_snippets if snippet not in css_content]
+
+        assert 'id="tags-dropdown" style="display: none;"' not in template_content, 'Expected tags dropdown to stay visible while loading or empty'
+        assert not missing_template, f'Missing tags loading template wiring: {missing_template}'
+        assert not missing_js, f'Missing tags loading JS wiring: {missing_js}'
+        assert not missing_css, f'Missing tags loading CSS wiring: {missing_css}'
+
+        print('✅ Tags dropdown loading-state wiring passed')
+        return True
+
+    except Exception as exc:
+        print(f'❌ Test failed: {exc}')
+        import traceback
+        traceback.print_exc()
+        return False
+
+
 def test_shared_search_helper_supports_grouped_single_selects():
     """Verify the shared helper supports grouped searchable single-select sections."""
     print('🔍 Testing shared searchable select helper grouped rendering...')
@@ -192,6 +382,8 @@ def test_shared_search_helper_supports_grouped_single_selects():
         required_snippets = [
             'export function initializeFilterableDropdownSearch',
             'export function createSearchableSingleSelect',
+            'dropdownConfig,',
+            "const resolvedDropdownConfig = dropdownConfig || {",
             'function createDropdownHeader(label) {',
             'const getTopLevelEntries = () => Array.from(selectEl.children)',
             "if (entry.tagName === 'OPTGROUP') {",
@@ -224,9 +416,20 @@ def test_scope_tag_and_document_search_are_wired_in_chat_documents():
         required_snippets = [
             'const scopeSearchInput = document.getElementById("scope-search-input");',
             'const tagsSearchInput = document.getElementById("tags-search-input");',
+            'const SEARCH_DOCUMENTS_MOBILE_MEDIA_QUERY = \u0027(max-width: 991.98px)\u0027;',
+            'function getSearchDocumentsDropdownConfig() {',
+            'function initializeSearchFilterDropdown({',
+            "boundary: 'viewport',",
+            "strategy: 'fixed',",
+            'export async function showSearchDocumentsPanel() {',
+            'export function hideSearchDocumentsPanel() {',
+            "bootstrap.Offcanvas.getOrCreateInstance(searchDocumentsContainer, { toggle: false });",
             'const documentSearchController = initializeFilterableDropdownSearch({',
             'const scopeSearchController = initializeFilterableDropdownSearch({',
             'const tagsSearchController = initializeFilterableDropdownSearch({',
+            'searchController: scopeSearchController,',
+            'searchController: tagsSearchController,',
+            'searchController: documentSearchController,',
             "allItem.setAttribute('data-search-role', 'action');",
             "item.setAttribute('data-search-role', 'item');",
             'function appendDocumentSection(sectionLabel, documents, sectionIndex) {',
@@ -295,8 +498,10 @@ def test_model_and_agent_selectors_use_grouped_scope_sections():
 
         model_snippets = [
             "import { createSearchableSingleSelect } from './chat-searchable-select.js';",
+            'const FLOATING_SELECTOR_DROPDOWN_CONFIG = {',
             'export function initializeModelSelector()',
             'modelSelectorController = createSearchableSingleSelect({',
+            'dropdownConfig: FLOATING_SELECTOR_DROPDOWN_CONFIG,',
             "[Group] ${group.name || 'Unnamed Group'}",
             "actionButton.textContent = 'Use all available workspaces';",
             "const optGroup = document.createElement('optgroup');",
@@ -306,8 +511,10 @@ def test_model_and_agent_selectors_use_grouped_scope_sections():
         ]
         agent_snippets = [
             "import { createSearchableSingleSelect } from './chat-searchable-select.js';",
+            'const FLOATING_SELECTOR_DROPDOWN_CONFIG = {',
             'function initializeAgentSelector() {',
             'agentSelectorController = createSearchableSingleSelect({',
+            'dropdownConfig: FLOATING_SELECTOR_DROPDOWN_CONFIG,',
             "[Group] ${group.name || 'Unnamed Group'}",
             "actionButton.textContent = 'Use all available workspaces';",
             "const optGroup = document.createElement('optgroup');",
@@ -376,7 +583,7 @@ def test_version_bumped_for_grouped_chat_selector_change():
 
     try:
         config_content = read_file(CONFIG_FILE)
-        assert 'VERSION = "0.239.199"' in config_content, 'Expected config.py version 0.239.199'
+        assert 'VERSION = "0.241.031"' in config_content, 'Expected config.py version 0.241.031'
 
         print('✅ Config version bump passed')
         return True
@@ -392,6 +599,9 @@ def test_version_bumped_for_grouped_chat_selector_change():
     tests = [
         test_chat_template_contains_searchable_selectors,
         test_chat_toolbar_layout_supports_wrapping_without_button_compression,
+        test_mobile_toolbar_safe_close_and_selector_reveal_wiring,
+        test_grounded_search_mobile_drawer_uses_explicit_close_wiring,
+        test_tags_dropdown_loading_state_is_visible_before_tag_results_arrive,
         test_shared_search_helper_supports_grouped_single_selects,
         test_scope_tag_and_document_search_are_wired_in_chat_documents,
         test_prompt_selector_uses_preloaded_grouped_catalog,
diff --git a/functional_tests/test_chat_toolbar_layout.py b/functional_tests/test_chat_toolbar_layout.py
index f377f1d3..0f8d8fd1 100644
--- a/functional_tests/test_chat_toolbar_layout.py
+++ b/functional_tests/test_chat_toolbar_layout.py
@@ -1,13 +1,13 @@
 # test_chat_toolbar_layout.py
 #!/usr/bin/env python3
 """
-Functional test for chat toolbar layout separation.
-Version: 0.239.170
-Implemented in: 0.239.170
+Functional test for compact chat toolbar layout.
+Version: 0.241.019
+Implemented in: 0.241.019
 
-This test ensures the chat selectors and toggle buttons remain separate sibling
-groups, stay aligned on wide layouts, and switch to clean full-width toolbar
-rows before overlap occurs on narrower layouts.
+This test ensures the chats toolbar keeps a mobile quick-action rail, exposes a
+primary model selector, and routes secondary selectors and toggles through a
+collapsible tools panel without changing the existing selector IDs.
 """
 
 import os
@@ -24,36 +24,43 @@ def _read_text(relative_path):
         return handle.read()
 
 
-def test_chat_toolbar_groups_are_responsive_without_overlap():
-    """Verify the toolbar layout has both desktop and medium-width guardrails."""
-    print("🔍 Testing chat toolbar group alignment...")
+def test_chat_toolbar_mobile_tools_panel_is_wired():
+    """Verify the compact toolbar markup, CSS, and mobile coordination script exist."""
+    print("🔍 Testing compact chat toolbar wiring...")
 
     try:
         template_text = _read_text("application/single_app/templates/chats.html")
         css_text = _read_text("application/single_app/static/css/chats.css")
+        js_text = _read_text("application/single_app/static/js/chat/chat-mobile-toolbar.js")
+
+        required_template_snippets = [
+            'class="chat-toolbar-primary-row"',
+            'class="chat-toolbar-actions chat-toolbar-action-rail"',
+            'id="chat-mobile-tools-toggle"',
+            'id="chat-mobile-tools-panel" class="collapse d-lg-flex chat-toolbar-secondary-panel"',
+            'class="chat-toolbar-primary-selector"',
+            'id="model-select-container" class="chat-toolbar-selector"',
+            'id="prompt-selection-container" class="chat-toolbar-selector"',
+            'id="agent-select-container" class="chat-toolbar-selector"',
+        ]
 
-        structure_pattern = re.compile(
-            r'<div class="chat-toolbar-controls">.*?<div class="chat-toolbar-selectors">.*?</div>\s*<div class="chat-toolbar-toggles">',
-            re.DOTALL,
-        )
-
-        if not structure_pattern.search(template_text):
-            print("❌ Chat toolbar selectors and toggles are not separate sibling groups")
+        missing_template = [snippet for snippet in required_template_snippets if snippet not in template_text]
+        if missing_template:
+            print(f"❌ Missing compact toolbar template snippets: {', '.join(missing_template)}")
             return False
 
         required_css_snippets = [
             ".chat-toolbar {",
-            "flex-wrap: nowrap;",
-            "align-items: flex-end;",
-            ".chat-toolbar-controls {",
-            "flex-wrap: nowrap;",
-            "align-items: flex-end;",
-            ".chat-toolbar-toggles {",
-            ".chat-toolbar-selectors {",
-            "@media (max-width: 1200px) {",
-            "flex: 1 1 100%;",
-            "justify-content: flex-start;",
-            "@media (max-width: 768px) {",
+            ".chat-toolbar-primary-row {",
+            ".chat-toolbar-action-rail {",
+            ".chat-toolbar-primary-selector {",
+            ".chat-toolbar-secondary-panel {",
+            ".chat-mobile-tools-toggle {",
+            "overflow-x: auto;",
+            "scrollbar-width: none;",
+            "@media (max-width: 991.98px) {",
+            ".chat-toolbar-action-rail .search-btn-text,",
+            "#search-documents-container .flex-shrink-0,",
         ]
 
         missing_css = [snippet for snippet in required_css_snippets if snippet not in css_text]
@@ -61,7 +68,21 @@ def test_chat_toolbar_groups_are_responsive_without_overlap():
             print(f"❌ Missing toolbar layout CSS snippets: {', '.join(missing_css)}")
             return False
 
-        print("✅ Chat toolbar selectors and toggles remain aligned without medium-width overlap")
+        required_js_snippets = [
+            "function initializeChatMobileToolbar()",
+            "const mobileToolsToggle = document.getElementById('chat-mobile-tools-toggle');",
+            "const mobileToolsPanel = document.getElementById('chat-mobile-tools-panel');",
+            "new MutationObserver(syncMobileToolsPanel)",
+            "bootstrap.Collapse.getOrCreateInstance(panelElement, { toggle: false })",
+            "window.requestAnimationFrame(syncMobileToolsPanel);",
+        ]
+
+        missing_js = [snippet for snippet in required_js_snippets if snippet not in js_text]
+        if missing_js:
+            print(f"❌ Missing mobile toolbar coordination snippets: {', '.join(missing_js)}")
+            return False
+
+        print("✅ Compact chat toolbar wiring passed")
         return True
     except Exception as exc:
         print(f"❌ Test failed: {exc}")
@@ -71,6 +92,6 @@ def test_chat_toolbar_groups_are_responsive_without_overlap():
 
 
 if __name__ == "__main__":
-    success = test_chat_toolbar_groups_are_responsive_without_overlap()
+    success = test_chat_toolbar_mobile_tools_panel_is_wired()
     print(f"\n📊 Results: {1 if success else 0}/1 tests passed")
     sys.exit(0 if success else 1)
\ No newline at end of file
diff --git a/functional_tests/test_control_center_activity_logs_hardening.py b/functional_tests/test_control_center_activity_logs_hardening.py
new file mode 100644
index 00000000..f40b2cae
--- /dev/null
+++ b/functional_tests/test_control_center_activity_logs_hardening.py
@@ -0,0 +1,150 @@
+# test_control_center_activity_logs_hardening.py
+#!/usr/bin/env python3
+"""
+Functional test for Control Center activity logs hardening.
+Version: 0.241.021
+Implemented in: 0.241.021
+
+This test ensures that the Control Center activity logs flow validates
+interactive pagination, uses a dedicated export endpoint, and keeps the
+responsive table layout hooks needed for narrower viewports while safely
+normalizing malformed legacy user_id values.
+"""
+
+from pathlib import Path
+import sys
+
+
+ROOT = Path(__file__).resolve().parents[1]
+APP_DIR = ROOT / "application" / "single_app"
+
+if str(APP_DIR) not in sys.path:
+    sys.path.insert(0, str(APP_DIR))
+
+
+def read_text(relative_path: str) -> str:
+    """Read a repository file as UTF-8 text."""
+    return (ROOT / relative_path).read_text(encoding="utf-8")
+
+
+def test_activity_logs_backend_hardening_present() -> bool:
+    """Validate the backend route includes paging validation and export support."""
+    print("Testing activity logs backend hardening...")
+    backend_content = read_text("application/single_app/route_backend_control_center.py")
+
+    required_snippets = [
+        "ACTIVITY_LOGS_MAX_PER_PAGE = 200",
+        "def validate_activity_logs_pagination(request_args):",
+        "def build_activity_logs_query_context(activity_type_filter='all', search_term=''):",
+        "def normalize_activity_log_record(log_record):",
+        "coerce_activity_log_user_id(normalized_record.get(field_name))",
+        "(log_record.get('admin') or {}).get('user_id')",
+        "def create_activity_log_csv_response(csv_content):",
+        "/api/admin/control-center/activity-logs/export",
+        "return jsonify({'error': str(ex)}), 400",
+        "COUNT(1) FROM c",
+        "normalize_activity_log_record(log_record)",
+        "format_activity_log_details_for_csv(normalized_log)"
+    ]
+
+    missing_snippets = [snippet for snippet in required_snippets if snippet not in backend_content]
+    if missing_snippets:
+        print(f"Missing backend activity logs hardening snippets: {missing_snippets}")
+        return False
+
+    if "Apply search filter in Python (after fetching from Cosmos)" in backend_content:
+        print("Backend still contains the old post-pagination search comment")
+        return False
+
+    print("Backend activity logs hardening found.")
+    return True
+
+
+def test_control_center_template_contains_activity_log_layout_hooks() -> bool:
+    """Validate the template includes responsive Activity Logs table rules."""
+    print("Testing control center activity logs template layout hooks...")
+    template_content = read_text("application/single_app/templates/control_center.html")
+
+    required_snippets = [
+        "activity-logs-table",
+        "min-width: 940px;",
+        "table-layout: fixed;",
+        ".activity-log-cell-text,",
+        ".activity-log-details {",
+        ".activity-log-row:hover {",
+        "id=\"activityLogsTable\""
+    ]
+
+    missing_snippets = [snippet for snippet in required_snippets if snippet not in template_content]
+    if missing_snippets:
+        print(f"Missing template activity logs layout snippets: {missing_snippets}")
+        return False
+
+    print("Control center activity logs layout hooks found.")
+    return True
+
+
+def test_control_center_javascript_uses_dedicated_export_route() -> bool:
+    """Validate the client uses the dedicated export path and clears stale paging on errors."""
+    print("Testing control center activity logs JavaScript wiring...")
+    js_content = read_text("application/single_app/static/js/control-center.js")
+
+    required_snippets = [
+        "renderActivityLogs(logs, userMap = {})",
+        "formatActivityLogTimestamp(timestamp)",
+        "/api/admin/control-center/activity-logs/export?",
+        "paginationInfo.textContent = message;",
+        "paginationNav.innerHTML = '';",
+        "this.loadActivityLogs();",
+        "return this.escapeHtml(log.description || 'N/A');"
+    ]
+
+    missing_snippets = [snippet for snippet in required_snippets if snippet not in js_content]
+    if missing_snippets:
+        print(f"Missing JavaScript activity logs snippets: {missing_snippets}")
+        return False
+
+    forbidden_snippets = [
+        "per_page: 10000",
+        "console.log('=== loadActivityLogs CALLED ===')",
+        "console.log('Activity Logs tab clicked!')"
+    ]
+
+    remaining_forbidden = [snippet for snippet in forbidden_snippets if snippet in js_content]
+    if remaining_forbidden:
+        print(f"Old activity logs debug/export snippets still present: {remaining_forbidden}")
+        return False
+
+    print("Control center activity logs JavaScript wiring found.")
+    return True
+
+
+def test_config_version_bumped_for_activity_log_fix() -> bool:
+    """Validate the repository version bump for the activity log fix."""
+    print("Testing config version bump...")
+    config_content = read_text("application/single_app/config.py")
+
+    if 'VERSION = "0.241.021"' not in config_content:
+        print("Config version was not bumped to 0.241.021")
+        return False
+
+    print("Config version bump found.")
+    return True
+
+
+if __name__ == "__main__":
+    checks = [
+        test_activity_logs_backend_hardening_present,
+        test_control_center_template_contains_activity_log_layout_hooks,
+        test_control_center_javascript_uses_dedicated_export_route,
+        test_config_version_bumped_for_activity_log_fix,
+    ]
+
+    results = []
+    for check in checks:
+        print(f"\nRunning {check.__name__}...")
+        results.append(check())
+
+    success = all(results)
+    print(f"\nResults: {sum(results)}/{len(results)} checks passed")
+    raise SystemExit(0 if success else 1)
\ No newline at end of file
diff --git a/functional_tests/test_control_center_activity_logs_layout_presets.py b/functional_tests/test_control_center_activity_logs_layout_presets.py
new file mode 100644
index 00000000..cea8f8bd
--- /dev/null
+++ b/functional_tests/test_control_center_activity_logs_layout_presets.py
@@ -0,0 +1,110 @@
+# test_control_center_activity_logs_layout_presets.py
+#!/usr/bin/env python3
+"""
+Functional test for Control Center activity log layout presets.
+Version: 0.241.016
+Implemented in: 0.241.016
+
+This test ensures that the Activity Logs tab exposes preset-based layout
+controls, persists the selected preset in localStorage, and keeps clear
+guidance for reading full raw log details.
+"""
+
+from pathlib import Path
+import sys
+
+
+ROOT = Path(__file__).resolve().parents[1]
+APP_DIR = ROOT / "application" / "single_app"
+
+if str(APP_DIR) not in sys.path:
+    sys.path.insert(0, str(APP_DIR))
+
+
+def read_text(relative_path: str) -> str:
+    """Read a repository file as UTF-8 text."""
+    return (ROOT / relative_path).read_text(encoding="utf-8")
+
+
+def test_activity_logs_template_contains_layout_presets() -> bool:
+    """Validate the template exposes layout preset controls and CSS preset rules."""
+    print("Testing activity logs layout preset template hooks...")
+    template_content = read_text("application/single_app/templates/control_center.html")
+
+    required_snippets = [
+        "activity-log-layout-presets",
+        'name="activityLogsLayoutPreset"',
+        'id="activityLogsLayoutPresetBalanced"',
+        'id="activityLogsLayoutPresetDetailsFocus"',
+        'id="activityLogsLayoutPresetCompact"',
+        'id="activityLogsLayoutHint"',
+        'data-layout-preset="balanced"',
+        '--activity-log-details-width:',
+        '.activity-logs-table[data-layout-preset="details-focus"]',
+        '.activity-logs-table[data-layout-preset="compact"]'
+    ]
+
+    missing_snippets = [snippet for snippet in required_snippets if snippet not in template_content]
+    if missing_snippets:
+        print(f"Missing activity logs layout preset template snippets: {missing_snippets}")
+        return False
+
+    print("Activity logs layout preset template hooks found.")
+    return True
+
+
+def test_activity_logs_javascript_contains_layout_preset_logic() -> bool:
+    """Validate the client stores and applies Activity Logs layout presets."""
+    print("Testing activity logs layout preset JavaScript wiring...")
+    js_content = read_text("application/single_app/static/js/control-center.js")
+
+    required_snippets = [
+        "const ACTIVITY_LOGS_LAYOUT_PRESET_STORAGE_KEY = 'simplechat_activityLogsLayoutPreset';",
+        "const ACTIVITY_LOGS_LAYOUT_PRESETS = ['balanced', 'details-focus', 'compact'];",
+        "loadActivityLogsLayoutPreset()",
+        "saveActivityLogsLayoutPreset()",
+        "applyActivityLogsLayoutPreset(preset)",
+        "updateActivityLogsLayoutHint()",
+        "handleActivityLogsLayoutPresetChange(event)",
+        "activityLogsLayoutPreset = 'balanced';",
+        "window.localStorage.setItem(ACTIVITY_LOGS_LAYOUT_PRESET_STORAGE_KEY, this.activityLogsLayoutPreset);",
+        "activityLogsTable.setAttribute('data-layout-preset', resolvedPreset);"
+    ]
+
+    missing_snippets = [snippet for snippet in required_snippets if snippet not in js_content]
+    if missing_snippets:
+        print(f"Missing activity logs layout preset JavaScript snippets: {missing_snippets}")
+        return False
+
+    print("Activity logs layout preset JavaScript wiring found.")
+    return True
+
+
+def test_config_version_bumped_for_activity_logs_layout_presets() -> bool:
+    """Validate the repository version bump for the Activity Logs preset feature."""
+    print("Testing config version bump for activity log layout presets...")
+    config_content = read_text("application/single_app/config.py")
+
+    if 'VERSION = "0.241.016"' not in config_content:
+        print("Config version was not bumped to 0.241.016")
+        return False
+
+    print("Config version bump found.")
+    return True
+
+
+if __name__ == "__main__":
+    checks = [
+        test_activity_logs_template_contains_layout_presets,
+        test_activity_logs_javascript_contains_layout_preset_logic,
+        test_config_version_bumped_for_activity_logs_layout_presets,
+    ]
+
+    results = []
+    for check in checks:
+        print(f"\nRunning {check.__name__}...")
+        results.append(check())
+
+    success = all(results)
+    print(f"\nResults: {sum(results)}/{len(results)} checks passed")
+    raise SystemExit(0 if success else 1)
\ No newline at end of file
diff --git a/functional_tests/test_default_model_selection_fallback.py b/functional_tests/test_default_model_selection_fallback.py
index 16cd8b18..76ec9400 100644
--- a/functional_tests/test_default_model_selection_fallback.py
+++ b/functional_tests/test_default_model_selection_fallback.py
@@ -1,8 +1,9 @@
 # test_default_model_selection_fallback.py
+# test_default_model_selection_fallback.py
 #!/usr/bin/env python3
 """
 Functional test for default model selection fallback.
-Version: 0.240.073
+Version: 0.241.007
 Implemented in: 0.240.071
 
 This test ensures default model selection is surfaced in admin settings
@@ -32,15 +33,11 @@ def test_default_model_selection_wiring():
     loader_path = os.path.join(
         repo_root, "application", "single_app", "semantic_kernel_loader.py"
     )
-    config_path = os.path.join(
-        repo_root, "application", "single_app", "config.py"
-    )
 
     admin_template = read_file_text(admin_template_path)
     admin_route = read_file_text(admin_route_path)
     chat_route = read_file_text(chat_path)
     loader_content = read_file_text(loader_path)
-    config_content = read_file_text(config_path)
 
     assert "default_model_selection_json" in admin_template, (
         "Expected default model selection input in admin settings template."
@@ -63,9 +60,6 @@ def test_default_model_selection_wiring():
     assert 'Using saved admin default multi-endpoint model for agent' in loader_content, (
         "Expected the shared agent loader to use the saved admin default model when agent bindings are missing or stale."
     )
-    assert 'VERSION = "0.240.073"' in config_content, (
-        "Expected config.py version 0.240.073 after the loader fallback and migration UI updates."
-    )
 
     print("✅ Default model selection wiring verified.")
 
diff --git a/functional_tests/test_enhanced_citations_csp_fix.py b/functional_tests/test_enhanced_citations_csp_fix.py
index 26a25b18..57ab1d42 100644
--- a/functional_tests/test_enhanced_citations_csp_fix.py
+++ b/functional_tests/test_enhanced_citations_csp_fix.py
@@ -1,22 +1,21 @@
-#!/usr/bin/env python3
+# test_enhanced_citations_csp_fix.py
 """
-Functional test for enhanced citations CSP fix.
-Version: 0.229.061
-Implemented in: 0.229.061
+Functional test for enhanced citations blob CSP and chat toast placement fixes.
+Version: 0.241.010
+Implemented in: 0.241.010
 
-This test ensures that the Content Security Policy (CSP) allows enhanced citations
-PDFs to be embedded in iframes by verifying frame-ancestors is set to 'self' instead
-of 'none', fixing the CSP violation that prevented PDF modal display.
+This test ensures that the Content Security Policy (CSP) allows blob-backed
+enhanced citation PDFs to be embedded in iframes and that chat toasts render in
+the dedicated anchored container below the tutorial launcher.
 """
 
 import sys
 import os
-import requests
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 def test_csp_frame_ancestors_allows_self_framing():
-    """Test that CSP frame-ancestors allows self-framing for enhanced citations."""
-    print("🔍 Testing CSP frame-ancestors configuration...")
+    """Test that CSP allows blob-backed PDF frames for enhanced citations."""
+    print("🔍 Testing CSP frame configuration...")
     
     try:
         # Import the config to check the CSP setting
@@ -32,11 +31,20 @@ def test_csp_frame_ancestors_allows_self_framing():
         with open(config_path, 'r', encoding='utf-8') as f:
             config_content = f.read()
         
-        # Check that CSP contains frame-ancestors 'self' instead of 'none'
+        # Check that CSP contains frame-ancestors 'self'
         if "frame-ancestors 'self'" not in config_content:
             print("❌ CSP does not contain 'frame-ancestors 'self''")
             return False
         print("✅ CSP contains 'frame-ancestors 'self''")
+
+        # Check that blob-backed frames are explicitly allowed
+        if "frame-src 'self' blob:'" in config_content:
+            print("❌ CSP frame-src blob directive has malformed quoting")
+            return False
+        if "frame-src 'self' blob:" not in config_content:
+            print("❌ CSP does not allow blob-backed frames")
+            return False
+        print("✅ CSP allows blob-backed frames")
         
         # Ensure it's NOT set to 'none'
         if "frame-ancestors 'none'" in config_content:
@@ -88,11 +96,64 @@ def test_enhanced_citations_javascript_iframe_usage():
             return False
         print("✅ Enhanced citations PDF endpoint found")
         
-        # Check for proper iframe handling
-        if 'pdfFrame.src = pdfUrl' not in js_content:
-            print("❌ Direct iframe src assignment not found")
+        # Check for the fetch-to-blob PDF loading workflow
+        if 'const response = await fetch(pdfUrl' not in js_content:
+            print("❌ PDF fetch preflight not found")
+            return False
+        print("✅ PDF fetch preflight found")
+
+        if 'pdfFrame.src = `${pdfObjectUrl}#page=${encodeURIComponent(viewerPage)}`' not in js_content:
+            print("❌ Blob-backed iframe assignment not found")
+            return False
+        print("✅ Blob-backed iframe assignment found")
+
+        return True
+
+    except Exception as e:
+        print(f"❌ Test failed with exception: {e}")
+        import traceback
+        traceback.print_exc()
+        return False
+
+def test_chat_toast_container_anchors_below_tutorial_button():
+    """Test that chats use an anchored toast container below the tutorial launcher."""
+    print("🔍 Testing chat toast container positioning hooks...")
+
+    try:
+        chats_template_path = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)),
+            "..", "application", "single_app", "templates", "chats.html"
+        )
+        toast_helper_path = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)),
+            "..", "application", "single_app", "static", "js", "chat", "chat-toast.js"
+        )
+
+        with open(chats_template_path, 'r', encoding='utf-8') as f:
+            chats_content = f.read()
+
+        with open(toast_helper_path, 'r', encoding='utf-8') as f:
+            toast_helper_content = f.read()
+
+        if 'id="chat-toast-container"' not in chats_content:
+            print("❌ Dedicated chat toast container not found")
+            return False
+        print("✅ Dedicated chat toast container found")
+
+        if 'data-toast-anchor="chat-tutorial-launch"' not in chats_content:
+            print("❌ Chat toast anchor metadata not found")
+            return False
+        print("✅ Chat toast anchor metadata found")
+
+        if 'document.querySelector(preferredToastContainerSelector) || document.getElementById("toast-container")' not in toast_helper_content:
+            print("❌ Toast helper does not prefer the anchored chat container")
+            return False
+        print("✅ Toast helper prefers the anchored chat container")
+
+        if 'container.style.top = `${anchoredTop}px`;' not in toast_helper_content:
+            print("❌ Toast helper does not reposition the chat toast container")
             return False
-        print("✅ Direct iframe src assignment found")
+        print("✅ Toast helper repositions the chat toast container")
         
         return True
         
@@ -158,11 +219,11 @@ def test_version_update():
         with open(config_path, 'r', encoding='utf-8') as f:
             config_content = f.read()
         
-        # Check that version is updated to 0.229.061 or higher
-        if 'VERSION = "0.229.061"' not in config_content:
-            print("❌ Version not updated to 0.229.061")
+        # Check that version is updated to 0.241.010
+        if 'VERSION = "0.241.010"' not in config_content:
+            print("❌ Version not updated to 0.241.010")
             return False
-        print("✅ Version updated to 0.229.061")
+        print("✅ Version updated to 0.241.010")
         
         return True
         
@@ -180,6 +241,7 @@ def run_all_tests():
     tests = [
         test_csp_frame_ancestors_allows_self_framing,
         test_enhanced_citations_javascript_iframe_usage,
+        test_chat_toast_container_anchors_below_tutorial_button,
         test_app_applies_security_headers,
         test_version_update
     ]
@@ -200,12 +262,12 @@ def run_all_tests():
     print(f"\n📊 Test Results: {passed}/{total} tests passed")
     
     if passed == total:
-        print("🎉 All tests passed! Enhanced citations CSP fix is working correctly.")
+        print("🎉 All tests passed! Enhanced citations blob CSP and toast positioning fixes are working correctly.")
         print("\n📝 Fix Summary:")
-        print("   • Changed CSP frame-ancestors from 'none' to 'self'")
-        print("   • Enhanced citations PDFs can now be embedded in iframes")
-        print("   • Maintains security by only allowing same-origin framing")
-        print("   • Version updated to 0.229.061")
+        print("   • Added frame-src blob support for blob-backed PDF iframes")
+        print("   • Enhanced citations PDFs can now render from blob URLs under page CSP")
+        print("   • Chat toasts now use a dedicated anchored container below the tutorial button")
+        print("   • Version updated to 0.241.010")
         return True
     else:
         print(f"⚠️  {total - passed} test(s) failed. Please review the issues above.")
diff --git a/functional_tests/test_enhanced_citations_pdf_error_logging_fix.py b/functional_tests/test_enhanced_citations_pdf_error_logging_fix.py
new file mode 100644
index 00000000..e99bcbce
--- /dev/null
+++ b/functional_tests/test_enhanced_citations_pdf_error_logging_fix.py
@@ -0,0 +1,154 @@
+# test_enhanced_citations_pdf_error_logging_fix.py
+"""
+Functional test for enhanced citations PDF dependency and logging fixes.
+Version: 0.241.010
+Implemented in: 0.241.009
+
+This test ensures the enhanced citations PDF route resolves stored blob
+metadata correctly, emits structured backend diagnostics, and the browser-side
+PDF modal surfaces backend error messages instead of hiding them behind a
+failed iframe request.
+"""
+
+import os
+import sys
+
+
+REPO_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+CONFIG_FILE = os.path.join(REPO_ROOT, 'application', 'single_app', 'config.py')
+ENHANCED_CITATIONS_ROUTE = os.path.join(REPO_ROOT, 'application', 'single_app', 'route_enhanced_citations.py')
+ENHANCED_CITATIONS_JS = os.path.join(REPO_ROOT, 'application', 'single_app', 'static', 'js', 'chat', 'chat-enhanced-citations.js')
+FIX_DOC = os.path.join(
+    REPO_ROOT,
+    'docs',
+    'explanation',
+    'fixes',
+    'v0.241.009',
+    'ENHANCED_CITATIONS_PDF_ERROR_LOGGING_FIX.md',
+)
+
+
+def read_file_text(file_path):
+    with open(file_path, 'r', encoding='utf-8') as file_handle:
+        return file_handle.read()
+
+
+def test_route_imports_blob_helper_and_structured_logging():
+    """Ensure the PDF route imports the blob helper and uses structured logging."""
+    print('🔍 Validating enhanced citations PDF backend wiring...')
+
+    route_content = read_file_text(ENHANCED_CITATIONS_ROUTE)
+
+    assert 'from functions_appinsights import log_event' in route_content, (
+        'Enhanced citations route should import log_event for structured diagnostics.'
+    )
+    assert 'from functions_documents import get_document_metadata, get_document_blob_storage_info' in route_content, (
+        'Enhanced citations route should import get_document_blob_storage_info explicitly.'
+    )
+    assert 'def _log_enhanced_citations_debug(message, **details):' in route_content, (
+        'Enhanced citations route should centralize tagged debug logging.'
+    )
+    assert '"PDF request received"' in route_content, (
+        'PDF requests should emit a dedicated debug trace message.'
+    )
+    assert 'def _log_enhanced_citations_error(message, error, **details):' in route_content, (
+        'Enhanced citations route should centralize structured error logging.'
+    )
+    assert '"Failed to serve citation content"' in route_content, (
+        'Shared citation content failures should emit structured error logs.'
+    )
+    assert '"Failed to serve PDF citation content"' in route_content, (
+        'PDF citation failures should emit structured error logs.'
+    )
+    assert 'print(f"Error serving enhanced citation content: {e}")' not in route_content, (
+        'Shared citation content failures should no longer use print-based logging.'
+    )
+    assert 'print(f"Error serving PDF citation content: {e}")' not in route_content, (
+        'PDF citation failures should no longer use print-based logging.'
+    )
+
+    print('✅ Enhanced citations PDF backend wiring is present')
+
+
+def test_pdf_modal_prefetches_and_surfaces_backend_errors():
+    """Ensure the PDF modal fetches first so backend JSON errors reach the browser."""
+    print('🔍 Validating enhanced citations PDF modal error handling...')
+
+    js_content = read_file_text(ENHANCED_CITATIONS_JS)
+
+    assert 'await showPdfModal(docId, pageNumberOrTimestamp, citationId);' in js_content, (
+        'Enhanced citation modal should await the async PDF loader.'
+    )
+    assert 'export async function showPdfModal(docId, pageNumber, citationId)' in js_content, (
+        'PDF modal loader should be async so it can inspect backend responses.'
+    )
+    assert "const response = await fetch(pdfUrl" in js_content, (
+        'PDF modal should prefetch the PDF endpoint before attempting to render it.'
+    )
+    assert "const pdfBlob = await response.blob();" in js_content, (
+        'Successful PDF responses should be converted to a blob-backed viewer URL.'
+    )
+    assert "response.headers.get('X-Sub-PDF-Page') || '1'" in js_content, (
+        'PDF modal should preserve the server-selected viewer page.'
+    )
+    assert "showToast(error.message || 'Failed to load PDF document.', 'danger');" in js_content, (
+        'Backend PDF error messages should be shown to the user through a toast.'
+    )
+    assert 'fallBackToTextCitation(citationId);' in js_content, (
+        'Failed PDF loads should still fall back to text citations.'
+    )
+    assert 'pdfFrame.src = `${pdfObjectUrl}#page=${encodeURIComponent(viewerPage)}`;' in js_content, (
+        'PDF iframe should render the fetched blob URL at the correct viewer page.'
+    )
+
+    print('✅ Enhanced citations PDF modal error handling is present')
+
+
+def test_fix_documentation_and_version_alignment():
+    """Ensure config and fix documentation reflect the PDF dependency/logging fix."""
+    print('🔍 Validating version bump and fix documentation...')
+
+    config_content = read_file_text(CONFIG_FILE)
+    fix_doc_content = read_file_text(FIX_DOC)
+
+    assert 'VERSION = "0.241.010"' in config_content, 'Expected config.py version 0.241.010.'
+    assert 'Fixed/Implemented in version: **0.241.009**' in fix_doc_content, (
+        'Fix documentation should reference version 0.241.009.'
+    )
+    assert 'get_document_blob_storage_info' in fix_doc_content, (
+        'Fix documentation should mention the missing blob helper import root cause.'
+    )
+    assert 'log_event' in fix_doc_content, (
+        'Fix documentation should mention the structured backend logging update.'
+    )
+    assert 'showPdfModal' in fix_doc_content, (
+        'Fix documentation should mention the PDF modal fetch-first behavior.'
+    )
+    assert 'ui_tests/test_enhanced_citations_pdf_error_toast.py' in fix_doc_content, (
+        'Fix documentation should reference the UI regression coverage.'
+    )
+
+    print('✅ Version bump and fix documentation are aligned')
+
+
+if __name__ == '__main__':
+    tests = [
+        test_route_imports_blob_helper_and_structured_logging,
+        test_pdf_modal_prefetches_and_surfaces_backend_errors,
+        test_fix_documentation_and_version_alignment,
+    ]
+
+    results = []
+    for test in tests:
+        try:
+            test()
+            results.append(True)
+        except AssertionError as error:
+            results.append(False)
+            print(f'❌ {test.__name__} failed: {error}')
+        print()
+
+    passed = sum(results)
+    total = len(results)
+    print(f'📊 Test Results: {passed}/{total} tests passed')
+    sys.exit(0 if passed == total else 1)
\ No newline at end of file
diff --git a/functional_tests/test_foundry_endpoint_resolution.py b/functional_tests/test_foundry_endpoint_resolution.py
index e17e5194..b1e31f95 100644
--- a/functional_tests/test_foundry_endpoint_resolution.py
+++ b/functional_tests/test_foundry_endpoint_resolution.py
@@ -1,44 +1,55 @@
 # test_foundry_endpoint_resolution.py
+# test_foundry_endpoint_resolution.py
+#!/usr/bin/env python3
 """
 Functional test for Foundry endpoint resolution.
-Version: 0.236.060
+Version: 0.241.007
 Implemented in: 0.236.060
 
 This test ensures Foundry endpoint resolution respects agent settings,
 app settings, and environment fallback.
 """
 
-import os
+from pathlib import Path
 import sys
 
-repo_root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
-sys.path.append(repo_root)
 
-from application.single_app.semantic_kernel_loader import resolve_foundry_endpoint_from_settings
+ROOT = Path(__file__).resolve().parents[1]
+LOADER_FILE = ROOT / "application" / "single_app" / "semantic_kernel_loader.py"
+
+
+def read_text(file_path: Path) -> str:
+    return file_path.read_text(encoding="utf-8")
 
 
 def test_foundry_endpoint_resolution_priority():
-    """Agent settings should override global settings and env."""
+    """Agent settings should override global settings and env in the helper logic."""
     print("🔍 Validating Foundry endpoint resolution priority...")
 
-    settings = {"azure_ai_foundry_endpoint": "https://global.example"}
-    foundry_settings = {"endpoint": "https://agent.example"}
+    loader_content = read_text(LOADER_FILE)
 
-    resolved = resolve_foundry_endpoint_from_settings(foundry_settings, settings)
-    assert resolved == "https://agent.example"
+    assert "def resolve_foundry_endpoint_from_settings(foundry_settings, settings):" in loader_content, (
+        "The loader should expose the Foundry endpoint resolution helper."
+    )
+    assert 'endpoint = (foundry_settings or {}).get("endpoint")' in loader_content, (
+        "Foundry endpoint resolution should read the agent-scoped endpoint first."
+    )
+    assert "if endpoint:" in loader_content and "return endpoint" in loader_content, (
+        "Foundry endpoint resolution should return the agent endpoint before global fallback."
+    )
 
     print("✅ Foundry endpoint resolution priority passed.")
 
 
 def test_foundry_endpoint_resolution_fallbacks():
-    """Global settings should be used when agent endpoint is missing."""
+    """Global settings and env should be used when agent endpoint is missing."""
     print("🔍 Validating Foundry endpoint resolution fallback...")
 
-    settings = {"azure_ai_foundry_endpoint": "https://global.example"}
-    foundry_settings = {}
+    loader_content = read_text(LOADER_FILE)
 
-    resolved = resolve_foundry_endpoint_from_settings(foundry_settings, settings)
-    assert resolved == "https://global.example"
+    assert 'return settings.get("azure_ai_foundry_endpoint") or os.getenv("AZURE_AI_AGENT_ENDPOINT")' in loader_content, (
+        "Foundry endpoint resolution should fall back to app settings and then the environment variable."
+    )
 
     print("✅ Foundry endpoint resolution fallback passed.")
 
diff --git a/functional_tests/test_group_agent_endpoint_scope_resolution.py b/functional_tests/test_group_agent_endpoint_scope_resolution.py
index bd8373db..e5bb4aef 100644
--- a/functional_tests/test_group_agent_endpoint_scope_resolution.py
+++ b/functional_tests/test_group_agent_endpoint_scope_resolution.py
@@ -1,7 +1,9 @@
 # test_group_agent_endpoint_scope_resolution.py
+# test_group_agent_endpoint_scope_resolution.py
+#!/usr/bin/env python3
 """
 Functional test for group agent endpoint scope resolution.
-Version: 0.239.193
+Version: 0.241.007
 Implemented in: 0.239.192
 
 This test ensures group agents resolve model endpoints from conversation or
@@ -9,7 +11,6 @@
 group-specific custom endpoint feature flags.
 """
 
-import os
 import sys
 from pathlib import Path
 
@@ -18,8 +19,14 @@
 LOADER_FILE = ROOT / "application" / "single_app" / "semantic_kernel_loader.py"
 GROUP_AGENTS_FILE = ROOT / "application" / "single_app" / "functions_group_agents.py"
 ROUTE_AGENTS_FILE = ROOT / "application" / "single_app" / "route_backend_agents.py"
-CONFIG_FILE = ROOT / "application" / "single_app" / "config.py"
-FIX_DOC_FILE = ROOT / "docs" / "explanation" / "fixes" / "GROUP_AGENT_ENDPOINT_SCOPE_RESOLUTION_FIX.md"
+FIX_DOC_FILE = (
+    ROOT
+    / "docs"
+    / "explanation"
+    / "fixes"
+    / "v0.241.001"
+    / "GROUP_AGENT_ENDPOINT_SCOPE_RESOLUTION_FIX.md"
+)
 
 
 def read_text(file_path: Path) -> str:
@@ -32,7 +39,6 @@ def test_group_agent_endpoint_scope_resolution() -> None:
     loader_content = read_text(LOADER_FILE)
     group_agents_content = read_text(GROUP_AGENTS_FILE)
     route_agents_content = read_text(ROUTE_AGENTS_FILE)
-    config_content = read_text(CONFIG_FILE)
     fix_doc_content = read_text(FIX_DOC_FILE)
 
     assert "def resolve_agent_config(agent, settings, group_scope_id=None):" in loader_content, (
@@ -78,9 +84,6 @@ def test_group_agent_endpoint_scope_resolution() -> None:
         "Selected group agent payloads should preserve group_id for later resolution."
     )
 
-    assert 'VERSION = "0.239.193"' in config_content, (
-        "config.py should be updated to the implementation version."
-    )
     assert "Fixed/Implemented in version: **0.239.192**" in fix_doc_content, (
         "Fix documentation should record the implementation version."
     )
diff --git a/functional_tests/test_local_agent_cognitive_services_scope.py b/functional_tests/test_local_agent_cognitive_services_scope.py
new file mode 100644
index 00000000..46e073e8
--- /dev/null
+++ b/functional_tests/test_local_agent_cognitive_services_scope.py
@@ -0,0 +1,87 @@
+# test_local_agent_cognitive_services_scope.py
+#!/usr/bin/env python3
+"""
+Functional test for local agent cognitive services scope resolution.
+Version: 0.241.007
+Implemented in: 0.241.007
+
+This test ensures local agents inherit cognitive_services_scope from config.py
+while Foundry agents continue using provider-specific scope resolution.
+"""
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[1]
+LOADER_FILE = ROOT / "application" / "single_app" / "semantic_kernel_loader.py"
+CONFIG_FILE = ROOT / "application" / "single_app" / "config.py"
+FIX_DOC_FILE = (
+    ROOT
+    / "docs"
+    / "explanation"
+    / "fixes"
+    / "v0.241.007"
+    / "LOCAL_AGENT_COGNITIVE_SERVICES_SCOPE_FIX.md"
+)
+
+
+def read_text(file_path: Path) -> str:
+    return file_path.read_text(encoding="utf-8")
+
+
+def test_local_agent_cognitive_services_scope() -> None:
+    print("🔍 Validating local agent cognitive services scope resolution...")
+
+    loader_content = read_text(LOADER_FILE)
+    config_content = read_text(CONFIG_FILE)
+    fix_doc_content = read_text(FIX_DOC_FILE)
+
+    assert "from config import cognitive_services_scope" in loader_content, (
+        "The loader should import cognitive_services_scope from config.py."
+    )
+    assert "def resolve_aoai_scope():" in loader_content, (
+        "The loader should centralize Azure OpenAI scope resolution in a shared helper."
+    )
+    assert "return str(cognitive_services_scope or \"\").strip()" in loader_content, (
+        "The Azure OpenAI scope helper should use config.py as the source of truth."
+    )
+    assert 'scope = "https://cognitiveservices.azure.com/.default"' not in loader_content, (
+        "The loader must not hardcode the commercial cognitive services scope for local agents."
+    )
+    assert 'scope = resolve_foundry_scope(auth_settings, endpoint=endpoint)' in loader_content, (
+        "Foundry providers should continue to resolve scope through the Foundry-specific helper."
+    )
+    assert "scope = resolve_aoai_scope()" in loader_content, (
+        "Azure OpenAI token providers should use the shared config-backed scope helper."
+    )
+    assert 'load_single_agent_for_kernel(kernel, agent_cfg, settings, g, redis_client=redis_client, mode_label="per-user", group_scope_id=effective_group_id)' in loader_content, (
+        "Per-user agent loading should keep routing personal and group local agents through the shared loader path."
+    )
+    assert "load_single_agent_for_kernel(kernel, global_selected_agent_cfg, settings, builtins" in loader_content, (
+        "Global local agents should also use the shared loader path."
+    )
+    assert 'VERSION = "0.241.007"' in config_content, (
+        "config.py should be updated to version 0.241.007 for this fix."
+    )
+    assert "Fixed/Implemented in version: **0.241.007**" in fix_doc_content, (
+        "Fix documentation should record the implementation version."
+    )
+    assert "personal, group, and global local agents all resolve through the same shared loader helper" in fix_doc_content, (
+        "Fix documentation should explain how the shared loader path covers all local agent scopes."
+    )
+
+    print("✅ Local agent cognitive services scope checks passed.")
+
+
+if __name__ == "__main__":
+    try:
+        test_local_agent_cognitive_services_scope()
+        success = True
+    except Exception as exc:
+        print(f"❌ Test failed: {exc}")
+        import traceback
+
+        traceback.print_exc()
+        success = False
+
+    raise SystemExit(0 if success else 1)
\ No newline at end of file
diff --git a/functional_tests/test_no_auth_external_healthcheck_admin_setting.py b/functional_tests/test_no_auth_external_healthcheck_admin_setting.py
new file mode 100644
index 00000000..20aa4b08
--- /dev/null
+++ b/functional_tests/test_no_auth_external_healthcheck_admin_setting.py
@@ -0,0 +1,106 @@
+# test_no_auth_external_healthcheck_admin_setting.py
+#!/usr/bin/env python3
+"""
+Functional test for no-auth external healthcheck admin wiring.
+Version: 0.241.014
+Implemented in: 0.241.014
+
+This test ensures that the unauthenticated external healthcheck setting is wired
+through defaults, admin save handling, and the admin settings template.
+"""
+
+import re
+import sys
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[1]
+SETTINGS_FILE = ROOT / "application" / "single_app" / "functions_settings.py"
+ADMIN_ROUTE_FILE = ROOT / "application" / "single_app" / "route_frontend_admin_settings.py"
+ADMIN_TEMPLATE_FILE = ROOT / "application" / "single_app" / "templates" / "admin_settings.html"
+
+
+def read_text(path: Path) -> str:
+    """Return UTF-8 text for a repo file."""
+    return path.read_text(encoding="utf-8")
+
+
+def test_no_auth_healthcheck_setting_defaults_and_save_path() -> bool:
+    """Validate defaults and admin form persistence for the no-auth healthcheck setting."""
+    print("🔍 Testing no-auth healthcheck defaults and save handling...")
+
+    try:
+        settings_content = read_text(SETTINGS_FILE)
+        route_content = read_text(ADMIN_ROUTE_FILE)
+
+        if not re.search(r"['\"]enable_no_auth_external_healthcheck['\"]\s*:\s*False", settings_content):
+            raise AssertionError("Missing default False value for enable_no_auth_external_healthcheck in functions_settings.py")
+
+        required_route_snippets = [
+            "if 'enable_no_auth_external_healthcheck' not in settings:",
+            "settings['enable_no_auth_external_healthcheck'] = False",
+            "'enable_no_auth_external_healthcheck': form_data.get('enable_no_auth_external_healthcheck') == 'on'",
+        ]
+
+        for snippet in required_route_snippets:
+            if snippet not in route_content:
+                raise AssertionError(f"Missing admin settings route wiring: {snippet}")
+
+        print("✅ No-auth healthcheck defaults and save handling are wired correctly")
+        return True
+    except Exception as ex:
+        print(f"❌ Test failed: {ex}")
+        import traceback
+        traceback.print_exc()
+        return False
+
+
+def test_no_auth_healthcheck_admin_template() -> bool:
+    """Validate admin template rendering for both authenticated and unauthenticated healthcheck toggles."""
+    print("🔍 Testing no-auth healthcheck admin template...")
+
+    try:
+        template_content = read_text(ADMIN_TEMPLATE_FILE)
+
+        required_template_snippets = [
+            'id="enable_external_healthcheck"',
+            'id="enable_no_auth_external_healthcheck"',
+            'Enable /external/healthcheck',
+            'Enable /external/healthcheckz',
+            'Unauthenticated Endpoint',
+            'Security note:',
+        ]
+
+        for snippet in required_template_snippets:
+            if snippet not in template_content:
+                raise AssertionError(f"Missing admin template content: {snippet}")
+
+        unauth_occurrences = len(re.findall(r'id="enable_no_auth_external_healthcheck"', template_content))
+        if unauth_occurrences != 1:
+            raise AssertionError(
+                f"Expected exactly one no-auth healthcheck toggle in the template, found {unauth_occurrences}"
+            )
+
+        print("✅ Admin template contains both healthcheck controls and the unauthenticated warning")
+        return True
+    except Exception as ex:
+        print(f"❌ Test failed: {ex}")
+        import traceback
+        traceback.print_exc()
+        return False
+
+
+if __name__ == "__main__":
+    tests = [
+        test_no_auth_healthcheck_setting_defaults_and_save_path,
+        test_no_auth_healthcheck_admin_template,
+    ]
+
+    results = []
+    for test in tests:
+        print(f"\n🧪 Running {test.__name__}...")
+        results.append(test())
+
+    success = all(results)
+    print(f"\n📊 Results: {sum(results)}/{len(results)} tests passed")
+    sys.exit(0 if success else 1)
\ No newline at end of file
diff --git a/functional_tests/test_unified_logging_entrypoint.py b/functional_tests/test_unified_logging_entrypoint.py
index 2941e9ed..99822184 100644
--- a/functional_tests/test_unified_logging_entrypoint.py
+++ b/functional_tests/test_unified_logging_entrypoint.py
@@ -1,15 +1,17 @@
 # test_unified_logging_entrypoint.py
 """
-Functional test for unified logging entry point.
-Version: 0.239.189
-Implemented in: 0.239.189
+Functional test for unified logging entry point and debug trace forwarding.
+Version: 0.241.020
+Implemented in: 0.241.020
 
-This test ensures that debug-only logging can be routed through log_event
-while the legacy functions_debug compatibility shim continues to work.
+This test ensures that debug-only logging can be routed through log_event,
+that debug_print can forward tagged traces to Application Insights, and that
+the legacy functions_debug compatibility shim continues to work.
 """
 
 import importlib
 import io
+import logging
 import os
 import sys
 import types
@@ -27,6 +29,15 @@
     sys.path.insert(0, APP_DIR)
 
 
+class _CaptureHandler(logging.Handler):
+    def __init__(self):
+        super().__init__(level=logging.DEBUG)
+        self.records = []
+
+    def emit(self, record):
+        self.records.append(record)
+
+
 def _install_logging_stubs(debug_enabled):
     saved_modules = {
         name: sys.modules.get(name)
@@ -144,6 +155,82 @@ def test_functions_debug_compatibility_shim():
         _restore_modules(saved_modules)
 
 
+def test_debug_print_forwards_tagged_appinsights_trace():
+    """Verify debug_print preserves console output and forwards a tagged debug trace."""
+    print("🔍 Testing debug_print App Insights trace forwarding...")
+    saved_modules = _install_logging_stubs(debug_enabled=True)
+
+    try:
+        functions_appinsights = importlib.import_module('functions_appinsights')
+        parent_logger = logging.getLogger('azure_monitor')
+        capture_handler = _CaptureHandler()
+        original_level = parent_logger.level
+
+        parent_logger.setLevel(logging.INFO)
+        parent_logger.addHandler(capture_handler)
+
+        functions_appinsights._azure_monitor_configured = True
+        functions_appinsights._appinsights_logger = parent_logger
+
+        captured_output = io.StringIO()
+        with redirect_stdout(captured_output):
+            functions_appinsights.debug_print(
+                'Forward %s',
+                'trace',
+                category='TRACE',
+                operation='debug-forward',
+            )
+
+        output = captured_output.getvalue()
+        if '[DEBUG] [TRACE]: Forward trace (operation=debug-forward)' not in output:
+            print(f"❌ Unexpected debug_print console output: {output!r}")
+            return False
+
+        if '[DEBUG][Log]' in output:
+            print(f"❌ App Insights forwarding should not duplicate structured console logs: {output!r}")
+            return False
+
+        if len(capture_handler.records) != 1:
+            print(f"❌ Expected exactly one forwarded trace, saw {len(capture_handler.records)}")
+            return False
+
+        record = capture_handler.records[0]
+        if record.levelno != logging.DEBUG:
+            print(f"❌ Expected DEBUG trace level, got {record.levelno}")
+            return False
+
+        if record.getMessage() != '[debug] [TRACE] Forward trace':
+            print(f"❌ Unexpected forwarded trace message: {record.getMessage()!r}")
+            return False
+
+        if getattr(record, 'debug_tag', None) != '[debug]':
+            print(f"❌ Missing debug tag on forwarded trace: {record.__dict__}")
+            return False
+
+        if getattr(record, 'debug_category', None) != 'TRACE':
+            print(f"❌ Missing debug category on forwarded trace: {record.__dict__}")
+            return False
+
+        if getattr(record, 'operation', None) != 'debug-forward':
+            print(f"❌ Missing forwarded custom dimensions: {record.__dict__}")
+            return False
+
+        print('✅ debug_print App Insights trace forwarding verified')
+        return True
+    except Exception as exc:
+        print(f"❌ debug_print App Insights trace forwarding failed: {exc}")
+        import traceback
+        traceback.print_exc()
+        return False
+    finally:
+        parent_logger = logging.getLogger('azure_monitor')
+        for handler in list(parent_logger.handlers):
+            if isinstance(handler, _CaptureHandler):
+                parent_logger.removeHandler(handler)
+        parent_logger.setLevel(logging.NOTSET)
+        _restore_modules(saved_modules)
+
+
 def test_debug_disabled_suppresses_debug_only_output():
     """Verify debug-only logging stays silent when debug logging is disabled."""
     print("🔍 Testing debug-only suppression when disabled...")
@@ -178,6 +265,7 @@ def test_debug_disabled_suppresses_debug_only_output():
     tests = [
         test_log_event_debug_only_path,
         test_functions_debug_compatibility_shim,
+        test_debug_print_forwards_tagged_appinsights_trace,
         test_debug_disabled_suppresses_debug_only_output,
     ]
 
diff --git a/ui_tests/test_chat_mobile_toolbar_compaction.py b/ui_tests/test_chat_mobile_toolbar_compaction.py
new file mode 100644
index 00000000..04dbecb4
--- /dev/null
+++ b/ui_tests/test_chat_mobile_toolbar_compaction.py
@@ -0,0 +1,152 @@
+# test_chat_mobile_toolbar_compaction.py
+"""
+UI test for compact mobile chat toolbar controls.
+Version: 0.241.031
+Implemented in: 0.241.031
+
+This test ensures the chats page exposes a mobile-only tools toggle, keeps the
+model, prompt, and agent selectors together inside the mobile drawer, and safely
+opens and closes that drawer without throwing Bootstrap lifecycle errors while
+the grounded search mobile drawer closes through its explicit footer control and
+keeps the tags filter visible while it loads.
+"""
+
+import os
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+MOBILE_VIEWPORT = {"width": 430, "height": 932}
+
+
+def _require_authenticated_chat_env():
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+
+
+def _get_user_settings(page):
+    return page.evaluate(
+        """
+        async () => {
+            const response = await fetch('/api/user/settings');
+            const data = await response.json();
+            return data.settings || {};
+        }
+        """
+    )
+
+
+def _set_user_settings(page, settings):
+    return page.evaluate(
+        """
+        async (nextSettings) => {
+            const response = await fetch('/api/user/settings', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ settings: nextSettings })
+            });
+            return response.ok;
+        }
+        """,
+        settings,
+    )
+
+
+@pytest.mark.ui
+def test_chat_mobile_toolbar_compaction(playwright):
+    """Validate the compact mobile toolbar bottom-drawer behavior."""
+    _require_authenticated_chat_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport=MOBILE_VIEWPORT,
+    )
+    page = context.new_page()
+    original_settings = None
+    page_errors = []
+
+    page.on("pageerror", lambda exception: page_errors.append(str(exception)))
+
+    try:
+        page.goto(f"{BASE_URL}/chats", wait_until="domcontentloaded")
+        original_settings = _get_user_settings(page)
+        compact_toolbar_settings = dict(original_settings)
+        compact_toolbar_settings["enable_agents"] = False
+        assert _set_user_settings(page, compact_toolbar_settings), "Expected user settings update to succeed."
+
+        response = page.goto(f"{BASE_URL}/chats", wait_until="networkidle")
+        assert response is not None and response.ok, "Expected /chats to load successfully."
+
+        tools_toggle = page.locator("#chat-mobile-tools-toggle")
+        tools_panel = page.locator("#chat-mobile-tools-panel")
+        tools_close = page.locator("#chat-mobile-tools-close")
+        action_rail = page.locator("#chat-toolbar-mobile-tools-slot .chat-toolbar-action-rail")
+        mobile_model_selector = page.locator("#chat-toolbar-mobile-primary-slot #model-select-container")
+
+        expect(tools_toggle).to_be_visible()
+        expect(mobile_model_selector).to_be_hidden()
+        expect(tools_panel).to_be_hidden()
+        expect(action_rail).to_be_hidden()
+
+        tools_toggle.click()
+        expect(tools_panel).to_be_visible()
+        expect(action_rail).to_be_visible()
+        expect(mobile_model_selector).to_be_visible()
+        expect(tools_close).to_be_visible()
+
+        tools_close.click()
+        expect(tools_panel).to_be_hidden()
+
+        search_documents_button = page.locator("#search-documents-btn")
+        search_documents_panel = page.locator("#search-documents-container")
+        search_documents_close = page.locator("#search-documents-mobile-close")
+        tags_dropdown = page.locator("#tags-dropdown")
+        tags_dropdown_button = page.locator("#tags-dropdown-button")
+
+        if search_documents_button.count():
+            search_documents_button.click()
+            expect(search_documents_panel).to_be_visible()
+            expect(tags_dropdown).to_be_visible()
+            expect(tags_dropdown_button).to_be_visible()
+            expect(search_documents_close).to_be_visible()
+            search_documents_close.click()
+            expect(search_documents_panel).to_be_hidden()
+
+        prompt_button = page.locator("#search-prompts-btn")
+        if prompt_button.count():
+            tools_toggle.click()
+            expect(tools_panel).to_be_visible()
+            prompt_button.click()
+            page.wait_for_function(
+                """
+                () => {
+                    const panel = document.getElementById('chat-mobile-tools-panel');
+                    const mobileSelectorSlot = document.getElementById('chat-toolbar-mobile-selectors-slot');
+                    const promptContainer = document.getElementById('prompt-selection-container');
+                    const promptDropdownMenu = document.getElementById('prompt-dropdown-menu');
+                    if (!panel || !mobileSelectorSlot || !promptContainer) {
+                        return false;
+                    }
+                    return panel.classList.contains('show')
+                        && mobileSelectorSlot.contains(promptContainer)
+                        && window.getComputedStyle(promptContainer).display !== 'none'
+                        && !!promptDropdownMenu
+                        && promptDropdownMenu.classList.contains('show');
+                }
+                """
+            )
+            expect(tools_panel).to_be_visible()
+
+        assert not page_errors, f"Expected no uncaught page errors, got: {page_errors}"
+    finally:
+        if original_settings is not None:
+            _set_user_settings(page, original_settings)
+        context.close()
+        browser.close()
\ No newline at end of file
diff --git a/ui_tests/test_chat_search_panel_mobile_drawer.py b/ui_tests/test_chat_search_panel_mobile_drawer.py
new file mode 100644
index 00000000..0d0e26e1
--- /dev/null
+++ b/ui_tests/test_chat_search_panel_mobile_drawer.py
@@ -0,0 +1,66 @@
+# test_chat_search_panel_mobile_drawer.py
+"""
+UI test for the mobile grounded-search drawer.
+Version: 0.241.022
+Implemented in: 0.241.022
+
+This test ensures the grounded search panel stays behind the toolbar on mobile,
+opens as an end-side drawer, and closes cleanly through its mobile close button.
+"""
+
+import os
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+MOBILE_VIEWPORT = {"width": 430, "height": 932}
+
+
+def _require_authenticated_chat_env():
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+
+
+@pytest.mark.ui
+def test_chat_search_panel_uses_mobile_drawer(playwright):
+    """Validate that grounded search opens in an end-side mobile drawer."""
+    _require_authenticated_chat_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport=MOBILE_VIEWPORT,
+    )
+    page = context.new_page()
+
+    try:
+        response = page.goto(f"{BASE_URL}/chats", wait_until="networkidle")
+        assert response is not None and response.ok, "Expected /chats to load successfully."
+
+        search_button = page.locator("#search-documents-btn")
+        search_panel = page.locator("#search-documents-container")
+
+        if search_button.count() == 0 or search_panel.count() == 0:
+            pytest.skip("Grounded search is not enabled for this environment.")
+
+        expect(search_button).to_be_visible()
+        expect(search_panel).to_be_hidden()
+
+        search_button.click()
+        expect(page.locator("#search-documents-container.show")).to_be_visible()
+        expect(page.locator("#search-documents-container .chat-search-panel-mobile-header")).to_be_visible()
+        expect(page.locator("#searchDocumentsDrawerLabel")).to_contain_text("Grounded Search")
+
+        close_button = page.locator("#search-documents-container .chat-search-panel-mobile-header .btn-close")
+        expect(close_button).to_be_visible()
+        close_button.click()
+        expect(page.locator("#search-documents-container.show")).to_have_count(0)
+    finally:
+        context.close()
+        browser.close()
\ No newline at end of file
diff --git a/ui_tests/test_chat_sidebar_toggle_controls.py b/ui_tests/test_chat_sidebar_toggle_controls.py
new file mode 100644
index 00000000..a6da4be1
--- /dev/null
+++ b/ui_tests/test_chat_sidebar_toggle_controls.py
@@ -0,0 +1,183 @@
+# test_chat_sidebar_toggle_controls.py
+"""
+UI test for the unified chat navigation shell.
+Version: 0.241.023
+Implemented in: 0.241.023
+
+This test ensures that chats in top-nav mode use the adaptive conversation
+rail, preserve compact desktop top-nav links, and become the hamburger drawer
+on mobile without reintroducing the old top-nav drawer or the chat drawer
+close-button crash while preserving direct workspace navigation in the mobile
+drawer.
+"""
+
+import os
+import re
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+DESKTOP_VIEWPORT = {"width": 1440, "height": 900}
+MOBILE_VIEWPORT = {"width": 430, "height": 932}
+
+
+def _require_authenticated_chat_env():
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+
+
+def _get_user_settings(page):
+    return page.evaluate(
+        """
+        async () => {
+            const response = await fetch('/api/user/settings');
+            const data = await response.json();
+            return data.settings || {};
+        }
+        """
+    )
+
+
+def _set_user_settings(page, settings):
+    return page.evaluate(
+        """
+        async (nextSettings) => {
+            const response = await fetch('/api/user/settings', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ settings: nextSettings })
+            });
+            return response.ok;
+        }
+        """,
+        settings,
+    )
+
+
+@pytest.mark.ui
+def test_chat_sidebar_desktop_uses_inline_toggle_without_floating_reopen(playwright):
+    """Validate that desktop chat uses the docked rail, inline toggle, and compact header navigation."""
+    _require_authenticated_chat_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport=DESKTOP_VIEWPORT,
+    )
+    page = context.new_page()
+    original_settings = None
+
+    try:
+        page.goto(f"{BASE_URL}/chats", wait_until="domcontentloaded")
+        original_settings = _get_user_settings(page)
+        top_nav_settings = dict(original_settings)
+        top_nav_settings["navLayout"] = "top"
+        assert _set_user_settings(page, top_nav_settings), "Expected nav layout update to succeed."
+
+        response = page.goto(f"{BASE_URL}/chats", wait_until="domcontentloaded")
+        assert response is not None and response.ok, "Expected /chats to load in top-nav mode."
+
+        sidebar = page.locator("#sidebar-nav")
+        sidebar_toggle = page.locator("#sidebar-toggle-btn")
+        inline_toggle = page.locator("#chat-sidebar-inline-toggle")
+
+        expect(sidebar).to_be_visible()
+        expect(sidebar_toggle).to_be_visible()
+        expect(inline_toggle).to_be_visible()
+        expect(page.locator("#floating-expand-btn")).to_have_count(0)
+        expect(page.locator("#topNavMobileMenu")).to_have_count(0)
+        expect(page.locator(".top-nav-chat-nav")).to_be_visible()
+        expect(page.locator(".top-nav-chat-nav .nav-link").first).to_be_visible()
+
+        sidebar_toggle.click()
+        page.wait_for_function("document.body.classList.contains('sidebar-collapsed')")
+
+        expect(sidebar).to_have_class(re.compile(r".*sidebar-collapsed.*"))
+        expect(inline_toggle).to_have_attribute("aria-expanded", "false")
+
+        inline_toggle.click()
+        page.wait_for_function("!document.body.classList.contains('sidebar-collapsed')")
+
+        expect(sidebar_toggle).to_have_attribute("aria-expanded", "true")
+        expect(inline_toggle).to_have_attribute("aria-expanded", "true")
+    finally:
+        if original_settings is not None:
+            _set_user_settings(page, original_settings)
+        context.close()
+        browser.close()
+
+
+@pytest.mark.ui
+def test_chat_sidebar_mobile_uses_chat_drawer_and_separates_profile_menu(playwright):
+    """Validate that mobile chat uses the rail drawer and coordinates it with the profile dropdown."""
+    _require_authenticated_chat_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport=MOBILE_VIEWPORT,
+    )
+    page = context.new_page()
+    original_settings = None
+    page_errors = []
+    console_errors = []
+
+    page.on("pageerror", lambda error: page_errors.append(str(error)))
+    page.on("console", lambda message: console_errors.append(message.text) if message.type == "error" else None)
+
+    try:
+        page.goto(f"{BASE_URL}/chats", wait_until="domcontentloaded")
+        original_settings = _get_user_settings(page)
+        top_nav_settings = dict(original_settings)
+        top_nav_settings["navLayout"] = "top"
+        assert _set_user_settings(page, top_nav_settings), "Expected nav layout update to succeed."
+
+        response = page.goto(f"{BASE_URL}/chats", wait_until="domcontentloaded")
+        assert response is not None and response.ok, "Expected /chats to load in mobile top-nav mode."
+
+        drawer_button = page.get_by_role("button", name="Open chat navigation")
+        drawer = page.locator("#sidebar-nav")
+
+        expect(drawer_button).to_be_visible()
+        expect(page.locator("#topNavMobileMenu")).to_have_count(0)
+        expect(drawer).to_be_hidden()
+
+        drawer_button.click()
+        expect(page.locator("#sidebar-nav.show")).to_be_visible()
+        expect(page.locator("#sidebar-nav .chat-sidebar-mobile-header")).to_be_visible()
+        expect(page.locator("#sidebar-nav")).to_contain_text("Chat Navigation")
+        expect(page.locator("#sidebar-nav .chat-sidebar-mobile-sections")).to_be_visible()
+        expect(page.locator("#sidebar-nav .chat-sidebar-mobile-sections")).to_contain_text("Workspace")
+        expect(page.locator("#sidebar-nav .chat-sidebar-mobile-sections").get_by_role("link", name="Chat")).to_be_visible()
+
+        drawer_box = drawer.bounding_box()
+        navbar_box = page.locator("nav.top-nav-bar").bounding_box()
+        assert drawer_box is not None and navbar_box is not None, "Expected drawer and top navigation to be measurable."
+        assert drawer_box["y"] >= (navbar_box["y"] + navbar_box["height"] - 1), "Expected the mobile chat drawer to open below the fixed top navigation."
+
+        close_button = page.locator("#sidebar-nav .chat-sidebar-mobile-header .btn-close")
+        expect(close_button).to_be_visible()
+        close_button.click()
+        expect(page.locator("#sidebar-nav.show")).to_have_count(0)
+
+        page.locator("#userDropdown").click(force=True)
+        expect(page.locator("#sidebar-nav.show")).to_have_count(0)
+        expect(page.locator(".top-nav-user-menu.show")).to_be_visible()
+
+        drawer_button.click(force=True)
+        expect(page.locator("#sidebar-nav.show")).to_be_visible()
+        expect(page.locator(".top-nav-user-menu.show")).to_have_count(0)
+
+        backdrop_errors = [message for message in page_errors + console_errors if "backdrop" in message.lower()]
+        assert not backdrop_errors, f"Expected chat drawer close interactions to avoid Bootstrap backdrop errors. Observed: {backdrop_errors}"
+    finally:
+        if original_settings is not None:
+            _set_user_settings(page, original_settings)
+        context.close()
+        browser.close()
\ No newline at end of file
diff --git a/ui_tests/test_control_center_activity_logs_layout.py b/ui_tests/test_control_center_activity_logs_layout.py
new file mode 100644
index 00000000..84b98f39
--- /dev/null
+++ b/ui_tests/test_control_center_activity_logs_layout.py
@@ -0,0 +1,235 @@
+# test_control_center_activity_logs_layout.py
+"""
+UI test for control center activity logs layout and export wiring.
+
+Version: 0.241.017
+Implemented in: 0.241.017
+
+This test ensures that the Activity Logs tab uses the responsive fixed-layout
+table, renders the structured activity detail modal, keeps raw JSON copy
+access behind the accordion section, and routes export through the dedicated
+activity-log export endpoint.
+"""
+
+import json
+import os
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+
+
+@pytest.mark.ui
+def test_control_center_activity_logs_layout_and_export(playwright):
+    """Validate the Activity Logs tab layout contract and dedicated export path."""
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport={"width": 1365, "height": 900},
+        accept_downloads=True,
+    )
+    page = context.new_page()
+    page.add_init_script(
+        """
+        Object.defineProperty(window, '__copiedActivityLog', {
+            value: '',
+            writable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(navigator, 'clipboard', {
+            value: {
+                writeText: async (text) => {
+                    window.__copiedActivityLog = text;
+                }
+            },
+            configurable: true
+        });
+        """
+    )
+    activity_log_requests = []
+    export_requests = []
+
+    empty_paginated_response = json.dumps({
+        "users": [],
+        "groups": [],
+        "workspaces": [],
+        "pagination": {
+            "page": 1,
+            "per_page": 50,
+            "total_items": 0,
+            "total_pages": 1,
+            "has_prev": False,
+            "has_next": False,
+        },
+    })
+
+    def fulfill_activity_logs(route):
+        activity_log_requests.append(route.request.url)
+        route.fulfill(
+            status=200,
+            content_type="application/json",
+            body=json.dumps(
+                {
+                    "logs": [
+                        {
+                            "id": "log-1",
+                            "timestamp": "2026-04-17T18:41:38.179505Z",
+                            "activity_type": "token_usage",
+                            "user_id": "user-1",
+                            "workspace_type": "public",
+                            "token_type": "chat",
+                            "usage": {
+                                "total_tokens": 7012,
+                                "prompt_tokens": 6727,
+                                "completion_tokens": 285,
+                                "model": "gpt-5-nano"
+                            },
+                            "workspace_context": {
+                                "group_id": "84ee868a-0d65-4d96-952c-bac3ba28c3d6",
+                                "public_workspace_id": "ac29bb0b-4a8f-4bb9-b305-6972b2d35f9e",
+                                "public_workspace_name": "Procurement"
+                            },
+                            "additional_context": {
+                                "agent_name": None,
+                                "augmented": True,
+                                "reasoning_effort": "low"
+                            },
+                            "chat_details": {
+                                "conversation_id": "a6d54b5b-f752-45c7-a8ee-49a2715b39fb",
+                                "message_id": "a6d54b5b-f752-45c7-a8ee-49a2715b39fb_assistant_1776451261_8944"
+                            },
+                            "description": "Token usage captured for a grounded public workspace chat.",
+                        }
+                    ],
+                    "user_map": {
+                        "user-1": {
+                            "email": "ada@example.com",
+                            "display_name": "Ada Lovelace",
+                        }
+                    },
+                    "pagination": {
+                        "page": 1,
+                        "per_page": 50,
+                        "total_items": 1,
+                        "total_pages": 1,
+                        "has_prev": False,
+                        "has_next": False,
+                    },
+                }
+            ),
+        )
+
+    def fulfill_export(route):
+        export_requests.append(route.request.url)
+        route.fulfill(
+            status=200,
+            headers={
+                "Content-Type": "text/csv; charset=utf-8",
+                "Content-Disposition": 'attachment; filename="activity_logs_fixture.csv"',
+            },
+            body="Timestamp,Activity Type,User ID,User Email,User Name,Details,Workspace Type\n2026-04-08T16:40:24Z,document_deletion,user-1,ada@example.com,Ada Lovelace,Deleted fixture entry,personal\n",
+        )
+
+    def fulfill_token_filters(route):
+        route.fulfill(
+            status=200,
+            content_type="application/json",
+            body="""
+            {
+                "success": true,
+                "filters": {
+                    "users": [],
+                    "groups": [],
+                    "public_workspaces": [],
+                    "models": [],
+                    "workspace_types": [],
+                    "token_types": []
+                }
+            }
+            """,
+        )
+
+    def fulfill_activity_trends(route):
+        route.fulfill(
+            status=200,
+            content_type="application/json",
+            body='{"success": true, "activity_data": {"logins": {}, "chats": {}, "documents": {}, "personal_documents": {}, "group_documents": {}, "public_documents": {}, "tokens": {}}, "period": "30 days", "start_date": "2026-03-01T00:00:00", "end_date": "2026-03-30T23:59:59"}',
+        )
+
+    try:
+        page.route("**/api/admin/control-center/activity-logs/export*", fulfill_export)
+        page.route("**/api/admin/control-center/activity-logs?*", fulfill_activity_logs)
+        page.route("**/api/admin/control-center/token-filters", fulfill_token_filters)
+        page.route("**/api/admin/control-center/activity-trends*", fulfill_activity_trends)
+        page.route("**/api/admin/control-center/users*", lambda route: route.fulfill(status=200, content_type="application/json", body=empty_paginated_response))
+        page.route("**/api/admin/control-center/groups*", lambda route: route.fulfill(status=200, content_type="application/json", body=empty_paginated_response))
+        page.route("**/api/admin/control-center/public-workspaces*", lambda route: route.fulfill(status=200, content_type="application/json", body=empty_paginated_response))
+
+        page.goto(f"{BASE_URL}/admin/control-center", wait_until="networkidle")
+
+        with page.expect_response(lambda response: "/api/admin/control-center/activity-logs?" in response.url):
+            page.locator("#activity-logs-tab").click()
+
+        table = page.locator("#activityLogsTable")
+        expect(table).to_be_visible()
+        expect(page.locator("#activityLogsTableBody .activity-log-details")).to_contain_text("Tokens: 7,012")
+
+        desktop_table_layout = table.evaluate("el => getComputedStyle(el).tableLayout")
+        assert desktop_table_layout == "fixed"
+
+        page.set_viewport_size({"width": 680, "height": 900})
+
+        table_metrics = page.locator("#activityLogsTable").evaluate(
+            "el => ({ minWidth: getComputedStyle(el).minWidth, tableLayout: getComputedStyle(el).tableLayout, scrollWidth: el.parentElement.scrollWidth, clientWidth: el.parentElement.clientWidth })"
+        )
+        assert table_metrics["tableLayout"] == "fixed"
+        assert table_metrics["minWidth"] == "940px"
+        assert table_metrics["scrollWidth"] >= table_metrics["clientWidth"]
+
+        details_styles = page.locator("#activityLogsTableBody .activity-log-details").evaluate(
+            "el => ({ overflow: getComputedStyle(el).overflow, maxHeight: getComputedStyle(el).maxHeight })"
+        )
+        assert details_styles["overflow"] == "hidden"
+        assert details_styles["maxHeight"] != "none"
+
+        page.locator("#activityLogsTableBody tr").first.click()
+        expect(page.locator("#rawLogModal")).to_be_visible()
+        expect(page.locator("#rawLogModalBody")).to_contain_text("Overview")
+        expect(page.locator("#rawLogModalBody")).to_contain_text("Activity Summary")
+        expect(page.locator("#rawLogModalBody")).to_contain_text("Context & Related IDs")
+        expect(page.locator("#rawLogModalBody")).to_contain_text("Additional Context")
+        expect(page.locator("#rawLogModalBody")).to_contain_text("gpt-5-nano")
+        expect(page.locator("#rawLogJsonToggle")).to_have_attribute("aria-expanded", "false")
+        expect(page.locator("#rawLogModalJson")).to_be_hidden()
+
+        page.locator("#rawLogJsonToggle").click()
+        expect(page.locator("#rawLogJsonToggle")).to_have_attribute("aria-expanded", "true")
+        expect(page.locator("#copyRawLogJsonBtn")).to_be_visible()
+        expect(page.locator("#rawLogModalJson")).to_be_visible()
+        expect(page.locator("#rawLogModalJson")).to_contain_text('"model": "gpt-5-nano"')
+
+        page.locator("#copyRawLogJsonBtn").click()
+        copied_text = page.evaluate("() => window.__copiedActivityLog")
+        assert '"total_tokens": 7012' in copied_text
+        assert '"public_workspace_id": "ac29bb0b-4a8f-4bb9-b305-6972b2d35f9e"' in copied_text
+
+        page.locator("#rawLogModal .btn-close").click()
+
+        with page.expect_request(lambda request: "/api/admin/control-center/activity-logs/export?" in request.url):
+            page.locator("#exportActivityLogsBtn").click()
+
+        assert export_requests[0].endswith("activity_type_filter=all")
+        assert activity_log_requests, "Expected the Activity Logs tab to request paged activity logs"
+    finally:
+        context.close()
+        browser.close()
\ No newline at end of file
diff --git a/ui_tests/test_control_center_activity_logs_layout_presets.py b/ui_tests/test_control_center_activity_logs_layout_presets.py
new file mode 100644
index 00000000..dd948635
--- /dev/null
+++ b/ui_tests/test_control_center_activity_logs_layout_presets.py
@@ -0,0 +1,180 @@
+# test_control_center_activity_logs_layout_presets.py
+"""
+UI test for control center activity log layout presets.
+
+Version: 0.241.016
+Implemented in: 0.241.016
+
+This test ensures that the Activity Logs tab exposes layout presets,
+applies them client-side, persists them in localStorage, and restores
+the selected preset after a page reload.
+"""
+
+import json
+import os
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+
+
+@pytest.mark.ui
+def test_control_center_activity_logs_layout_presets(playwright):
+    """Validate Activity Logs layout presets and local persistence."""
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport={"width": 1365, "height": 900},
+    )
+    page = context.new_page()
+    activity_log_requests = []
+
+    empty_paginated_response = json.dumps({
+        "users": [],
+        "groups": [],
+        "workspaces": [],
+        "pagination": {
+            "page": 1,
+            "per_page": 50,
+            "total_items": 0,
+            "total_pages": 1,
+            "has_prev": False,
+            "has_next": False,
+        },
+    })
+
+    def fulfill_activity_logs(route):
+        activity_log_requests.append(route.request.url)
+        route.fulfill(
+            status=200,
+            content_type="application/json",
+            body=json.dumps(
+                {
+                    "logs": [
+                        {
+                            "id": "log-1",
+                            "timestamp": "2026-04-08T16:40:24Z",
+                            "activity_type": "document_deletion",
+                            "user_id": "user-1",
+                            "workspace_type": "personal",
+                            "document": {
+                                "file_name": "Quarterly forecasting package for international staffing alignment and procurement planning.pdf",
+                                "file_type": "pdf",
+                            },
+                            "description": "Deleted a long document entry for layout preset coverage.",
+                        }
+                    ],
+                    "user_map": {
+                        "user-1": {
+                            "email": "ada@example.com",
+                            "display_name": "Ada Lovelace",
+                        }
+                    },
+                    "pagination": {
+                        "page": 1,
+                        "per_page": 50,
+                        "total_items": 1,
+                        "total_pages": 1,
+                        "has_prev": False,
+                        "has_next": False,
+                    },
+                }
+            ),
+        )
+
+    def fulfill_token_filters(route):
+        route.fulfill(
+            status=200,
+            content_type="application/json",
+            body="""
+            {
+                "success": true,
+                "filters": {
+                    "users": [],
+                    "groups": [],
+                    "public_workspaces": [],
+                    "models": [],
+                    "workspace_types": [],
+                    "token_types": []
+                }
+            }
+            """,
+        )
+
+    def fulfill_activity_trends(route):
+        route.fulfill(
+            status=200,
+            content_type="application/json",
+            body='{"success": true, "activity_data": {"logins": {}, "chats": {}, "documents": {}, "personal_documents": {}, "group_documents": {}, "public_documents": {}, "tokens": {}}, "period": "30 days", "start_date": "2026-03-01T00:00:00", "end_date": "2026-03-30T23:59:59"}',
+        )
+
+    try:
+        page.route("**/api/admin/control-center/activity-logs?*", fulfill_activity_logs)
+        page.route("**/api/admin/control-center/token-filters", fulfill_token_filters)
+        page.route("**/api/admin/control-center/activity-trends*", fulfill_activity_trends)
+        page.route("**/api/admin/control-center/users*", lambda route: route.fulfill(status=200, content_type="application/json", body=empty_paginated_response))
+        page.route("**/api/admin/control-center/groups*", lambda route: route.fulfill(status=200, content_type="application/json", body=empty_paginated_response))
+        page.route("**/api/admin/control-center/public-workspaces*", lambda route: route.fulfill(status=200, content_type="application/json", body=empty_paginated_response))
+
+        page.goto(f"{BASE_URL}/admin/control-center", wait_until="networkidle")
+
+        with page.expect_response(lambda response: "/api/admin/control-center/activity-logs?" in response.url):
+            page.locator("#activity-logs-tab").click()
+
+        table = page.locator("#activityLogsTable")
+        expect(table).to_be_visible()
+        expect(page.locator("#activityLogsLayoutPresetBalanced")).to_be_checked()
+        expect(page.locator("#activityLogsLayoutHint")).to_contain_text("Switch to Details Focus")
+
+        balanced_metrics = table.evaluate(
+            "el => ({ preset: el.dataset.layoutPreset, minWidth: parseFloat(getComputedStyle(el).minWidth), detailsMaxHeight: parseFloat(getComputedStyle(el.querySelector('tbody .activity-log-details')).maxHeight) })"
+        )
+        assert balanced_metrics["preset"] == "balanced"
+
+        page.locator("label[for='activityLogsLayoutPresetDetailsFocus']").click()
+        expect(page.locator("#activityLogsLayoutPresetDetailsFocus")).to_be_checked()
+        expect(page.locator("#activityLogsLayoutHint")).to_contain_text("widens the Details column")
+
+        details_focus_metrics = table.evaluate(
+            "el => ({ preset: el.dataset.layoutPreset, minWidth: parseFloat(getComputedStyle(el).minWidth), detailsMaxHeight: parseFloat(getComputedStyle(el.querySelector('tbody .activity-log-details')).maxHeight) })"
+        )
+        assert details_focus_metrics["preset"] == "details-focus"
+        assert details_focus_metrics["minWidth"] > balanced_metrics["minWidth"]
+        assert details_focus_metrics["detailsMaxHeight"] > balanced_metrics["detailsMaxHeight"]
+
+        stored_preset = page.evaluate(
+            "() => window.localStorage.getItem('simplechat_activityLogsLayoutPreset')"
+        )
+        assert stored_preset == "details-focus"
+
+        page.locator("label[for='activityLogsLayoutPresetCompact']").click()
+        expect(page.locator("#activityLogsLayoutPresetCompact")).to_be_checked()
+        compact_metrics = table.evaluate(
+            "el => ({ preset: el.dataset.layoutPreset, minWidth: parseFloat(getComputedStyle(el).minWidth) })"
+        )
+        assert compact_metrics["preset"] == "compact"
+        assert compact_metrics["minWidth"] < balanced_metrics["minWidth"]
+
+        page.locator("label[for='activityLogsLayoutPresetDetailsFocus']").click()
+        page.reload(wait_until="networkidle")
+
+        with page.expect_response(lambda response: "/api/admin/control-center/activity-logs?" in response.url):
+            page.locator("#activity-logs-tab").click()
+
+        reloaded_table = page.locator("#activityLogsTable")
+        expect(page.locator("#activityLogsLayoutPresetDetailsFocus")).to_be_checked()
+        reloaded_preset = reloaded_table.evaluate("el => el.dataset.layoutPreset")
+        assert reloaded_preset == "details-focus"
+        assert activity_log_requests, "Expected the Activity Logs tab to request paged activity logs"
+    finally:
+        context.close()
+        browser.close()
\ No newline at end of file
diff --git a/ui_tests/test_enhanced_citations_pdf_error_toast.py b/ui_tests/test_enhanced_citations_pdf_error_toast.py
new file mode 100644
index 00000000..04e44250
--- /dev/null
+++ b/ui_tests/test_enhanced_citations_pdf_error_toast.py
@@ -0,0 +1,118 @@
+# test_enhanced_citations_pdf_error_toast.py
+"""
+UI test for enhanced citations PDF error reporting.
+
+Version: 0.241.010
+Implemented in: 0.241.010
+
+This test ensures that a failed enhanced citations PDF request surfaces the
+backend error message in a toast instead of failing silently behind the PDF
+iframe workflow, and that the toast container stays below the floating chat
+tutorial launcher.
+"""
+
+import json
+import os
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+
+
+def _fulfill_json(route, payload, status=200):
+    route.fulfill(
+        status=status,
+        content_type="application/json",
+        body=json.dumps(payload),
+    )
+
+
+@pytest.mark.ui
+def test_enhanced_citation_pdf_failure_shows_backend_toast(playwright):
+    """Validate failed PDF enhanced citations show the backend error toast."""
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport={"width": 1440, "height": 900},
+    )
+    page = context.new_page()
+
+    page.route(
+        "**/api/user/settings",
+        lambda route: _fulfill_json(route, {"selected_agent": None, "settings": {"enable_agents": False}}),
+    )
+    page.route("**/api/get_conversations", lambda route: _fulfill_json(route, {"conversations": []}))
+    page.route(
+        "**/api/enhanced_citations/pdf**",
+        lambda route: _fulfill_json(route, {"error": "Backend PDF citation failed for test doc."}, status=500),
+    )
+
+    try:
+        page.goto(f"{BASE_URL}/chats", wait_until="domcontentloaded")
+        page.wait_for_selector("#chatbox")
+        page.wait_for_selector("#chat-toast-container")
+        page.wait_for_function("() => Boolean(window.bootstrap && window.bootstrap.Modal)")
+        page.evaluate(
+            """
+            () => {
+                const tutorialLaunch = document.getElementById('chat-tutorial-launch');
+                if (tutorialLaunch) {
+                    tutorialLaunch.classList.add('is-ready');
+                }
+            }
+            """
+        )
+
+        with page.expect_response("**/api/enhanced_citations/pdf**"):
+            page.evaluate(
+                """
+                async () => {
+                    const module = await import('/static/js/chat/chat-enhanced-citations.js');
+                    await module.showPdfModal('doc-123', 3, null);
+                }
+                """
+            )
+
+        toast_container = page.locator("#chat-toast-container")
+        toast_body = toast_container.locator(".toast .toast-body").last
+        expect(toast_body).to_contain_text("Backend PDF citation failed for test doc.")
+        expect(page.locator("#pdfModal.show")).to_have_count(0)
+
+        tutorial_launch = page.locator("#chat-tutorial-launch")
+        expect(tutorial_launch).to_be_visible()
+
+        position_data = page.evaluate(
+            """
+            () => {
+                const toastContainer = document.getElementById('chat-toast-container');
+                const tutorialLaunch = document.getElementById('chat-tutorial-launch');
+                if (!toastContainer || !tutorialLaunch) {
+                    return null;
+                }
+
+                const toastRect = toastContainer.getBoundingClientRect();
+                const tutorialRect = tutorialLaunch.getBoundingClientRect();
+                return {
+                    toastTop: toastRect.top,
+                    tutorialBottom: tutorialRect.bottom,
+                };
+            }
+            """
+        )
+
+        assert position_data is not None, 'Expected chat toast container and tutorial launcher to be present.'
+        assert position_data['toastTop'] >= position_data['tutorialBottom'] - 1, (
+            'Expected chat toast container to render below the tutorial launcher.'
+        )
+    finally:
+        context.close()
+        browser.close()
\ No newline at end of file
diff --git a/ui_tests/test_profile_fact_memory_editor.py b/ui_tests/test_profile_fact_memory_editor.py
index 5937acdb..936d9087 100644
--- a/ui_tests/test_profile_fact_memory_editor.py
+++ b/ui_tests/test_profile_fact_memory_editor.py
@@ -1,8 +1,8 @@
 # test_profile_fact_memory_editor.py
 """
 UI test for the profile fact-memory editor.
-Version: 0.241.004
-Implemented in: 0.240.079; 0.240.082; 0.240.083; 0.241.003; 0.241.004
+Version: 0.241.008
+Implemented in: 0.240.079; 0.240.082; 0.240.083; 0.241.003; 0.241.004; 0.241.008
 
 This test ensures a signed-in user can create, edit, retag, and delete
 fact-memory entries from the profile page using the compact summary and modal editor
@@ -71,6 +71,11 @@ def test_profile_fact_memory_editor(playwright):
         expect(page.locator('#fact-memory-settings')).to_have_count(1)
         expect(page.locator('#factMemoryDeleteModal')).to_have_count(1)
         expect(page.locator('#factMemoryManagerModal')).to_have_count(1)
+        if page.locator('#tts-preview-btn').count():
+            expect(page.locator('#tts-preview-btn')).to_be_visible()
+            expect(page.locator('#tts-stop-btn')).to_be_hidden()
+            tts_stop_classes = page.locator('#tts-stop-btn').get_attribute('class') or ''
+            assert 'd-none' in tts_stop_classes, 'Expected the hidden TTS stop button to use Bootstrap d-none.'
         assert not page_errors, f'Unexpected profile page errors: {page_errors}'
         duplicate_declaration_errors = [
             message for message in console_errors
@@ -97,7 +102,8 @@ def test_profile_fact_memory_editor(playwright):
         expect(page.locator('#fact-memory-count')).to_have_text(str(initial_count + 1))
 
         page.locator('#open-fact-memory-modal-btn').click()
-        expect(page.get_by_role('dialog', name='Manage Fact Memories')).to_be_visible()
+        manager_dialog = page.get_by_role('dialog', name='Manage Fact Memories')
+        expect(manager_dialog).to_be_visible()
 
         search_input = page.locator('#fact-memory-search-input')
         search_input.fill(created_value)
@@ -124,9 +130,42 @@ def test_profile_fact_memory_editor(playwright):
         expect(updated_item).to_contain_text('Fact')
 
         updated_item.get_by_role('button', name='Delete memory').click()
-        expect(page.get_by_role('dialog', name='Delete Fact Memory')).to_be_visible()
+        delete_dialog = page.get_by_role('dialog', name='Delete Fact Memory')
+        expect(manager_dialog).to_be_visible()
+        expect(delete_dialog).to_be_visible()
+
+        stacking_state = page.evaluate(
+            """
+            () => {
+                const managerModal = document.getElementById('factMemoryManagerModal');
+                const deleteModal = document.getElementById('factMemoryDeleteModal');
+                const backdrops = Array.from(document.querySelectorAll('.modal-backdrop'));
+                const latestBackdrop = backdrops.length ? backdrops[backdrops.length - 1] : null;
+                return {
+                    managerZ: Number(window.getComputedStyle(managerModal).zIndex || 0),
+                    deleteZ: Number(window.getComputedStyle(deleteModal).zIndex || 0),
+                    deleteClasses: deleteModal.className,
+                    latestBackdropClasses: latestBackdrop ? latestBackdrop.className : '',
+                };
+            }
+            """
+        )
+        assert stacking_state['deleteZ'] > stacking_state['managerZ'], (
+            'Expected the delete confirm modal to stack above the manager modal. '
+            f'Saw manager z-index {stacking_state["managerZ"]} and delete z-index {stacking_state["deleteZ"]}.'
+        )
+        assert 'fact-memory-delete-modal-stacked' in stacking_state['deleteClasses']
+        assert 'fact-memory-delete-backdrop-stacked' in stacking_state['latestBackdropClasses']
+
         page.locator('#confirm-delete-fact-memory-btn').click()
         expect(page.locator('#fact-memory-status')).to_contain_text('deleted')
+        expect(delete_dialog).to_be_hidden()
+        expect(manager_dialog).to_be_visible()
+        assert page.evaluate("() => document.body.classList.contains('modal-open')"), (
+            'Expected the manager modal to keep the page in modal-open state after the delete confirm closes.'
+        )
+        search_input.fill('')
+        expect(search_input).to_have_value('')
         expect(page.locator(f'#fact-memory-modal-list [data-fact-memory-id="{created_fact_id}"]')).to_have_count(0)
         expect(page.locator('#fact-memory-count')).to_have_text(str(initial_count))
         created_fact_id = None
diff --git a/ui_tests/test_workspace_document_cards_layout.py b/ui_tests/test_workspace_document_cards_layout.py
new file mode 100644
index 00000000..a8108584
--- /dev/null
+++ b/ui_tests/test_workspace_document_cards_layout.py
@@ -0,0 +1,169 @@
+# test_workspace_document_cards_layout.py
+"""
+UI test for workspace document card layouts.
+Version: 0.241.014
+Implemented in: 0.241.014
+
+This test ensures that personal and group workspaces can switch into the new
+document card view and render quick actions, metadata, and status badges.
+"""
+
+import json
+import os
+import re
+from pathlib import Path
+from urllib.error import URLError
+from urllib.request import urlopen
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+
+
+def _require_ui_env():
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+    try:
+        with urlopen(BASE_URL, timeout=5):
+            return
+    except URLError as ex:
+        pytest.skip(f"UI server is not reachable at {BASE_URL}: {ex.reason}")
+
+
+@pytest.mark.ui
+def test_personal_workspace_document_cards_render_quick_actions(playwright):
+    """Validate the personal workspace document card view."""
+    _require_ui_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport={"width": 1440, "height": 900},
+    )
+    page = context.new_page()
+
+    documents_payload = {
+        "documents": [
+            {
+                "id": "doc-cards-1",
+                "file_name": "Quarterly Strategy.pdf",
+                "title": "Quarterly Strategy",
+                "percentage_complete": 100,
+                "status": "Complete",
+                "authors": ["Ada Lovelace", "Grace Hopper"],
+                "abstract": "A concise summary of the quarterly strategy plan.",
+                "number_of_pages": 12,
+                "tags": ["strategy", "roadmap"],
+                "enhanced_citations": True,
+                "user_id": "test-user",
+            }
+        ],
+        "page": 1,
+        "page_size": 20,
+        "total_count": 1,
+        "needs_legacy_update_check": False,
+    }
+
+    page.route(
+        "**/api/documents*",
+        lambda route: route.fulfill(status=200, content_type="application/json", body=json.dumps(documents_payload)),
+    )
+    page.route(
+        "**/api/documents/tags*",
+        lambda route: route.fulfill(status=200, content_type="application/json", body=json.dumps({"tags": []})),
+    )
+
+    try:
+        response = page.goto(f"{BASE_URL}/workspace", wait_until="networkidle")
+        assert response is not None and response.ok, "Expected /workspace to load successfully."
+
+        page.locator("#docs-view-cards").check()
+
+        card = page.locator("#documents-card-view .document-item-card").first
+        expect(card).to_be_visible()
+        expect(card).to_contain_text("Quarterly Strategy")
+        expect(card).to_contain_text("Enhanced citations")
+        expect(card.get_by_role("button", name="Chat")).to_be_visible()
+        expect(page.locator("#documents-list-view")).to_have_class(re.compile(r".*d-none.*"))
+    finally:
+        context.close()
+        browser.close()
+
+
+@pytest.mark.ui
+def test_group_workspace_document_cards_render_quick_actions(playwright):
+    """Validate the group workspace document card view."""
+    _require_ui_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport={"width": 1440, "height": 900},
+    )
+    page = context.new_page()
+
+    groups_payload = {
+        "groups": [
+            {
+                "id": "group-alpha",
+                "name": "Alpha Team",
+                "isActive": True,
+                "userRole": "Owner",
+                "status": "active",
+            }
+        ]
+    }
+    group_documents_payload = {
+        "documents": [
+            {
+                "id": "group-doc-1",
+                "file_name": "Shared Research.pdf",
+                "title": "Shared Research",
+                "percentage_complete": 100,
+                "status": "Complete",
+                "authors": ["Katherine Johnson"],
+                "abstract": "A shared research summary for the active group workspace.",
+                "number_of_pages": 8,
+                "tags": ["shared", "analysis"],
+                "enhanced_citations": False,
+                "shared_group_ids": ["group-alpha"],
+            }
+        ],
+        "page": 1,
+        "page_size": 10,
+        "total_count": 1,
+    }
+
+    page.route(
+        "**/api/groups?page_size=1000",
+        lambda route: route.fulfill(status=200, content_type="application/json", body=json.dumps(groups_payload)),
+    )
+    page.route(
+        "**/api/group_documents?*",
+        lambda route: route.fulfill(status=200, content_type="application/json", body=json.dumps(group_documents_payload)),
+    )
+    page.route(
+        "**/api/group_documents/tags?*",
+        lambda route: route.fulfill(status=200, content_type="application/json", body=json.dumps({"tags": []})),
+    )
+
+    try:
+        response = page.goto(f"{BASE_URL}/group_workspaces", wait_until="networkidle")
+        assert response is not None and response.ok, "Expected /group_workspaces to load successfully."
+
+        page.locator("#group-docs-view-cards").check()
+
+        card = page.locator("#group-documents-card-view .document-item-card").first
+        expect(card).to_be_visible()
+        expect(card).to_contain_text("Shared Research")
+        expect(card).to_contain_text("Standard citations")
+        expect(card.get_by_role("button", name="Chat")).to_be_visible()
+        expect(page.locator("#group-documents-list-view")).to_have_class(re.compile(r".*d-none.*"))
+    finally:
+        context.close()
+        browser.close()
\ No newline at end of file
diff --git a/ui_tests/test_workspace_mobile_navigation_layout.py b/ui_tests/test_workspace_mobile_navigation_layout.py
new file mode 100644
index 00000000..7f943111
--- /dev/null
+++ b/ui_tests/test_workspace_mobile_navigation_layout.py
@@ -0,0 +1,228 @@
+# test_workspace_mobile_navigation_layout.py
+"""
+UI test for mobile workspace navigation layout.
+Version: 0.241.012
+Implemented in: 0.241.012
+
+This test ensures that mobile top navigation uses the drawer pattern in top-nav
+mode and that the responsive workspace section switcher can move between
+sections while showing card-style agent views for personal and group workspaces.
+"""
+
+import json
+import os
+import re
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+MOBILE_VIEWPORT = {"width": 430, "height": 932}
+
+
+def _require_ui_env():
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+
+
+def _get_user_settings(page):
+    return page.evaluate(
+        """
+        async () => {
+            const response = await fetch('/api/user/settings');
+            const data = await response.json();
+            return data.settings || {};
+        }
+        """
+    )
+
+
+def _set_user_settings(page, settings):
+    return page.evaluate(
+        """
+        async (nextSettings) => {
+            const response = await fetch('/api/user/settings', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ settings: nextSettings })
+            });
+            return response.ok;
+        }
+        """,
+        settings,
+    )
+
+
+@pytest.mark.ui
+def test_personal_workspace_mobile_drawer_and_switcher(playwright):
+    """Validate the mobile drawer and section switcher in the personal workspace."""
+    _require_ui_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport=MOBILE_VIEWPORT,
+    )
+    page = context.new_page()
+    original_settings = None
+
+    documents_payload = {
+        "documents": [
+            {
+                "id": "doc-1",
+                "file_name": "Quarterly Strategy.pdf",
+                "title": "Quarterly Strategy",
+                "percentage_complete": 100,
+                "status": "Complete",
+                "authors": ["Ada Lovelace"],
+                "tags": ["strategy"],
+                "enhanced_citations": True,
+            }
+        ],
+        "page": 1,
+        "page_size": 20,
+        "total_count": 1,
+        "needs_legacy_update_check": False,
+    }
+    agents_payload = [
+        {
+            "name": "research_companion",
+            "display_name": "Research Companion",
+            "description": "Summarizes uploaded documents and keeps a clean mobile card layout.",
+            "is_global": False,
+        }
+    ]
+
+    page.route(
+        "**/api/documents*",
+        lambda route: route.fulfill(status=200, content_type="application/json", body=json.dumps(documents_payload)),
+    )
+    page.route(
+        "**/api/user/agents",
+        lambda route: route.fulfill(status=200, content_type="application/json", body=json.dumps(agents_payload)),
+    )
+
+    try:
+        page.goto(f"{BASE_URL}/workspace", wait_until="domcontentloaded")
+        original_settings = _get_user_settings(page)
+        top_nav_settings = dict(original_settings)
+        top_nav_settings["navLayout"] = "top"
+        assert _set_user_settings(page, top_nav_settings), "Expected nav layout update to succeed."
+
+        page.goto(f"{BASE_URL}/workspace", wait_until="networkidle")
+
+        drawer_button = page.get_by_role("button", name="Open navigation")
+        workspace_switcher = page.locator("#workspace-section-select")
+
+        expect(drawer_button).to_be_visible()
+        expect(workspace_switcher).to_be_visible()
+        expect(page.locator("#workspaceTab")).to_be_hidden()
+
+        drawer_button.click()
+        mobile_drawer = page.locator("#topNavMobileMenu.show")
+        expect(mobile_drawer).to_be_visible()
+        expect(mobile_drawer.get_by_role("link", name="Personal")).to_be_visible()
+        expect(mobile_drawer.get_by_role("link", name="Chat")).to_be_visible()
+        mobile_drawer.get_by_role("button", name="Close").click()
+        expect(page.locator("#topNavMobileMenu.show")).to_have_count(0)
+
+        document_row_display = page.evaluate(
+            "() => getComputedStyle(document.querySelector('#documents-table tr.document-row')).display"
+        )
+        assert document_row_display == "block", "Expected mobile document rows to render as stacked cards."
+
+        if page.locator("#workspace-section-select option[value='agents-tab-btn']").count() == 0:
+            pytest.skip("Personal agents are disabled in the current UI environment.")
+
+        workspace_switcher.select_option("agents-tab-btn")
+        agent_card = page.locator("#agents-grid-view .item-card").first
+        expect(agent_card).to_be_visible()
+        expect(page.locator("#agents-list-view")).to_have_class(re.compile(r".*d-none.*"))
+    finally:
+        if original_settings is not None:
+            _set_user_settings(page, original_settings)
+        context.close()
+        browser.close()
+
+
+@pytest.mark.ui
+def test_group_workspace_mobile_switcher_prefers_agent_cards(playwright):
+    """Validate that the group workspace switcher uses the mobile card layout for agents."""
+    _require_ui_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport=MOBILE_VIEWPORT,
+    )
+    page = context.new_page()
+    original_settings = None
+
+    group_agents_payload = {
+        "agents": [
+            {
+                "id": "group-agent-1",
+                "name": "group_researcher",
+                "display_name": "Group Researcher",
+                "description": "Works with shared documents and shared actions.",
+                "is_global": False,
+            }
+        ]
+    }
+
+    page.route(
+        "**/api/group/agents",
+        lambda route: route.fulfill(status=200, content_type="application/json", body=json.dumps(group_agents_payload)),
+    )
+
+    try:
+        page.goto(f"{BASE_URL}/group_workspaces", wait_until="domcontentloaded")
+        original_settings = _get_user_settings(page)
+        top_nav_settings = dict(original_settings)
+        top_nav_settings["navLayout"] = "top"
+        assert _set_user_settings(page, top_nav_settings), "Expected nav layout update to succeed."
+
+        page.goto(f"{BASE_URL}/group_workspaces", wait_until="networkidle")
+
+        group_switcher = page.locator("#group-workspace-section-select")
+        expect(group_switcher).to_be_visible()
+        expect(page.locator("#groupWorkspaceTab")).to_be_hidden()
+
+        if page.locator("#group-workspace-section-select option[value='group-agents-tab-btn']").count() == 0:
+            pytest.skip("Group agents are disabled in the current UI environment.")
+
+        group_switcher.select_option("group-agents-tab-btn")
+        page.evaluate(
+            """
+            () => {
+                window.currentGroupStatus = 'active';
+                window.groupWorkspaceContext = {
+                    activeGroupId: 'test-group-1',
+                    activeGroupName: 'Test Group',
+                    userRole: 'Owner',
+                    requireOwnerForAgentManagement: false
+                };
+                window.dispatchEvent(new CustomEvent('groupWorkspace:context-changed', {
+                    detail: window.groupWorkspaceContext
+                }));
+                if (typeof window.fetchGroupAgents === 'function') {
+                    return window.fetchGroupAgents();
+                }
+                return null;
+            }
+            """
+        )
+
+        group_card = page.locator("#group-agents-grid-view .item-card").first
+        expect(group_card).to_be_visible()
+        expect(page.locator("#group-agents-list-view")).to_have_class(re.compile(r".*d-none.*"))
+    finally:
+        if original_settings is not None:
+            _set_user_settings(page, original_settings)
+        context.close()
+        browser.close()
\ No newline at end of file
diff --git a/ui_tests/test_workspace_sidebar_endpoint_links.py b/ui_tests/test_workspace_sidebar_endpoint_links.py
new file mode 100644
index 00000000..b2190f80
--- /dev/null
+++ b/ui_tests/test_workspace_sidebar_endpoint_links.py
@@ -0,0 +1,157 @@
+# test_workspace_sidebar_endpoint_links.py
+"""
+UI test for workspace sidebar endpoint links and rounded tab shape.
+Version: 0.241.014
+Implemented in: 0.241.014
+
+This test ensures that workspace tabs keep their default rounded desktop edge and that the left-nav
+workspace submenus include endpoint links whenever the corresponding endpoint
+tabs are enabled for personal or group workspaces.
+"""
+
+import os
+from pathlib import Path
+from urllib.error import URLError
+from urllib.request import urlopen
+
+import pytest
+from playwright.sync_api import expect
+
+
+BASE_URL = os.getenv("SIMPLECHAT_UI_BASE_URL", "").rstrip("/")
+STORAGE_STATE = os.getenv("SIMPLECHAT_UI_STORAGE_STATE", "")
+
+
+def _require_ui_env():
+    if not BASE_URL:
+        pytest.skip("Set SIMPLECHAT_UI_BASE_URL to run this UI test.")
+    if not STORAGE_STATE or not Path(STORAGE_STATE).exists():
+        pytest.skip("Set SIMPLECHAT_UI_STORAGE_STATE to a valid authenticated Playwright storage state file.")
+    try:
+        with urlopen(BASE_URL, timeout=5):
+            return
+    except URLError as ex:
+        pytest.skip(f"UI server is not reachable at {BASE_URL}: {ex.reason}")
+
+
+def _get_user_settings(page):
+    return page.evaluate(
+        """
+        async () => {
+            const response = await fetch('/api/user/settings');
+            const data = await response.json();
+            return data.settings || {};
+        }
+        """
+    )
+
+
+def _set_user_settings(page, settings):
+    return page.evaluate(
+        """
+        async (nextSettings) => {
+            const response = await fetch('/api/user/settings', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ settings: nextSettings })
+            });
+            return response.ok;
+        }
+        """,
+        settings,
+    )
+
+
+def _ensure_submenu_visible(page, toggle_selector, submenu_selector):
+    submenu = page.locator(submenu_selector)
+    if submenu.is_visible():
+        return submenu
+
+    page.locator(toggle_selector).click()
+    expect(submenu).to_be_visible()
+    return submenu
+
+
+@pytest.mark.ui
+def test_workspace_tabs_restore_default_rounded_corners(playwright):
+    """Validate that workspace tabs retain the default rounded desktop corners."""
+    _require_ui_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport={"width": 1440, "height": 900},
+    )
+    page = context.new_page()
+    original_settings = None
+
+    try:
+        page.goto(f"{BASE_URL}/workspace", wait_until="domcontentloaded")
+        original_settings = _get_user_settings(page)
+        top_nav_settings = dict(original_settings)
+        top_nav_settings["navLayout"] = "top"
+        assert _set_user_settings(page, top_nav_settings), "Expected nav layout update to succeed."
+
+        page.goto(f"{BASE_URL}/workspace", wait_until="networkidle")
+        if page.locator("#workspaceTab").count() == 0:
+            pytest.skip("Workspace tabs are not available in the current UI environment.")
+
+        border_radius = page.evaluate(
+            "() => getComputedStyle(document.getElementById('documents-tab-btn')).borderTopLeftRadius"
+        )
+        assert border_radius != "0px", f"Expected rounded workspace tabs, observed border radius {border_radius}."
+    finally:
+        if original_settings is not None:
+            _set_user_settings(page, original_settings)
+        context.close()
+        browser.close()
+
+
+@pytest.mark.ui
+def test_sidebar_workspace_submenus_include_endpoint_links_when_tabs_exist(playwright):
+    """Validate that sidebar workspace submenus expose endpoint links when endpoint tabs are enabled."""
+    _require_ui_env()
+
+    browser = playwright.chromium.launch()
+    context = browser.new_context(
+        storage_state=STORAGE_STATE,
+        viewport={"width": 1440, "height": 900},
+    )
+    page = context.new_page()
+    original_settings = None
+    found_endpoint_feature = False
+
+    try:
+        page.goto(f"{BASE_URL}/workspace", wait_until="domcontentloaded")
+        original_settings = _get_user_settings(page)
+        sidebar_settings = dict(original_settings)
+        sidebar_settings["navLayout"] = "sidebar"
+        assert _set_user_settings(page, sidebar_settings), "Expected nav layout update to succeed."
+
+        page.goto(f"{BASE_URL}/workspace", wait_until="networkidle")
+        if page.locator("#endpoints-tab-btn").count() > 0:
+            found_endpoint_feature = True
+            submenu = _ensure_submenu_visible(
+                page,
+                "[data-target='personal-workspace-submenu']",
+                "#personal-workspace-submenu",
+            )
+            expect(submenu.get_by_text("Your Endpoints", exact=True)).to_be_visible()
+
+        page.goto(f"{BASE_URL}/group_workspaces", wait_until="networkidle")
+        if page.locator("#group-endpoints-tab-btn").count() > 0:
+            found_endpoint_feature = True
+            submenu = _ensure_submenu_visible(
+                page,
+                "[data-target='group-workspace-submenu']",
+                "#group-workspace-submenu",
+            )
+            expect(submenu.get_by_text("Group Endpoints", exact=True)).to_be_visible()
+
+        if not found_endpoint_feature:
+            pytest.skip("Endpoint tabs are disabled in the current UI environment.")
+    finally:
+        if original_settings is not None:
+            _set_user_settings(page, original_settings)
+        context.close()
+        browser.close()
\ No newline at end of file