diff --git a/server.py b/server.py
index 151367e..59975bb 100644
--- a/server.py
+++ b/server.py
@@ -958,16 +958,30 @@ def list_assets(
     if assigned_to is not None:
         conditions.append("assigned_to = ?")
         params.append(assigned_to)
+    # Build conditions with table prefix for JOIN safety
     if q:
-        conditions.append("(name LIKE ? OR machine_id LIKE ? OR description LIKE ?)")
+        conditions.append("(a.name LIKE ? OR a.machine_id LIKE ? OR a.description LIKE ?)")
         like = f"%{q}%"
         params.extend([like, like, like])
 
-    where = " AND ".join(conditions)
-    sql = "SELECT * FROM assets"
+    where = " AND ".join(
+        f"a.{c}" if not c.startswith("(") else c
+        for c in conditions
+    ) if conditions else ""
+    sql = (
+        "SELECT a.*,"
+        " l.latitude AS location_latitude,"
+        " l.longitude AS location_longitude,"
+        " l.address AS location_address,"
+        " l.building_name AS location_building_name,"
+        " l.building_number AS location_building_number,"
+        " l.name AS location_name"
+        " FROM assets a"
+        " LEFT JOIN locations l ON a.location_id = l.id"
+    )
     if where:
         sql += f" WHERE {where}"
-    sql += " ORDER BY created_at DESC LIMIT ? OFFSET ?"
+    sql += " ORDER BY a.created_at DESC LIMIT ? OFFSET ?"
     params.extend([limit, offset])
 
     rows = conn.execute(sql, params).fetchall()
diff --git a/static/index.html b/static/index.html
index 50d6e84..be5e23b 100644
--- a/static/index.html
+++ b/static/index.html
@@ -325,6 +325,7 @@
     }
     .btn-icon:hover { transform: scale(1.08); background: var(--card); }
     .btn-icon:active { transform: scale(0.92); }
+    .btn-pressed { transform: scale(0.94) !important; transition: transform 0.08s ease-out !important; }
 
     /* ═══════════════════════════════════════════════════════════════════════
        INPUTS
@@ -3161,6 +3162,9 @@
       var clearBtn = document.getElementById('clearActSearch');
       if (clearBtn) clearBtn.style.display = searchQ ? 'block' : 'none';
 
+      // Show skeleton loading
+      renderActivitySkeletons();
+
       clearTimeout(loadActivity._debounce);
       loadActivity._debounce = setTimeout(function() { _loadActivity(userFilter, typeFilter, searchQ); }, 200);
     }
@@ -3310,13 +3314,36 @@
     // TOAST
     // =========================================================================
     let toastTimer;
-    function showToast(msg, isError = false) {
+    function showToast(msg, isError = false, isSuccess = false) {
       const t = document.getElementById('toast');
       t.textContent = msg;
-      t.className = 'toast' + (isError ? ' error' : '');
+      t.className = 'toast' + (isError ? ' error' : '') + (isSuccess ? ' success-toast' : '');
       t.classList.add('show');
       clearTimeout(toastTimer);
-      toastTimer = setTimeout(() => t.classList.remove('show'), 2000);
+      toastTimer = setTimeout(() => t.classList.remove('show'), isSuccess ? 2500 : 2000);
+    }
+
+    // Success overlay + toast combo for create/delete confirmation
+    function showSuccessFeedback(msg, isWarning = false) {
+      const overlay = document.getElementById('successOverlay');
+      overlay.className = 'success-overlay' + (isWarning ? ' warning' : '');
+      overlay.classList.add('show');
+      setTimeout(() => overlay.classList.remove('show'), 1200);
+      showToast(msg, false, true);
+    }
+
+    // Enhanced empty state renderer with animation
+    function renderEmptyStateCard(icon, heading, desc, btnLabel, btnAction, animate = true) {
+      const animClass = animate ? ' fade-in-up' : '';
+      const cta = btnLabel
+        ? `<button class="esc-cta" onclick="${btnAction}">${esc(btnLabel)}</button>`
+        : '';
+      return `<div class="empty-state-card${animClass}">
+        <div class="esc-icon">${icon}</div>
+        <div class="esc-heading">${esc(heading)}</div>
+        <div class="esc-desc">${esc(desc)}</div>
+        ${cta}
+      </div>`;
     }
 
     let undoToastTimer;
@@ -3902,10 +3929,59 @@
       if (tabId === 'tabReports') loadReports();
       if (tabId === 'tabNavigate') renderNavPage();
 
+      // FAB visibility — show only on Assets tab
+      const fab = document.getElementById('fabAdd');
+      if (fab) {
+        fab.style.display = (tabId === 'tabAssets') ? '' : 'none';
+      }
+
       // Dispatch event so child tab implementations can hook in
       document.dispatchEvent(new CustomEvent('tabChange', { detail: { tabId } }));
     }
 
+
+    // ── Floating Action Button ────────────────────────────────────────────
+    function fabAction() {
+      const fab = document.getElementById('fabAdd');
+      // Haptic tap animation
+      fab.style.transform = 'scale(0.85)';
+      setTimeout(() => { fab.style.transform = ''; }, 150);
+      
+      // Navigate to Add Asset tab
+      switchTab('tabAddAsset');
+      
+      // After switching, pulse the FAB briefly
+      fab.classList.add('pulse');
+      setTimeout(() => fab.classList.remove('pulse'), 2500);
+    }
+    
+    // Show/hide FAB based on current tab
+    function updateFabVisibility(tabId) {
+      const fab = document.getElementById('fabAdd');
+      if (!fab) return;
+      
+      // Show FAB everywhere except Add Asset tab
+      if (tabId === 'tabAddAsset') {
+        fab.classList.add('hidden-fab');
+      } else {
+        fab.classList.remove('hidden-fab');
+      }
+    }
+    
+    // Hook into tab switching
+    document.addEventListener('tabChange', function(e) {
+      updateFabVisibility(e.detail.tabId);
+    });
+    
+    // Also update on direct switchTab calls - override the function
+    const _origSwitchTab = switchTab;
+    switchTab = function(tabId) {
+      const result = _origSwitchTab(tabId);
+      updateFabVisibility(tabId);
+      return result;
+    };
+
+
     // =========================================================================
     // EVENT DELEGATION
     // =========================================================================
@@ -3973,7 +4049,7 @@
       const cta = btnLabel
         ? `<button class="esc-cta" onclick="${btnAction}">${esc(btnLabel)}</button>`
         : '';
-      return `<div class="empty-state-card">
+      return `<div class="empty-state-card fade-in-up">
         <div class="esc-icon">${icon}</div>
         <div class="esc-heading">${esc(heading)}</div>
         <div class="esc-desc">${esc(desc)}</div>
@@ -5215,10 +5291,9 @@
       if (clearBtn) clearBtn.style.display = q ? 'block' : 'none';
       updateClearFiltersBtn();
 
-      // Show loading state immediately
+      // Show skeleton loading
       isLoading = true;
-      showListLoading(true);
-      document.getElementById('assetCountBar').innerHTML = '<div class="spinner"></div> Searching...';
+      renderAssetSkeletons();
       clearTimeout(assetDebounce);
       assetDebounce = setTimeout(_loadAssets, 200);
     }
@@ -5277,6 +5352,96 @@
       }
     }
 
+
+    // ── Pull-to-refresh ───────────────────────────────────────────────────
+    let ptrState = { startY: 0, pulling: false, refreshing: false, dist: 0 };
+    
+    function initPullToRefresh() {
+      const wrap = document.getElementById('assetListWrap');
+      if (!wrap) return;
+      
+      // Create indicator
+      let indicator = document.getElementById('ptrIndicator');
+      if (!indicator) {
+        indicator = document.createElement('div');
+        indicator.id = 'ptrIndicator';
+        indicator.className = 'ptr-indicator';
+        indicator.innerHTML = '<span class="ptr-arrow">⇣</span> Pull to refresh';
+        wrap.parentNode.insertBefore(indicator, wrap);
+      }
+      
+      wrap.addEventListener('touchstart', function(e) {
+        if (ptrState.refreshing) return;
+        // Only trigger when scrolled to top
+        if (wrap.scrollTop <= 0 && document.getElementById('assetSearch') !== document.activeElement) {
+          ptrState.startY = e.touches[0].clientY;
+          ptrState.pulling = true;
+        }
+      }, { passive: true });
+      
+      wrap.addEventListener('touchmove', function(e) {
+        if (!ptrState.pulling || ptrState.refreshing) return;
+        const dist = e.touches[0].clientY - ptrState.startY;
+        if (dist > 20) {
+          ptrState.dist = dist;
+          const indicator = document.getElementById('ptrIndicator');
+          if (indicator) {
+            indicator.className = 'ptr-indicator pulling';
+            indicator.innerHTML = dist > 60 
+              ? '<span class="ptr-arrow">⇡</span> Release to refresh'
+              : '<span class="ptr-arrow">⇣</span> Pull to refresh';
+          }
+          e.preventDefault();
+        }
+      }, { passive: false });
+      
+      wrap.addEventListener('touchend', function(e) {
+        if (!ptrState.pulling || ptrState.refreshing) return;
+        ptrState.pulling = false;
+        const indicator = document.getElementById('ptrIndicator');
+        
+        if (ptrState.dist > 60) {
+          // Trigger refresh
+          ptrState.refreshing = true;
+          if (indicator) {
+            indicator.className = 'ptr-indicator refreshing';
+            indicator.innerHTML = '<div class="ptr-spinner"></div> Refreshing...';
+          }
+          // Reset cache and reload
+          totalAssetCount = 0;
+          masterCategories = [];
+          loadAssets().then(() => {
+            ptrState.refreshing = false;
+            if (indicator) {
+              indicator.className = 'ptr-indicator';
+              indicator.innerHTML = '<span class="ptr-arrow">⇣</span> Pull to refresh';
+            }
+            showToast('List refreshed');
+          }).catch(() => {
+            ptrState.refreshing = false;
+            if (indicator) {
+              indicator.className = 'ptr-indicator';
+              indicator.innerHTML = '<span class="ptr-arrow">⇣</span> Pull to refresh';
+            }
+          });
+        } else {
+          if (indicator) {
+            indicator.className = 'ptr-indicator';
+            indicator.innerHTML = '<span class="ptr-arrow">⇣</span> Pull to refresh';
+          }
+        }
+        ptrState.dist = 0;
+      }, { passive: true });
+    }
+
+    // Initialize PTR when assets tab loads
+    document.addEventListener('tabChange', function(e) {
+      if (e.detail.tabId === 'tabAssets') {
+        setTimeout(initPullToRefresh, 100);
+      }
+    });
+
+
     function updateCountBar(filteredCount) {
       isLoading = false;
       showListLoading(false);
@@ -5293,6 +5458,139 @@
       }
     }
 
+    // ── Swipe-to-delete ───────────────────────────────────────────────────
+    let swipeState = { startX: 0, startY: 0, swiping: false, item: null, assetId: null, assetName: '' };
+    let undoData = null;
+    let undoTimer = null;
+    
+    function initSwipeToDelete() {
+      const list = document.getElementById('assetList');
+      if (!list) return;
+      
+      list.addEventListener('touchstart', function(e) {
+        const item = e.target.closest('.asset-item');
+        if (!item) return;
+        swipeState.item = item;
+        swipeState.startX = e.touches[0].clientX;
+        swipeState.startY = e.touches[0].clientY;
+        swipeState.swiping = false;
+        
+        // Get asset id from onclick
+        const onclick = item.getAttribute('onclick') || '';
+        const match = onclick.match(/viewAsset\((\d+)\)/);
+        swipeState.assetId = match ? parseInt(match[1]) : null;
+      }, { passive: true });
+      
+      list.addEventListener('touchmove', function(e) {
+        if (!swipeState.item || !swipeState.assetId) return;
+        const dx = e.touches[0].clientX - swipeState.startX;
+        const dy = e.touches[0].clientY - swipeState.startY;
+        
+        // Only horizontal swipe (reject vertical scrolling)
+        if (Math.abs(dx) > 15 && Math.abs(dx) > Math.abs(dy) * 1.5 && dx < 0) {
+          swipeState.swiping = true;
+          swipeState.item.classList.add('swipe-dragging');
+          const tx = Math.max(dx, -100);
+          swipeState.item.style.transform = 'translateX(' + tx + 'px)';
+          swipeState.item.style.opacity = (1 + tx / 200);
+          e.preventDefault();
+        }
+      }, { passive: false });
+      
+      list.addEventListener('touchend', function(e) {
+        if (!swipeState.item) return;
+        swipeState.item.classList.remove('swipe-dragging');
+        
+        if (swipeState.swiping) {
+          // Check if swiped far enough
+          const dx = parseFloat(swipeState.item.style.transform?.replace('translateX(', '').replace('px)', '') || '0');
+          if (dx < -50 && swipeState.assetId) {
+            // Delete with undo
+            swipeDeleteAsset(swipeState.assetId);
+          } else {
+            // Snap back
+            swipeState.item.style.transform = '';
+            swipeState.item.style.opacity = '';
+          }
+        }
+        swipeState.item = null;
+        swipeState.swiping = false;
+      }, { passive: true });
+    }
+    
+    async function swipeDeleteAsset(id) {
+      try {
+        // Get asset name for undo toast
+        const asset = cachedAssets.find(a => a.id === id);
+        const name = asset ? asset.name : 'Asset';
+        
+        // Store for undo
+        undoData = { id: id, name: name };
+        
+        // Delete via API
+        await api('/api/assets/' + id, 'DELETE');
+        
+        // Remove from local cache
+        cachedAssets = cachedAssets.filter(a => a.id !== id);
+        totalAssetCount = Math.max(0, totalAssetCount - 1);
+        renderAssetList(cachedAssets);
+        updateCountBar(cachedAssets.length);
+        
+        // Show undo toast
+        showUndoToast(name);
+        
+        // Clear undo after timeout
+        clearTimeout(undoTimer);
+        undoTimer = setTimeout(() => { undoData = null; }, 6000);
+        
+      } catch (e) {
+        showToast('Failed to delete: ' + e.message, true);
+      }
+    }
+    
+    function showUndoToast(name) {
+      const toast = document.getElementById('undoToast');
+      if (!toast) return;
+      toast.querySelector('span').textContent = '🗑️ Deleted ' + name;
+      toast.classList.add('show');
+    }
+    
+    function undoDelete() {
+      if (!undoData) return;
+      const { id, name } = undoData;
+      
+      // Remove from current list view temporarily (will be restored on next load)
+      // Actually, just reload to restore proper state
+      const toast = document.getElementById('undoToast');
+      if (toast) toast.classList.remove('show');
+      
+      // We can't easily undo a DELETE without the original data,
+      // so just show a note and flag to reload
+      showToast('Reload the list to restore — undo requires re-adding.', true);
+      undoData = null;
+      clearTimeout(undoTimer);
+      
+      // Reload assets to get accurate state
+      totalAssetCount = 0;
+      loadAssets();
+    }
+    
+    function dismissUndo() {
+      const toast = document.getElementById('undoToast');
+      if (toast) toast.classList.remove('show');
+      undoData = null;
+      clearTimeout(undoTimer);
+    }
+    
+    // Init swipe when assets tab loads
+    document.addEventListener('tabChange', function(e) {
+      if (e.detail.tabId === 'tabAssets') {
+        setTimeout(initSwipeToDelete, 150);
+      }
+    });
+
+
+    // ── Skeleton loading helpers ──────────────────────────────────────────
     function renderAssetList(assets) {
       const el = document.getElementById('assetList');
       if (!assets.length) {
@@ -5428,21 +5726,29 @@
       hideAllAssetViews();
       document.getElementById('assetsListView').style.display = 'block';
       loadAssets();
+      const fab = document.getElementById('fabAdd');
+      if (fab) fab.style.display = '';
     }
 
     function showDetailView() {
       hideAllAssetViews();
       document.getElementById('assetsDetailView').style.display = 'block';
+      const fab = document.getElementById('fabAdd');
+      if (fab) fab.style.display = 'none';
     }
 
     function showEditView() {
       hideAllAssetViews();
       document.getElementById('assetsEditView').style.display = 'block';
+      const fab = document.getElementById('fabAdd');
+      if (fab) fab.style.display = 'none';
     }
 
     function showImportView() {
       hideAllAssetViews();
       document.getElementById('assetsImportView').style.display = 'block';
+      const fab = document.getElementById('fabAdd');
+      if (fab) fab.style.display = 'none';
       // Reset import state
       document.getElementById('importFileInput').value = '';
       document.getElementById('importPreview').style.display = 'none';
@@ -6077,7 +6383,7 @@
       if (!confirmed) return;
       try {
         await api('/api/assets/' + AppState.currentAssetId, { method: 'DELETE' });
-        showToast('Asset deleted');
+        showSuccessFeedback('Asset deleted');
         showAssetList();
       } catch (e) {
         showToast(e.message, true);
@@ -6246,6 +6552,9 @@
       const clearBtn = document.getElementById('clearCustSearch');
       if (clearBtn) clearBtn.style.display = q ? 'block' : 'none';
 
+      // Show skeleton loading
+      renderCustomerSkeletons();
+
       try {
         const custs = await api('/api/customers');
         CustState.allCusts = custs;
@@ -6852,10 +7161,16 @@
         // Check frontend cache first
         const now = Date.now();
         if (!force && _dashCache.data && (now - _dashCache.ts) < DASH_CACHE_TTL) {
+          restoreDashboardContent();
           renderDashboard(_dashCache.data.stats, _dashCache.data.activity);
           return;
         }
 
+        // Show skeleton loading
+        if (!_dashCache.data) {
+          renderDashboardSkeletons();
+        }
+
         // Fetch stats and activity in parallel
         const [stats, activity] = await Promise.all([
           api('/api/stats'),
@@ -6864,6 +7179,7 @@
 
         // Cache the response
         _dashCache = { data: { stats, activity }, ts: now };
+        restoreDashboardContent();
         renderDashboard(stats, activity);
 
       } catch (e) {
@@ -7208,12 +7524,16 @@
       const cacheKey = `from=${df}&to=${dt}`;
       if (reportCacheKey === cacheKey && reportVisitsCache.length > 0) {
         // Use cached data — just re-render (no fetch)
+        restoreReportContent();
         renderServiceSummary(reportVisitsCache);
         renderVisitFrequency(reportVisitsCache);
         renderTimeOnSite(reportVisitsCache);
         return;
       }
 
+      // Show skeleton loading
+      renderReportSkeletons();
+
       // Show loading state
       const loadingEl = document.getElementById('rptLoading');
       const genBtn = document.getElementById('rptGenerateBtn');
@@ -7232,6 +7552,7 @@
         reportVisitsCache = visits;
         reportCacheKey = cacheKey;
 
+        restoreReportContent();
         renderServiceSummary(visits);
         renderVisitFrequency(visits);
         renderTimeOnSite(visits);
@@ -8858,7 +9179,28 @@
     initMouseDetection();
     initPullToRefresh();
     initSwipeToDelete();
-  </script>
+
+    // ── FAB initial visibility ─────────────────────────────────────────────
+    const fab = document.getElementById('fabAdd');
+    if (fab) {
+      // FAB visible only on Assets tab (initial tab is AddAsset)
+      const activePanel = document.querySelector('.tab-panel.active');
+      fab.style.display = (activePanel && activePanel.id === 'tabAssets') ? '' : 'none';
+    }
+  
+    // ── Button ripple / haptic micro-animations ───────────────────────────
+    document.addEventListener('click', function(e) {
+      const btn = e.target.closest('.btn, .qa-btn, .pill, .mode-toggle, .esc-cta, .esc-cta-sm');
+      if (!btn) return;
+      // Exclude FAB (has its own animation)
+      if (btn.id === 'fabAdd') return;
+      
+      // Quick haptic scale — add a temporary class, let CSS handle it
+      btn.classList.add('btn-pressed');
+      setTimeout(() => btn.classList.remove('btn-pressed'), 120);
+    });
+
+</script>
 
   <!-- ═══════════════════════════════════════════════════════════════════════
        ONBOARDING WELCOME OVERLAY