diff --git a/admin-spa/src/App.tsx b/admin-spa/src/App.tsx
index 7c0f42f..fbe2b48 100644
--- a/admin-spa/src/App.tsx
+++ b/admin-spa/src/App.tsx
@@ -262,7 +262,7 @@ function AddonRoute({ config }: { config: any }) {
   return <Component {...(config.props || {})} />;
 }
 
-function Header({ onFullscreen, fullscreen, showToggle = true }: { onFullscreen: () => void; fullscreen: boolean; showToggle?: boolean }) {
+function Header({ onFullscreen, fullscreen, showToggle = true, scrollContainerRef }: { onFullscreen: () => void; fullscreen: boolean; showToggle?: boolean; scrollContainerRef?: React.RefObject<HTMLDivElement> }) {
   const [siteTitle, setSiteTitle] = React.useState((window as any).wnw?.siteTitle || 'WooNooW');
   const [isVisible, setIsVisible] = React.useState(true);
   const [lastScrollY, setLastScrollY] = React.useState(0);
@@ -282,8 +282,11 @@ function Header({ onFullscreen, fullscreen, showToggle = true }: { onFullscreen:
   
   // Hide/show header on scroll (mobile only)
   React.useEffect(() => {
+    const scrollContainer = scrollContainerRef?.current;
+    if (!scrollContainer) return;
+    
     const handleScroll = () => {
-      const currentScrollY = window.scrollY;
+      const currentScrollY = scrollContainer.scrollTop;
       
       // Only apply on mobile (check window width)
       if (window.innerWidth >= 768) {
@@ -302,12 +305,12 @@ function Header({ onFullscreen, fullscreen, showToggle = true }: { onFullscreen:
       setLastScrollY(currentScrollY);
     };
 
-    window.addEventListener('scroll', handleScroll, { passive: true });
+    scrollContainer.addEventListener('scroll', handleScroll, { passive: true });
     
     return () => {
-      window.removeEventListener('scroll', handleScroll);
+      scrollContainer.removeEventListener('scroll', handleScroll);
     };
-  }, [lastScrollY]);
+  }, [lastScrollY, scrollContainerRef]);
   
   const handleLogout = async () => {
     try {
@@ -436,6 +439,7 @@ function Shell() {
   const toggle = () => setOn(v => !v);
   const isDesktop = useIsDesktop();
   const location = useLocation();
+  const scrollContainerRef = React.useRef<HTMLDivElement>(null);
   
   // Check if standalone mode - force fullscreen and hide toggle
   const isStandalone = window.WNW_CONFIG?.standaloneMode ?? false;
@@ -449,7 +453,7 @@ function Shell() {
       {!isStandalone && <ShortcutsBinder onToggle={toggle} />}
       {!isStandalone && <CommandPalette toggleFullscreen={toggle} />}
       <div className={`flex flex-col min-h-screen ${fullscreen ? 'woonoow-fullscreen-root' : ''}`}>
-        <Header onFullscreen={toggle} fullscreen={fullscreen} showToggle={!isStandalone} />
+        <Header onFullscreen={toggle} fullscreen={fullscreen} showToggle={!isStandalone} scrollContainerRef={scrollContainerRef} />
         {fullscreen ? (
           isDesktop ? (
             <div className="flex flex-1 min-h-0">
@@ -468,7 +472,6 @@ function Shell() {
             </div>
           ) : (
             <div className="flex flex-1 flex-col min-h-0">
-              <TopNav fullscreen />
               {isDashboardRoute ? (
                 <DashboardSubmenuBar items={main.children} fullscreen={true} />
               ) : (
@@ -476,7 +479,7 @@ function Shell() {
               )}
               <main className="flex-1 flex flex-col min-h-0 min-w-0 pb-14">
                 <PageHeader fullscreen={true} />
-                <div className="flex-1 overflow-auto p-4 min-w-0">
+                <div ref={scrollContainerRef} className="flex-1 overflow-auto p-4 min-w-0">
                   <AppRoutes />
                 </div>
               </main>
diff --git a/admin-spa/src/components/nav/BottomNav.tsx b/admin-spa/src/components/nav/BottomNav.tsx
index d6978b8..f0190ee 100644
--- a/admin-spa/src/components/nav/BottomNav.tsx
+++ b/admin-spa/src/components/nav/BottomNav.tsx
@@ -63,7 +63,7 @@ export function BottomNav() {
             <NavLink
               key={item.to}
               to={item.to}
-              className={`flex flex-col items-center justify-center flex-1 h-full gap-0.5 transition-colors focus:outline-none focus-visible:outline-none ${
+              className={`flex flex-col items-center justify-center flex-1 h-full gap-0.5 transition-colors focus:outline-none focus:shadow-none focus-visible:outline-none ${
                 active
                   ? 'text-primary'
                   : 'text-muted-foreground hover:text-foreground'
diff --git a/admin-spa/src/routes/Dashboard/index.tsx b/admin-spa/src/routes/Dashboard/index.tsx
index 8e35cb1..06cabef 100644
--- a/admin-spa/src/routes/Dashboard/index.tsx
+++ b/admin-spa/src/routes/Dashboard/index.tsx
@@ -11,6 +11,7 @@ import { useDashboardPeriod } from '@/hooks/useDashboardPeriod';
 import { useOverviewAnalytics } from '@/hooks/useAnalytics';
 import { ErrorCard } from '@/components/ErrorCard';
 import { getPageLoadErrorMessage } from '@/lib/errorHandling';
+import { useFABConfig } from '@/hooks/useFABConfig';
 
 // Dummy data for visualization
 const DUMMY_DATA = {
@@ -158,6 +159,7 @@ function MetricCard({ title, value, change, icon: Icon, format = 'number', perio
 
 
 export default function Dashboard() {
+  useFABConfig('dashboard'); // Add FAB for quick actions
   const { period } = useDashboardPeriod();
   const store = getStoreCurrency();
   const [hoverIndex, setHoverIndex] = useState<number | undefined>(undefined);