diff --git a/sitemap.xml b/sitemap.xml
index 7accb1d..236d27a 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -17,7 +17,7 @@
     <priority>0.8</priority>
   </url> -->
   <url>
-    <loc>https://www.pozo.app/pricing-pozoapp</loc>
+    <loc>https://www.pozo.app/pricing</loc>
     <lastmod>2025-10-13</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.8</priority>
diff --git a/src/.env.development b/src/.env.development
index f5b3b36..3bb476e 100644
--- a/src/.env.development
+++ b/src/.env.development
@@ -1,8 +1,8 @@
 ENV_BASE_URL='/'
-ENV_API_URL='http://192.168.1.37:8013'
-ENV_API_URL_TOKEN='http://192.168.1.37:8001'
-# ENV_API_URL_TOKEN='https://www.pozo.dev/JwtToken'
-# ENV_API_URL='https://www.pozo.dev/pozo-common-api'
+# ENV_API_URL='http://192.168.1.37:8013'
+# ENV_API_URL_TOKEN='http://192.168.1.37:8001'
+ENV_API_URL_TOKEN='https://www.pozo.dev/JwtToken'
+ENV_API_URL='https://www.pozo.dev/pozo-common-api'
 # ENV_IMAGE_UPLOAD_API_URL="https://api.pozo.app/pozo-common-image-api/"
 ENV_API_URL_RETAIL='http://192.168.1.37:8012/'
 # ENV_API_URL_TOKEN='https://api.pozo.app/JwtToken'
diff --git a/src/.env.production b/src/.env.production
index d10dfe2..8eeb796 100644
--- a/src/.env.production
+++ b/src/.env.production
@@ -1,31 +1,6 @@
-#221 server
-
-# ENV_BASE_URL='/home/'
-# ENV_API_URL='http://api.pozo.co.in/Pozocommonapi_UnderTest'
-# # ENV_API_URL='http://api.pozo.co.in/Pozocommonapi'
-# ENV_IMAGE_UPLOAD_API_URL="https://api.pozo.app/pozo-common-image-api"
-# ENV_SECRET_KEY="3a939a2eed2cca4b64cd47f51b23b135b2b9b765273f695d47682ea803c8429d"
-# ENV_URL_SECRET_KEY="f2ef79b8b2d4fc1cc569726a5a753552257b4ff2872d6a71cf3119bce3f07c1b"
-# ENV_MAIN_BASE_URL='http://pozo.co.in/'
-# ENV_MAIN_REDIRECT_URL='/apps/retail/app-page/home'
-
-# live server(#173 server)
-# ENV_BASE_URL='/home/'
-# ENV_API_URL_TOKEN='https://api.pozo.app/JwtToken'
-# ENV_API_URL='https://api.pozo.app/pozo-common-api'
-# ENV_IMAGE_UPLOAD_API_URL="https://api.pozo.app/pozo-common-image-api"
-# ENV_SECRET_KEY="3a939a2eed2cca4b64cd47f51b23b135b2b9b765273f695d47682ea803c8429d"
-# ENV_URL_SECRET_KEY="f2ef79b8b2d4fc1cc569726a5a753552257b4ff2872d6a71cf3119bce3f07c1b"
-# ENV_MAIN_BASE_URL='https://www.pozo.app'
-# ENV_MAIN_REDIRECT_URL='/apps/retail/app-page/home'
-# ENV_PAYMENT_URL='https://pozo.app/paymentgateway/PozoPaymentGateway'
-# ENV_CUSTOM_PAYMENT_URL='https://pozo.app/CustomPaymentGateway/CustomPaymentGateway'
-# ENV_EMAIL_API='https://api.pozo.app/pozo-sms-email-template-api'
-# ENV_API_URL_RETAIL='https://api.pozo.app/pozo-retail-api'
-
 #172 server
 
-ENV_BASE_URL='/home/'
+ENV_BASE_URL='/'
 ENV_API_URL_TOKEN='https://www.pozo.dev/JwtToken'
 ENV_API_URL='https://www.pozo.dev/pozo-common-api'
 ENV_API_URL_RETAIL='https://www.pozo.dev/pozo-retail-api'
@@ -37,5 +12,3 @@ ENV_MAIN_REDIRECT_URL='/apps/retail/app-page/home'
 ENV_PAYMENT_URL='https://pozo.app/paymentgateway/PozoPaymentGateway'
 ENV_CUSTOM_PAYMENT_URL='https://pozo.app/CustomPaymentGateway/CustomPaymentGateway'
 ENV_EMAIL_API='https://www.pozo.dev/pozo-sms-email-template-api'
-
-
diff --git a/src/AdminPanel/Styles/BlogForm.scss b/src/AdminPanel/Styles/BlogForm.scss
index 4c74c29..a91edfd 100644
--- a/src/AdminPanel/Styles/BlogForm.scss
+++ b/src/AdminPanel/Styles/BlogForm.scss
@@ -811,3 +811,23 @@
         justify-content: center;
     }
 }
+
+
+.filterAssDcc {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    button {
+        width: max-content;
+        padding: 8px 16px;
+        border: none;
+        font-family: "Poppins", sans-serif;
+        font-size: 14px;
+        font-weight: 500;
+        background-color: #e0ecff;
+        color: #1e6ae4;
+        border-radius: 6px;
+        cursor: pointer;
+        outline: none;
+    }
+}
diff --git a/src/App.jsx b/src/App.jsx
index e506a3b..51ab05d 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -69,6 +69,7 @@ import { useEffect } from "react";
 import { checkSession, GenerateLogout } from "./features/signInPage/signInPage.js";
 import { useDispatch } from "react-redux";
 import { clearSession, getSession } from "./Services/others.js";
+import { PostToken } from "./features/publicHome/publicHome.js";
 import LoyaltysettingList from "./Pages/LoyaltySetting/LoyaltysettingList.jsx"
 import LoyaltysettingsForm from "./Pages/LoyaltySetting/LoyaltysettingsForm.jsx"
 import ActivationkeyGeneration from "./Pages/ActivationkeyGeneration/ActivationkeyGeneration.jsx";
@@ -128,10 +129,28 @@ const App = () => {
       const navigate = useNavigate();
       const dispatch = useDispatch();
 
+      // 🔑 Global token generation for direct URL access
       useEffect(() => {
-            sessionCheckFun()
+            const ensureToken = async () => {
+                  const existingToken = sessionStorage.getItem("auth");
+                  
+                  if (!existingToken) {
+                        try {
+                              console.log("🔑 App: Generating global auth token...");
+                              await dispatch(PostToken({ 
+                                    username: "1000000001", 
+                                    password: "1234" 
+                              })).unwrap();
+                              console.log("✅ App: Token generated successfully");
+                        } catch (error) {
+                              console.error("❌ App: Token generation failed:", error);
+                        }
+                  }
+            };
             
-      }, [navigate]);
+            ensureToken();
+            sessionCheckFun();
+      }, [navigate, dispatch]);
 
       const sessionCheckFun=async()=>{
             const UserId = getSession('UserId')
diff --git a/src/LandingPageCMS/LandingPageCMS.jsx b/src/LandingPageCMS/LandingPageCMS.jsx
new file mode 100644
index 0000000..75073ea
--- /dev/null
+++ b/src/LandingPageCMS/LandingPageCMS.jsx
@@ -0,0 +1,271 @@
+import React, { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import "./LandingPageCMS.scss";
+import { 
+  FaHome, 
+  FaHeading, 
+  FaImage, 
+  FaQuestionCircle, 
+  FaArrowLeft,
+  FaSave,
+  FaEye,
+  FaLock,
+  FaMoon,
+  FaSun,
+  FaBars,
+  FaTimes
+} from "react-icons/fa";
+import { MdDashboard, MdEdit } from "react-icons/md";
+import { useDispatch } from "react-redux";
+import { message } from "antd";
+import { getAdminPanel, postAdminPanel, putAdminPanel } from "../features/AdminPanel/AdminPanel";
+import { getSession } from "../Services/others";
+
+// Section Components
+import HeroContentEditor from "./Sections/HeroContentEditor";
+import OfferingsEditor from "./Sections/OfferingsEditor";
+import FeaturesEditor from "./Sections/FeaturesEditor";
+import FAQEditor from "./Sections/FAQEditor";
+
+const subDirectory = import.meta.env.ENV_BASE_URL;
+
+const LandingPageCMS = () => {
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+  const [activeSection, setActiveSection] = useState("hero");
+  const [isSaving, setIsSaving] = useState(false);
+  const [hasChanges, setHasChanges] = useState(false);
+  const [isAuthorized, setIsAuthorized] = useState(false);
+  const [isCheckingAuth, setIsCheckingAuth] = useState(true);
+  const [isDarkMode, setIsDarkMode] = useState(true);
+  const [isMobileSidebarOpen, setIsMobileSidebarOpen] = useState(false);
+
+  // Load theme preference from localStorage
+  useEffect(() => {
+    const savedTheme = localStorage.getItem("landing-cms-theme");
+    if (savedTheme) {
+      setIsDarkMode(savedTheme === "dark");
+    }
+  }, []);
+
+  const toggleTheme = () => {
+    const newTheme = !isDarkMode;
+    setIsDarkMode(newTheme);
+    localStorage.setItem("landing-cms-theme", newTheme ? "dark" : "light");
+  };
+
+  // 📱 Prevent body scroll when mobile sidebar is open
+  useEffect(() => {
+    if (isMobileSidebarOpen && window.innerWidth <= 900) {
+      document.body.style.overflow = "hidden";
+    } else {
+      document.body.style.overflow = "";
+    }
+    return () => {
+      document.body.style.overflow = "";
+    };
+  }, [isMobileSidebarOpen]);
+
+  // 🔒 Authentication Check
+  useEffect(() => {
+    const checkAuthentication = () => {
+      const userType = getSession("UserType");
+      const userId = getSession("UserId");
+      const authToken = sessionStorage.getItem("auth");
+
+      // Allow only Marketing, Super Admin, or Admin
+      const allowedUserTypes = ["Marketing", "Super Admin", "Admin", "Super Admin User"];
+      
+      if (!authToken || !userId || !allowedUserTypes.includes(userType)) {
+        message.error("Unauthorized access! Please login first.");
+        navigate(`${subDirectory}signin`);
+        return;
+      }
+
+      setIsAuthorized(true);
+      setIsCheckingAuth(false);
+    };
+
+    checkAuthentication();
+  }, [navigate]);
+
+  const sections = [
+    { 
+      id: "hero", 
+      name: "Hero Section", 
+      icon: <FaHeading />,
+      description: "Main headline, subtext, and CTA button",
+      component: HeroContentEditor
+    },
+    { 
+      id: "offerings", 
+      name: "Offerings", 
+      icon: <FaImage />,
+      description: "3 key features (Experience, Innovation, Cost)",
+      component: OfferingsEditor
+    },
+    { 
+      id: "features", 
+      name: "Features", 
+      icon: <MdDashboard />,
+      description: "Product features and benefits",
+      component: FeaturesEditor
+    },
+    { 
+      id: "faq", 
+      name: "FAQ Section", 
+      icon: <FaQuestionCircle />,
+      description: "Frequently asked questions",
+      component: FAQEditor
+    }
+  ];
+
+  const currentSection = sections.find(s => s.id === activeSection);
+  const CurrentComponent = currentSection?.component;
+
+  const handlePreview = () => {
+    window.open(`${subDirectory}`, '_blank');
+  };
+
+  const handleSaveAll = async () => {
+    setIsSaving(true);
+    try {
+      // Save logic will be implemented in each section component
+      message.success("All changes saved successfully!");
+      setHasChanges(false);
+    } catch (error) {
+      message.error("Failed to save changes");
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  // Show loading while checking auth
+  if (isCheckingAuth) {
+    return (
+      <div className="landing-cms-auth-loading">
+        <div className="auth-loading-spinner"></div>
+        <p>Verifying access...</p>
+      </div>
+    );
+  }
+
+  // Don't render if not authorized (will redirect)
+  if (!isAuthorized) {
+    return null;
+  }
+
+  return (
+    <div className={`landing-cms-container ${isDarkMode ? 'dark-mode' : 'light-mode'}`}>
+      {/* Top Header */}
+      <div className="landing-cms-header">
+        <div className="landing-cms-header-left">
+          <button 
+            className="landing-cms-mobile-menu-btn"
+            onClick={() => setIsMobileSidebarOpen(!isMobileSidebarOpen)}
+            aria-label="Toggle mobile menu"
+          >
+            {isMobileSidebarOpen ? <FaTimes /> : <FaBars />}
+          </button>
+          <button 
+            className="landing-cms-back-btn"
+            onClick={() => navigate(`${subDirectory}`)}
+          >
+            <FaArrowLeft /> <span>Back to Home</span>
+          </button>
+          <div className="landing-cms-title-section">
+            <h1>Landing Page CMS</h1>
+            <p>Manage your homepage content dynamically</p>
+          </div>
+        </div>
+        <div className="landing-cms-header-right">
+          <button 
+            className="landing-cms-theme-toggle"
+            onClick={toggleTheme}
+            aria-label={isDarkMode ? "Switch to Light Mode" : "Switch to Dark Mode"}
+            title={isDarkMode ? "Switch to Light Mode" : "Switch to Dark Mode"}
+          >
+            {isDarkMode ? <FaSun /> : <FaMoon />}
+          </button>
+          <button 
+            className="landing-cms-preview-btn"
+            onClick={handlePreview}
+          >
+            <FaEye /> <span>Preview</span>
+          </button>
+          <button 
+            className={`landing-cms-save-btn ${hasChanges ? 'has-changes' : ''}`}
+            onClick={handleSaveAll}
+            disabled={isSaving || !hasChanges}
+          >
+            <FaSave /> <span>{isSaving ? 'Saving...' : 'Save All Changes'}</span>
+          </button>
+        </div>
+      </div>
+
+      <div className="landing-cms-main">
+        {/* Mobile Overlay */}
+        {isMobileSidebarOpen && (
+          <div 
+            className="landing-cms-mobile-overlay"
+            onClick={() => setIsMobileSidebarOpen(false)}
+            aria-hidden="true"
+          />
+        )}
+
+        {/* Sidebar Navigation */}
+        <div className={`landing-cms-sidebar ${isMobileSidebarOpen ? 'mobile-open' : ''}`}>
+          <div className="landing-cms-sidebar-header">
+            <FaHome />
+            <span>Content Sections</span>
+          </div>
+          <div className="landing-cms-nav-items">
+            {sections.map((section) => (
+              <button
+                key={section.id}
+                className={`landing-cms-nav-item ${activeSection === section.id ? 'active' : ''}`}
+                onClick={() => {
+                  setActiveSection(section.id);
+                  setIsMobileSidebarOpen(false); // Close on mobile after selection
+                }}
+              >
+                <div className="landing-cms-nav-icon">{section.icon}</div>
+                <div className="landing-cms-nav-content">
+                  <div className="landing-cms-nav-title">{section.name}</div>
+                  <div className="landing-cms-nav-desc">{section.description}</div>
+                </div>
+              </button>
+            ))}
+          </div>
+        </div>
+
+        {/* Content Area */}
+        <div className="landing-cms-content">
+          <div className="landing-cms-content-header">
+            <div className="landing-cms-breadcrumb">
+              <span>Landing Page</span>
+              <span>/</span>
+              <span>{currentSection?.name}</span>
+            </div>
+            {hasChanges && (
+              <div className="landing-cms-unsaved-badge">
+                Unsaved changes
+              </div>
+            )}
+          </div>
+          
+          <div className="landing-cms-content-body">
+            {CurrentComponent && (
+              <CurrentComponent 
+                onDataChange={() => setHasChanges(true)}
+              />
+            )}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default LandingPageCMS;
+
diff --git a/src/LandingPageCMS/LandingPageCMS.scss b/src/LandingPageCMS/LandingPageCMS.scss
new file mode 100644
index 0000000..6cc75bc
--- /dev/null
+++ b/src/LandingPageCMS/LandingPageCMS.scss
@@ -0,0 +1,627 @@
+// 🎨 Landing Page CMS - Clean Minimal Design
+
+.landing-cms-container {
+  min-height: 100vh;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+  transition: background 0.3s ease;
+
+  // Dark Mode
+  &.dark-mode {
+    background: #000;
+    color: #e5e5e5;
+  }
+
+  // Light Mode  
+  &.light-mode {
+    background: #fafafa;
+    color: #171717;
+  }
+}
+
+// Auth Loading
+.landing-cms-auth-loading {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  min-height: 100vh;
+  background: #000;
+
+  .auth-loading-spinner {
+    width: 40px;
+    height: 40px;
+    border: 2px solid #333;
+    border-top-color: #fff;
+    border-radius: 50%;
+    animation: spin 0.6s linear infinite;
+  }
+
+  p {
+    margin-top: 1rem;
+    color: #888;
+    font-size: 13px;
+  }
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+// Header
+.landing-cms-header {
+  padding: 1rem 1.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1px solid;
+  position: sticky;
+  top: 0;
+  z-index: 1002;
+
+  .dark-mode & {
+    background: #111;
+    border-color: #222;
+  }
+
+  .light-mode & {
+    background: #fff;
+    border-color: #e5e5e5;
+  }
+
+  @media (max-width: 768px) {
+    padding: 0.875rem 1rem;
+  }
+
+  .landing-cms-header-left {
+    display: flex;
+    align-items: center;
+    gap: 1.5rem;
+  }
+
+  .landing-cms-mobile-menu-btn {
+    display: none;
+    align-items: center;
+    justify-content: center;
+    width: 40px;
+    height: 40px;
+    background: transparent;
+    border: 1px solid;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: all 0.2s;
+    font-size: 18px;
+    -webkit-tap-highlight-color: transparent;
+    flex-shrink: 0;
+
+    .dark-mode & {
+      border-color: #333;
+      color: #e5e5e5;
+
+      &:hover, &:active {
+        border-color: #0ea5e9;
+        background: #1a1a1a;
+        color: #0ea5e9;
+      }
+    }
+
+    .light-mode & {
+      border-color: #d4d4d4;
+      color: #171717;
+
+      &:hover, &:active {
+        border-color: #0969da;
+        background: #f5f5f5;
+        color: #0969da;
+      }
+    }
+
+    @media (max-width: 900px) {
+      display: flex;
+    }
+  }
+
+  .landing-cms-back-btn {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.5rem 1rem;
+    background: transparent;
+    border: 1px solid;
+    border-radius: 6px;
+    font-size: 13px;
+    cursor: pointer;
+    transition: all 0.2s;
+    font-family: inherit;
+
+    .dark-mode & {
+      border-color: #333;
+      color: #e5e5e5;
+
+      &:hover {
+        border-color: #666;
+        background: #1a1a1a;
+      }
+    }
+
+    .light-mode & {
+      border-color: #d4d4d4;
+      color: #171717;
+
+      &:hover {
+        border-color: #999;
+        background: #f5f5f5;
+      }
+    }
+
+    @media (max-width: 768px) {
+      padding: 0.5rem 0.75rem;
+
+      span {
+        display: none;
+      }
+    }
+
+    svg {
+      font-size: 14px;
+    }
+  }
+
+  .landing-cms-title-section h1 {
+    margin: 0;
+    font-size: 16px;
+    font-weight: 600;
+
+    .dark-mode & {
+      color: #fff;
+    }
+
+    .light-mode & {
+      color: #000;
+    }
+
+    @media (max-width: 768px) {
+      font-size: 14px;
+    }
+  }
+
+  .landing-cms-title-section p {
+    display: none;
+  }
+
+  .landing-cms-header-right {
+    display: flex;
+    gap: 0.5rem;
+  }
+
+  .landing-cms-theme-toggle {
+    width: 40px;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: transparent;
+    border: 1px solid;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: all 0.2s;
+    font-size: 18px;
+    -webkit-tap-highlight-color: transparent;
+    flex-shrink: 0;
+
+    .dark-mode & {
+      border-color: #333;
+      color: #fbbf24;
+
+      &:hover, &:active {
+        border-color: #fbbf24;
+        background: #1a1a1a;
+      }
+    }
+
+    .light-mode & {
+      border-color: #d4d4d4;
+      color: #f59e0b;
+
+      &:hover, &:active {
+        border-color: #f59e0b;
+        background: #f5f5f5;
+      }
+    }
+  }
+
+  .landing-cms-preview-btn,
+  .landing-cms-save-btn {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.625rem 1.25rem;
+    font-size: 13px;
+    font-weight: 500;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: all 0.2s;
+    font-family: inherit;
+
+    @media (max-width: 768px) {
+      padding: 0.625rem 0.875rem;
+
+      span {
+        display: none;
+      }
+    }
+
+    svg {
+      font-size: 14px;
+    }
+  }
+
+  .landing-cms-preview-btn {
+    background: transparent;
+    border: 1px solid;
+
+    .dark-mode & {
+      border-color: #333;
+      color: #e5e5e5;
+
+      &:hover {
+        border-color: #666;
+        background: #1a1a1a;
+      }
+    }
+
+    .light-mode & {
+      border-color: #d4d4d4;
+      color: #171717;
+
+      &:hover {
+        border-color: #999;
+        background: #f5f5f5;
+      }
+    }
+  }
+
+  .landing-cms-save-btn {
+    border: none;
+
+    .dark-mode & {
+      background: #fff;
+      color: #000;
+
+      &:hover:not(:disabled) {
+        background: #e5e5e5;
+      }
+
+      &.has-changes {
+        background: #10b981;
+        color: #fff;
+
+        &:hover {
+          background: #059669;
+        }
+      }
+    }
+
+    .light-mode & {
+      background: #000;
+      color: #fff;
+
+      &:hover:not(:disabled) {
+        background: #333;
+      }
+
+      &.has-changes {
+        background: #10b981;
+        color: #fff;
+
+        &:hover {
+          background: #059669;
+        }
+      }
+    }
+
+    &:disabled {
+      opacity: 0.4;
+      cursor: not-allowed;
+    }
+  }
+}
+
+// Main
+.landing-cms-main {
+  display: flex;
+  min-height: calc(100vh - 60px);
+
+  @media (max-width: 900px) {
+    position: relative;
+  }
+}
+
+// Sidebar
+.landing-cms-sidebar {
+  width: 280px;
+  padding: 1.5rem 0;
+  overflow-y: auto;
+  overflow-x: hidden;
+  -webkit-overflow-scrolling: touch;
+  border-right: 1px solid;
+  transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+
+  .dark-mode & {
+    background: #111;
+    border-color: #222;
+  }
+
+  .light-mode & {
+    background: #fff;
+    border-color: #e5e5e5;
+  }
+
+  @media (max-width: 900px) {
+    position: fixed !important;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 1001 !important;
+    transform: translateX(-100%);
+    box-shadow: 4px 0 24px rgba(0, 0, 0, 0.6);
+    padding-top: 70px;
+    width: 85%;
+    max-width: 320px;
+
+    &.mobile-open {
+      transform: translateX(0) !important;
+    }
+  }
+
+  @media (max-width: 480px) {
+    width: 90%;
+  }
+
+  .landing-cms-sidebar-header {
+    padding: 0 1.25rem 1rem;
+    font-size: 11px;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 1px;
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+
+    .dark-mode & {
+      color: #888;
+    }
+
+    .light-mode & {
+      color: #999;
+    }
+
+    svg {
+      font-size: 14px;
+    }
+  }
+
+  .landing-cms-nav-items {
+    display: flex;
+    flex-direction: column;
+    gap: 0.375rem;
+    padding: 0 0.75rem;
+  }
+
+  .landing-cms-nav-item {
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+    padding: 0.875rem 1rem;
+    background: transparent;
+    border: 1px solid transparent;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: all 0.2s;
+    text-align: left;
+    -webkit-tap-highlight-color: transparent;
+    user-select: none;
+
+    @media (max-width: 900px) {
+      padding: 1rem 1.25rem;
+      min-height: 60px;
+    }
+
+    .landing-cms-nav-icon {
+      width: 20px;
+      height: 20px;
+      font-size: 20px;
+      flex-shrink: 0;
+      transition: color 0.2s;
+
+      .dark-mode & {
+        color: #888;
+      }
+
+      .light-mode & {
+        color: #999;
+      }
+    }
+
+    .landing-cms-nav-content {
+      flex: 1;
+
+      .landing-cms-nav-title {
+        font-size: 14px;
+        font-weight: 500;
+        margin-bottom: 0.25rem;
+        transition: color 0.2s;
+
+        .dark-mode & {
+          color: #e5e5e5;
+        }
+
+        .light-mode & {
+          color: #171717;
+        }
+      }
+
+      .landing-cms-nav-desc {
+        font-size: 12px;
+        line-height: 1.4;
+
+        .dark-mode & {
+          color: #888;
+        }
+
+        .light-mode & {
+          color: #999;
+        }
+      }
+    }
+
+    .dark-mode &:hover {
+      background: #1a1a1a;
+      border-color: #333;
+    }
+
+    .light-mode &:hover {
+      background: #f5f5f5;
+      border-color: #e5e5e5;
+    }
+
+    &.active {
+      .dark-mode & {
+        background: #1a1a1a;
+        border-color: #0ea5e9;
+
+        .landing-cms-nav-icon {
+          color: #10b981;
+        }
+
+        .landing-cms-nav-title {
+          color: #fff;
+          font-weight: 600;
+        }
+      }
+
+      .light-mode & {
+        background: #f0f9ff;
+        border-color: #0ea5e9;
+
+        .landing-cms-nav-icon {
+          color: #10b981;
+        }
+
+        .landing-cms-nav-title {
+          color: #000;
+          font-weight: 600;
+        }
+
+        .landing-cms-nav-desc {
+          color: #666;
+        }
+      }
+    }
+  }
+}
+
+// Mobile Overlay
+.landing-cms-mobile-overlay {
+  display: none;
+
+  @media (max-width: 900px) {
+    display: block;
+    position: fixed !important;
+    inset: 0;
+    top: 0;
+    background: rgba(0, 0, 0, 0.75);
+    z-index: 1000 !important;
+    animation: fadeIn 0.25s ease;
+    -webkit-tap-highlight-color: transparent;
+  }
+}
+
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+// Content
+.landing-cms-content {
+  flex: 1;
+  padding: 2rem 2.5rem;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+
+  .dark-mode & {
+    background: #000;
+  }
+
+  .light-mode & {
+    background: #fafafa;
+  }
+
+  @media (max-width: 900px) {
+    padding: 1.5rem 1rem;
+  }
+
+  @media (max-width: 480px) {
+    padding: 1rem;
+  }
+
+  .landing-cms-content-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 2rem;
+
+    .landing-cms-breadcrumb {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      font-size: 12px;
+
+      .dark-mode & {
+        color: #888;
+
+        span:last-child {
+          color: #e5e5e5;
+          font-weight: 500;
+        }
+      }
+
+      .light-mode & {
+        color: #999;
+
+        span:last-child {
+          color: #171717;
+          font-weight: 500;
+        }
+      }
+    }
+
+    .landing-cms-unsaved-badge {
+      padding: 0.375rem 0.875rem;
+      background: #fbbf24;
+      color: #000;
+      border-radius: 16px;
+      font-size: 11px;
+      font-weight: 600;
+    }
+  }
+
+  .landing-cms-content-body {
+    border-radius: 8px;
+    padding: 2.5rem;
+    border: 1px solid;
+
+    .dark-mode & {
+      background: #111;
+      border-color: #222;
+    }
+
+    .light-mode & {
+      background: #fff;
+      border-color: #e5e5e5;
+    }
+
+    @media (max-width: 768px) {
+      padding: 1.5rem;
+    }
+  }
+}
diff --git a/src/LandingPageCMS/Sections/FAQEditor.jsx b/src/LandingPageCMS/Sections/FAQEditor.jsx
new file mode 100644
index 0000000..9de1330
--- /dev/null
+++ b/src/LandingPageCMS/Sections/FAQEditor.jsx
@@ -0,0 +1,27 @@
+import React from "react";
+import "./SectionEditor.scss";
+import { FaQuestionCircle } from "react-icons/fa";
+
+const FAQEditor = ({ onDataChange }) => {
+  return (
+    <div className="section-editor">
+      <div className="section-editor-header">
+        <div className="section-editor-icon">
+          <FaQuestionCircle />
+        </div>
+        <div>
+          <h2>FAQ Section</h2>
+          <p>Manage frequently asked questions (Coming Soon)</p>
+        </div>
+      </div>
+
+      <div className="info-box">
+        <strong>Coming Soon:</strong>
+        FAQ editor will allow you to add, edit, and organize frequently asked questions.
+      </div>
+    </div>
+  );
+};
+
+export default FAQEditor;
+
diff --git a/src/LandingPageCMS/Sections/FeaturesEditor.jsx b/src/LandingPageCMS/Sections/FeaturesEditor.jsx
new file mode 100644
index 0000000..bdcc80a
--- /dev/null
+++ b/src/LandingPageCMS/Sections/FeaturesEditor.jsx
@@ -0,0 +1,27 @@
+import React from "react";
+import "./SectionEditor.scss";
+import { MdDashboard } from "react-icons/md";
+
+const FeaturesEditor = ({ onDataChange }) => {
+  return (
+    <div className="section-editor">
+      <div className="section-editor-header">
+        <div className="section-editor-icon">
+          <MdDashboard />
+        </div>
+        <div>
+          <h2>Features Section</h2>
+          <p>Manage product features and benefits (Coming Soon)</p>
+        </div>
+      </div>
+
+      <div className="info-box">
+        <strong>Coming Soon:</strong>
+        Features editor will allow you to manage the product features section dynamically.
+      </div>
+    </div>
+  );
+};
+
+export default FeaturesEditor;
+
diff --git a/src/LandingPageCMS/Sections/HeroContentEditor.jsx b/src/LandingPageCMS/Sections/HeroContentEditor.jsx
new file mode 100644
index 0000000..340e0a5
--- /dev/null
+++ b/src/LandingPageCMS/Sections/HeroContentEditor.jsx
@@ -0,0 +1,216 @@
+import React, { useState, useEffect } from "react";
+import { useDispatch } from "react-redux";
+import { message } from "antd";
+import { getAdminPanel, postAdminPanel, putAdminPanel } from "../../features/AdminPanel/AdminPanel";
+import "./SectionEditor.scss";
+import { FaRegLightbulb, FaSave } from "react-icons/fa";
+import { MdTitle, MdDescription } from "react-icons/md";
+
+const HeroContentEditor = ({ onDataChange }) => {
+  const dispatch = useDispatch();
+  const [isLoading, setIsLoading] = useState(true);
+  const [isSaving, setIsSaving] = useState(false);
+  
+  // Form fields
+  const [mainHeadline, setMainHeadline] = useState("Retail ERP & POS built for Indian MSMEs — fast billing, smart inventory, GST-ready.");
+  const [description, setDescription] = useState("A SaaS platform that empowers Small and Medium Businesses by digitizing operations and reducing Total Cost of Ownership with minimal investment.");
+  const [ctaButtonText, setCtaButtonText] = useState("Experience Now");
+  const [ctaButtonLink, setCtaButtonLink] = useState("/signin");
+
+  useEffect(() => {
+    fetchHeroData();
+  }, []);
+
+  const fetchHeroData = async () => {
+    try {
+      setIsLoading(true);
+      const res = await dispatch(
+        getAdminPanel({ sectionName: "HeroSection" })
+      ).unwrap();
+      
+      if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) {
+        const heroData = res.data.data[0];
+        if (heroData.Content) {
+          const content = JSON.parse(heroData.Content);
+          setMainHeadline(content.mainHeadline || mainHeadline);
+          setDescription(content.description || description);
+          setCtaButtonText(content.ctaButtonText || ctaButtonText);
+          setCtaButtonLink(content.ctaButtonLink || ctaButtonLink);
+        }
+      }
+    } catch (error) {
+      console.log("No existing hero data, using defaults");
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleSave = async () => {
+    if (!mainHeadline.trim() || !description.trim()) {
+      message.error("Headline and description are required!");
+      return;
+    }
+
+    try {
+      setIsSaving(true);
+      
+      const data = {
+        SectionName: "HeroSection",
+        Content: JSON.stringify({
+          mainHeadline: mainHeadline.trim(),
+          description: description.trim(),
+          ctaButtonText: ctaButtonText.trim(),
+          ctaButtonLink: ctaButtonLink.trim()
+        }),
+        ActiveStatus: "A",
+        CreatedBy: 1,
+        ModifiedBy: 1
+      };
+
+      await dispatch(postAdminPanel(data)).unwrap();
+      message.success("Hero section saved successfully!");
+      onDataChange?.();
+    } catch (error) {
+      console.error("Save error:", error);
+      message.error("Failed to save. Please try again.");
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  if (isLoading) {
+    return (
+      <div className="section-editor-loading">
+        <div className="loading-spinner"></div>
+        <p>Loading hero section...</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="section-editor">
+      <div className="section-editor-header">
+        <div className="section-editor-icon">
+          <MdTitle />
+        </div>
+        <div>
+          <h2>Hero Section Content</h2>
+          <p>Manage the main headline, description, and CTA button on your landing page</p>
+        </div>
+      </div>
+
+      <div className="section-editor-form">
+        {/* Main Headline */}
+        <div className="form-group">
+          <label htmlFor="mainHeadline">
+            Main Headline
+            <span className="label-hint">First thing visitors see</span>
+          </label>
+          <textarea
+            id="mainHeadline"
+            value={mainHeadline}
+            onChange={(e) => {
+              setMainHeadline(e.target.value);
+              onDataChange?.();
+            }}
+            placeholder="Enter main headline (press Enter for new line)"
+            rows={4}
+            className="form-textarea headline-input"
+          />
+          <div className="input-help">
+            Tip: Press Enter to add line breaks
+          </div>
+        </div>
+
+        {/* Description */}
+        <div className="form-group">
+          <label htmlFor="description">
+            Description
+            <span className="label-hint">Supporting text</span>
+          </label>
+          <textarea
+            id="description"
+            value={description}
+            onChange={(e) => {
+              setDescription(e.target.value);
+              onDataChange?.();
+            }}
+            placeholder="Enter description"
+            rows={3}
+            className="form-textarea"
+          />
+        </div>
+
+        {/* CTA Button */}
+        <div className="form-row">
+          <div className="form-group">
+            <label htmlFor="ctaButtonText">Button Text</label>
+            <input
+              type="text"
+              id="ctaButtonText"
+              value={ctaButtonText}
+              onChange={(e) => {
+                setCtaButtonText(e.target.value);
+                onDataChange?.();
+              }}
+              placeholder="e.g., Get Started"
+              className="form-input"
+            />
+          </div>
+          <div className="form-group">
+            <label htmlFor="ctaButtonLink">Button Link</label>
+            <input
+              type="text"
+              id="ctaButtonLink"
+              value={ctaButtonLink}
+              onChange={(e) => {
+                setCtaButtonLink(e.target.value);
+                onDataChange?.();
+              }}
+              placeholder="e.g., /signin"
+              className="form-input"
+            />
+          </div>
+        </div>
+
+        {/* Single Combined Preview */}
+        <div className="form-group">
+          <label>Live Preview</label>
+          <div className="input-preview">
+            <div className="preview-text headline-preview">
+              {mainHeadline.split('\n').map((line, i) => (
+                <React.Fragment key={i}>
+                  {line}
+                  {i < mainHeadline.split('\n').length - 1 && <br />}
+                </React.Fragment>
+              ))}
+            </div>
+            <div className="preview-text" style={{ marginTop: '1rem', fontSize: '14px', color: '#666' }}>
+              {description}
+            </div>
+            <div className="button-preview">
+              <button className="preview-cta-btn">
+                {ctaButtonText}
+                <div className="preview-icon">→</div>
+              </button>
+            </div>
+          </div>
+        </div>
+
+        {/* Save Button */}
+        <div className="section-editor-actions">
+          <button
+            onClick={handleSave}
+            disabled={isSaving}
+            className="save-section-btn"
+          >
+            <FaSave /> {isSaving ? "Saving..." : "Save Changes"}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default HeroContentEditor;
+
diff --git a/src/LandingPageCMS/Sections/OfferingsEditor.jsx b/src/LandingPageCMS/Sections/OfferingsEditor.jsx
new file mode 100644
index 0000000..400a398
--- /dev/null
+++ b/src/LandingPageCMS/Sections/OfferingsEditor.jsx
@@ -0,0 +1,212 @@
+import React, { useState, useEffect } from "react";
+import { useDispatch } from "react-redux";
+import { message } from "antd";
+import { getAdminPanel, postAdminPanel } from "../../features/AdminPanel/AdminPanel";
+import "./SectionEditor.scss";
+import { FaSave, FaLightbulb, FaCog, FaDollarSign } from "react-icons/fa";
+import { MdStar } from "react-icons/md";
+
+const OfferingsEditor = ({ onDataChange }) => {
+  const dispatch = useDispatch();
+  const [isLoading, setIsLoading] = useState(true);
+  const [isSaving, setIsSaving] = useState(false);
+
+  const defaultOfferings = [
+    {
+      id: 1,
+      title: "Experience",
+      description: "Proven expertise delivering real value",
+      icon: "experience"
+    },
+    {
+      id: 2,
+      title: "Innovation",
+      description: "Smarter intelligence for better outcomes",
+      icon: "innovation"
+    },
+    {
+      id: 3,
+      title: "Cost Efficiency",
+      description: "Maximum value with minimal cost",
+      icon: "cost"
+    }
+  ];
+
+  const [offerings, setOfferings] = useState(defaultOfferings);
+
+  useEffect(() => {
+    fetchOfferingsData();
+  }, []);
+
+  const fetchOfferingsData = async () => {
+    try {
+      setIsLoading(true);
+      const res = await dispatch(
+        getAdminPanel({ sectionName: "Offerings" })
+      ).unwrap();
+      
+      if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) {
+        const offeringsData = res.data.data[0];
+        if (offeringsData.Content) {
+          const content = JSON.parse(offeringsData.Content);
+          setOfferings(content.offerings || defaultOfferings);
+        }
+      }
+    } catch (error) {
+      console.log("No existing offerings data, using defaults");
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleOfferingChange = (id, field, value) => {
+    setOfferings(offerings.map(offering => 
+      offering.id === id ? { ...offering, [field]: value } : offering
+    ));
+    onDataChange?.();
+  };
+
+  const handleSave = async () => {
+    // Validation
+    for (const offering of offerings) {
+      if (!offering.title.trim() || !offering.description.trim()) {
+        message.error(`Please fill all fields for ${offering.title || 'offering'}`);
+        return;
+      }
+    }
+
+    try {
+      setIsSaving(true);
+      
+      const data = {
+        SectionName: "Offerings",
+        Content: JSON.stringify({
+          offerings: offerings.map(o => ({
+            id: o.id,
+            title: o.title.trim(),
+            description: o.description.trim(),
+            icon: o.icon
+          }))
+        }),
+        ActiveStatus: "A",
+        CreatedBy: 1,
+        ModifiedBy: 1
+      };
+
+      await dispatch(postAdminPanel(data)).unwrap();
+      message.success("Offerings saved successfully!");
+      onDataChange?.();
+    } catch (error) {
+      console.error("Save error:", error);
+      message.error("Failed to save. Please try again.");
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  const getIconComponent = (iconName) => {
+    switch(iconName) {
+      case "experience": return <MdStar />;
+      case "innovation": return <FaCog />;
+      case "cost": return <FaDollarSign />;
+      default: return <FaLightbulb />;
+    }
+  };
+
+  if (isLoading) {
+    return (
+      <div className="section-editor-loading">
+        <div className="loading-spinner"></div>
+        <p>Loading offerings...</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="section-editor">
+      <div className="section-editor-header">
+        <div className="section-editor-icon">
+          <FaLightbulb />
+        </div>
+        <div>
+          <h2>Offerings Section</h2>
+          <p>Manage the 3 key value propositions displayed on your landing page</p>
+        </div>
+      </div>
+
+      <div className="info-box">
+        <strong>About Offerings:</strong>
+        These 3 features appear below the main headline showing your key value propositions: 
+        Experience, Innovation, and Cost Efficiency.
+      </div>
+
+      <div className="section-editor-form">
+        {offerings.map((offering, index) => (
+          <div key={offering.id} className="offering-card">
+            <div className="offering-card-header">
+              <div className="offering-icon-preview">
+                {getIconComponent(offering.icon)}
+              </div>
+              <h3>Offering {index + 1}</h3>
+            </div>
+            
+            <div className="form-row">
+              <div className="form-group">
+                <label htmlFor={`title-${offering.id}`}>Title</label>
+                <input
+                  type="text"
+                  id={`title-${offering.id}`}
+                  value={offering.title}
+                  onChange={(e) => handleOfferingChange(offering.id, 'title', e.target.value)}
+                  placeholder="e.g., Experience, Innovation"
+                  className="form-input"
+                />
+              </div>
+              
+              <div className="form-group">
+                <label htmlFor={`icon-${offering.id}`}>Icon Type</label>
+                <select
+                  id={`icon-${offering.id}`}
+                  value={offering.icon}
+                  onChange={(e) => handleOfferingChange(offering.id, 'icon', e.target.value)}
+                  className="form-input"
+                >
+                  <option value="experience">Experience (Star)</option>
+                  <option value="innovation">Innovation (Cog)</option>
+                  <option value="cost">Cost (Dollar)</option>
+                  <option value="lightbulb">Light Bulb</option>
+                </select>
+              </div>
+            </div>
+
+            <div className="form-group">
+              <label htmlFor={`desc-${offering.id}`}>Description</label>
+              <textarea
+                id={`desc-${offering.id}`}
+                value={offering.description}
+                onChange={(e) => handleOfferingChange(offering.id, 'description', e.target.value)}
+                placeholder="Brief description of this offering"
+                rows={2}
+                className="form-textarea"
+              />
+            </div>
+          </div>
+        ))}
+
+        {/* Save Button */}
+        <div className="section-editor-actions">
+          <button
+            onClick={handleSave}
+            disabled={isSaving}
+            className="save-section-btn"
+          >
+            <FaSave /> {isSaving ? "Saving..." : "Save Offerings"}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default OfferingsEditor;
+
diff --git a/src/LandingPageCMS/Sections/SectionEditor.scss b/src/LandingPageCMS/Sections/SectionEditor.scss
new file mode 100644
index 0000000..91c192b
--- /dev/null
+++ b/src/LandingPageCMS/Sections/SectionEditor.scss
@@ -0,0 +1,494 @@
+// Section Editor - Clean & Simple
+
+.section-editor {
+  max-width: 720px;
+  margin: 0 auto;
+}
+
+.section-editor-header {
+  margin-bottom: 2.5rem;
+
+  .section-editor-icon {
+    display: none;
+  }
+
+  h2 {
+    margin: 0 0 0.5rem 0;
+    font-size: 24px;
+    font-weight: 700;
+
+    .dark-mode & {
+      color: #fff;
+    }
+
+    .light-mode & {
+      color: #000;
+    }
+  }
+
+  p {
+    margin: 0;
+    font-size: 14px;
+    line-height: 1.6;
+
+    .dark-mode & {
+      color: #999;
+    }
+
+    .light-mode & {
+      color: #666;
+    }
+  }
+}
+
+.section-editor-form {
+  display: flex;
+  flex-direction: column;
+  gap: 2rem;
+}
+
+// Form Group
+.form-group {
+  display: flex;
+  flex-direction: column;
+  gap: 0.625rem;
+
+  label {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    font-weight: 600;
+
+    .dark-mode & {
+      color: #e5e5e5;
+    }
+
+    .light-mode & {
+      color: #171717;
+    }
+
+    svg {
+      display: none;
+    }
+
+    .label-hint {
+      font-size: 12px;
+      font-weight: 400;
+
+      .dark-mode & {
+        color: #888;
+      }
+
+      .light-mode & {
+        color: #999;
+      }
+    }
+  }
+}
+
+.form-row {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 1.5rem;
+
+  @media (max-width: 768px) {
+    grid-template-columns: 1fr;
+  }
+}
+
+// Inputs
+.form-input,
+.form-textarea {
+  width: 100%;
+  padding: 0.875rem 1rem;
+  border: 1px solid;
+  border-radius: 6px;
+  font-size: 15px;
+  font-family: inherit;
+  transition: all 0.2s;
+
+  .dark-mode & {
+    background: #000;
+    border-color: #333;
+    color: #e5e5e5;
+
+    &::placeholder {
+      color: #666;
+    }
+
+    &:hover {
+      border-color: #444;
+    }
+
+    &:focus {
+      outline: none;
+      border-color: #0ea5e9;
+      background: #0a0a0a;
+    }
+  }
+
+  .light-mode & {
+    background: #fafafa;
+    border-color: #d4d4d4;
+    color: #000;
+
+    &::placeholder {
+      color: #999;
+    }
+
+    &:hover {
+      border-color: #999;
+    }
+
+    &:focus {
+      outline: none;
+      border-color: #0ea5e9;
+      background: #fff;
+    }
+  }
+
+  &.error {
+    border-color: #ef4444 !important;
+  }
+}
+
+.form-textarea {
+  resize: vertical;
+  min-height: 100px;
+  line-height: 1.6;
+
+  &.headline-input {
+    font-size: 17px;
+    font-weight: 600;
+    min-height: 130px;
+  }
+}
+
+// Help
+.input-help {
+  font-size: 12px;
+  line-height: 1.5;
+
+  .dark-mode & {
+    color: #888;
+  }
+
+  .light-mode & {
+    color: #999;
+  }
+}
+
+// Preview - Single Combined
+.input-preview {
+  margin-top: 1.5rem;
+  padding: 2.5rem;
+  border: 1px solid;
+  border-radius: 8px;
+
+  .dark-mode & {
+    background: #0a0a0a;
+    border-color: #222;
+  }
+
+  .light-mode & {
+    background: #f5f5f5;
+    border-color: #e5e5e5;
+  }
+
+  @media (max-width: 768px) {
+    padding: 1.75rem;
+  }
+
+  strong {
+    display: block;
+    font-size: 11px;
+    margin-bottom: 1.5rem;
+    text-transform: uppercase;
+    letter-spacing: 1px;
+    font-weight: 600;
+
+    .dark-mode & {
+      color: #0ea5e9;
+    }
+
+    .light-mode & {
+      color: #0969da;
+    }
+  }
+
+  .preview-text {
+    font-size: 15px;
+    line-height: 1.7;
+
+    .dark-mode & {
+      color: #cbd5e1;
+    }
+
+    .light-mode & {
+      color: #475569;
+    }
+
+    &.headline-preview {
+      font-size: 40px;
+      font-weight: 700;
+      line-height: 1.15;
+      margin-bottom: 1.25rem;
+      letter-spacing: -1px;
+
+      .dark-mode & {
+        color: #fff;
+      }
+
+      .light-mode & {
+        color: #000;
+      }
+
+      @media (max-width: 768px) {
+        font-size: 32px;
+      }
+    }
+  }
+
+  .button-preview {
+    margin-top: 2rem;
+
+    .preview-cta-btn {
+      display: inline-flex;
+      align-items: center;
+      gap: 0.75rem;
+      padding: 1rem 2rem;
+      background: #10b981;
+      color: #fff;
+      border: none;
+      border-radius: 6px;
+      font-size: 15px;
+      font-weight: 600;
+      cursor: pointer;
+      transition: all 0.2s;
+      font-family: inherit;
+
+      @media (max-width: 768px) {
+        padding: 0.875rem 1.75rem;
+      }
+
+      .preview-icon {
+        font-size: 16px;
+      }
+
+      &:hover {
+        background: #059669;
+      }
+    }
+  }
+}
+
+// Actions
+.section-editor-actions {
+  display: flex;
+  gap: 0.75rem;
+  padding-top: 2rem;
+  border-top: 1px solid;
+
+  .dark-mode & {
+    border-color: #222;
+  }
+
+  .light-mode & {
+    border-color: #e5e5e5;
+  }
+
+  @media (max-width: 768px) {
+    flex-direction: column;
+  }
+}
+
+.save-section-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.625rem;
+  padding: 1rem 2.5rem;
+  border: none;
+  border-radius: 6px;
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.2s;
+  font-family: inherit;
+
+  .dark-mode & {
+    background: #0ea5e9;
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #0284c7;
+    }
+  }
+
+  .light-mode & {
+    background: #0969da;
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #0550ae;
+    }
+  }
+
+  @media (max-width: 768px) {
+    width: 100%;
+    justify-content: center;
+  }
+
+  svg {
+    font-size: 14px;
+  }
+
+  &:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+  }
+}
+
+// Loading
+.section-editor-loading {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  min-height: 450px;
+
+  .loading-spinner {
+    width: 40px;
+    height: 40px;
+    border: 2px solid;
+    border-radius: 50%;
+    animation: spin 0.6s linear infinite;
+
+    .dark-mode & {
+      border-color: #333;
+      border-top-color: #0ea5e9;
+    }
+
+    .light-mode & {
+      border-color: #e5e5e5;
+      border-top-color: #0969da;
+    }
+  }
+
+  p {
+    margin-top: 1rem;
+    font-size: 13px;
+
+    .dark-mode & {
+      color: #888;
+    }
+
+    .light-mode & {
+      color: #999;
+    }
+  }
+}
+
+// Info Box
+.info-box {
+  padding: 1.125rem 1.375rem;
+  border-left: 3px solid;
+  border-radius: 6px;
+  font-size: 13px;
+  line-height: 1.6;
+
+  .dark-mode & {
+    background: rgba(14, 165, 233, 0.1);
+    border-color: #0ea5e9;
+    color: #94a3b8;
+  }
+
+  .light-mode & {
+    background: rgba(9, 105, 218, 0.05);
+    border-color: #0969da;
+    color: #475569;
+  }
+
+  strong {
+    display: block;
+    margin-bottom: 0.5rem;
+    font-weight: 600;
+    font-size: 14px;
+
+    .dark-mode & {
+      color: #0ea5e9;
+    }
+
+    .light-mode & {
+      color: #0969da;
+    }
+  }
+}
+
+// Offering Cards
+.offering-card {
+  padding: 1.75rem;
+  border: 1px solid;
+  border-radius: 8px;
+  transition: all 0.2s;
+
+  .dark-mode & {
+    background: #0a0a0a;
+    border-color: #333;
+
+    &:hover {
+      border-color: #0ea5e9;
+      background: #0f0f0f;
+    }
+  }
+
+  .light-mode & {
+    background: #fafafa;
+    border-color: #d4d4d4;
+
+    &:hover {
+      border-color: #0969da;
+      background: #f5f5f5;
+    }
+  }
+
+  @media (max-width: 768px) {
+    padding: 1.5rem;
+  }
+
+  .offering-card-header {
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+    margin-bottom: 1.5rem;
+
+    .offering-icon-preview {
+      width: 44px;
+      height: 44px;
+      background: #10b981;
+      border-radius: 6px;
+      color: #fff;
+      font-size: 22px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    h3 {
+      margin: 0;
+      font-size: 16px;
+      font-weight: 600;
+
+      .dark-mode & {
+        color: #e5e5e5;
+      }
+
+      .light-mode & {
+        color: #171717;
+      }
+    }
+  }
+}
+
+select.form-input {
+  cursor: pointer;
+}
diff --git a/src/Pages/application/applicationForm.jsx b/src/Pages/application/applicationForm.jsx
index 082e5fd..716c6a7 100644
--- a/src/Pages/application/applicationForm.jsx
+++ b/src/Pages/application/applicationForm.jsx
@@ -95,7 +95,6 @@ const ApplicationForm = ({ formType }) => {
         postData["AppURLType"] = SelectedCategory == categoryData?.filter(item => item?.ConfigName == "Retail")[0]?.ConfigId ? 'I' : 'E';;
         postData["AppLogo"] = imageUrl;
         postData["AppName"] = values.AppName;
-        postData["NavigationURL"] = values.NavigationURL;
         postData["AppURL"] = SelectedCategory == categoryData?.filter(item => item?.ConfigName == "Retail")[0]?.ConfigId ? URLToggle ? homepageurl : values.AppURL : values.AppURL;
         postData["CateId"] = values.CateId;
         postData["CreatedBy"] = getSession('UserId')
@@ -328,31 +327,7 @@ const ApplicationForm = ({ formType }) => {
                                         />
 
                                     </Form.Item>
-                                    <Form.Item
-                                        name="NavigationURL"
-                                        rules={[
-                                            {
-                                                required: true,
-                                                pattern: /^(?!\s*$).+/,
-                                                message: "Please Enter Navigation URL",
-                                            },
-                                            {
-                                                validator: async (_, value) => {
-                                                    await validateSafeInput(value);
-                                                    return Promise.resolve();
-                                                },
-                                            },
-                                        ]}>
-                                        <InputField
-                                            field="NavigationURL"
-                                            autoComplete="off"
-                                            label={<label className="required">Navigation URL</label>}
-                                            fieldState={true}
-                                            fieldApi={true}
-                                            isOnChange={formType == "edit" ? true : false}
-                                            defaultValue={editstate?.NavigationURL}
-                                        />
-                                    </Form.Item>
+
 
                                     <div className="upload_btn">
                                         <p>Upload Logo</p>
diff --git a/src/Pages/themeTemplate/AllTemplates.jsx b/src/Pages/themeTemplate/AllTemplates.jsx
index 62fcf96..fc8a0f6 100644
--- a/src/Pages/themeTemplate/AllTemplates.jsx
+++ b/src/Pages/themeTemplate/AllTemplates.jsx
@@ -225,7 +225,7 @@ const AllTemplates = () => {
               {/* <nav 1  */}
 
               {templateData?.Navbar?.[0] === "Navbar1" && (
-                <div className="applayout1" style={{ display: "flex", flexDirection: "row", columnGap: '2rem' ,flexDirection:"column"}}>
+                <div className="applayout1" style={{ display: "flex", flexDirection: "column", columnGap: '2rem' }}>
                   <div className="Appsidenav" >
                     <div id="Navbar">
                       {templateData["Navbar"]?.[0] == "Navbar1" && (
diff --git a/src/Pages/themeTemplate/Template.jsx b/src/Pages/themeTemplate/Template.jsx
index 0717820..67a0910 100644
--- a/src/Pages/themeTemplate/Template.jsx
+++ b/src/Pages/themeTemplate/Template.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState, lazy, Suspense, useCallback } from "react";
 import { useLocation, useParams } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
 import { Skeleton } from "antd";
@@ -9,42 +9,49 @@ import {
   getTemplate,
   getTemplateData,
 } from "../../features/themeChange/themeChange";
+import { PostToken } from "../../features/publicHome/publicHome";
+
+// ✅ Critical imports - Load immediately (above fold)
+import HomeNav from "../publichome/PublicNavBar/NavBar";
 import Navbar3 from "../themeTemplate/TemplateComps/NavBars/NavBars/NavBar3HorizontalPreview";
 import Navbar2 from "../themeTemplate/TemplateComps/NavBars/NavBars/NavBarHorizontalPreview";
 import Navbar1 from "../themeTemplate/TemplateComps/NavBars/SideNav/SideNavBarPreview";
 import OverView1 from "../themeTemplate/TemplateComps/OverVIews/OverView1";
 import OverView2 from "../themeTemplate/TemplateComps/OverVIews/OverView2";
-import Features1 from "../themeTemplate/TemplateComps/Features/Features1";
-import Features2 from "../themeTemplate/TemplateComps/Features/Feature2";
-import Pricing1 from "../themeTemplate/TemplateComps/Pricing/Pricing1";
-import Pricing2 from "../themeTemplate/TemplateComps/Pricing/Pricing2";
-import Pricing3 from "../themeTemplate/TemplateComps/Pricing/Pricing3";
+import OverviewTemp3 from "./TemplateComps/OverVIews/OverViewTemplate3";
+import HeroSection from "./TemplateComps/OverVIews/OverView3";
+import Loader from "../../Components/Loader/Loader";
 
-import Faq1 from "../themeTemplate/TemplateComps/Faq/FaqPreview1";
-import Faq2 from "../themeTemplate/TemplateComps/Faq/FaqPreview2";
-import DownloadSource from "../themeTemplate/TemplateComps/downloadsource/downloadSource";
-import Contact from "../themeTemplate/TemplateComps/contact/contact";
-import Footer1 from "../themeTemplate/TemplateComps/Footer/FooterTemplate1";
-import Footer2 from "../themeTemplate/TemplateComps/Footer/FooterTemplate2";
-import Footer3 from "../themeTemplate/TemplateComps/Footer/FooterTemplate3";
-import HomeNav from "../publichome/PublicNavBar/NavBar";
+// 🚀 Lazy imports - Below fold components
+const Features1 = lazy(() => import("../themeTemplate/TemplateComps/Features/Features1"));
+const Features2 = lazy(() => import("../themeTemplate/TemplateComps/Features/Feature2"));
+const Feature3 = lazy(() => import("./TemplateComps/Features/Feature3"));
+
+const Pricing1 = lazy(() => import("../themeTemplate/TemplateComps/Pricing/Pricing1"));
+const Pricing2 = lazy(() => import("../themeTemplate/TemplateComps/Pricing/Pricing2"));
+const Pricing3 = lazy(() => import("../themeTemplate/TemplateComps/Pricing/Pricing3"));
+
+const Faq1 = lazy(() => import("../themeTemplate/TemplateComps/Faq/FaqPreview1"));
+const Faq2 = lazy(() => import("../themeTemplate/TemplateComps/Faq/FaqPreview2"));
+const FaqTemplate3 = lazy(() => import("./TemplateComps/Faq/FaqTemplate3"));
+const FAQSection = lazy(() => import("./TemplateComps/Faq/FaqPreview3"));
+const CommonFaq = lazy(() => import("./TemplateComps/Faq/CommonFaq"));
+
+const Footer1 = lazy(() => import("../themeTemplate/TemplateComps/Footer/FooterTemplate1"));
+const Footer2 = lazy(() => import("../themeTemplate/TemplateComps/Footer/FooterTemplate2"));
+const Footer3 = lazy(() => import("../themeTemplate/TemplateComps/Footer/FooterTemplate3"));
+const FooterTemplate3 = lazy(() => import("../themeTemplate/TemplateComps/Footer/FooterTemplate3"));
+
+const DownloadSource = lazy(() => import("../themeTemplate/TemplateComps/downloadsource/downloadSource"));
+const Contact = lazy(() => import("../themeTemplate/TemplateComps/contact/contact"));
+const CTAPreview = lazy(() => import("./TemplateComps/CTASection/CTASectionPreview"));
+const ShowcasePreview = lazy(() => import("./TemplateComps/Showcase/showcasepreviw"));
+const TestimonialTemplate = lazy(() => import("./TemplateComps/Testimonial/TestimonialTemplate"));
+const TestimonialPreView = lazy(() => import("./TemplateComps/Testimonial/TestimonialPreView"));
 
 import "../../styles/template/template/template.css";
-import Feature3 from "./TemplateComps/Features/Feature3";
 import { getSession } from "../../Services/others";
-import OverviewTemp3 from "./TemplateComps/OverVIews/OverViewTemplate3";
-import FaqTemplate3 from "./TemplateComps/Faq/FaqTemplate3";
-import NavBar3HorizontalPreview from "../themeTemplate/TemplateComps/NavBars/NavBars/NavBar3HorizontalPreview";
-import FooterTemplate3 from "../themeTemplate/TemplateComps/Footer/FooterTemplate3";
-import CTAPreview from "./TemplateComps/CTASection/CTASectionPreview";
-import ShowcasePreview from "./TemplateComps/Showcase/showcasepreviw";
-import TestimonialTemplate from "./TemplateComps/Testimonial/TestimonialTemplate";
 import { getCustomertestimonials } from "../../features/testimonials/testimonials";
-import HeroSection from "./TemplateComps/OverVIews/OverView3";
-import FAQSection from "./TemplateComps/Faq/FaqPreview3";
-import Loader from "../../Components/Loader/Loader";
-import TestimonialPreView from "./TemplateComps/Testimonial/TestimonialPreView";
-import CommonFaq from "./TemplateComps/Faq/CommonFaq";
 import { useNavigate } from "react-router-dom";
 import { LuMousePointerClick } from "react-icons/lu";
 const subDirectory = import.meta.env.ENV_BASE_URL
@@ -62,11 +69,60 @@ const Template = () => {
   
 const changeCurrentColorValues = useSelector(changeCurrentColorValue);
   console.log("templateData", templateData)
+  
+  // 🔑 Auto-generate token for direct URL access
   useEffect(() => {
-    dispatch(getTemplate(params.appName)).unwrap();
+    const initializeAuth = async () => {
+      try {
+        // Check if token already exists
+        const existingToken = sessionStorage.getItem("auth");
+        
+        if (!existingToken) {
+          console.log("🔑 Generating token for direct URL access...");
+          // Generate token
+          const tokenData = {
+            username: "1000000001",
+            password: "1234",
+          };
+          await dispatch(PostToken(tokenData)).unwrap();
+          console.log("✅ Token generated successfully");
+        }
+        
+        // Convert clean URL slug back to proper app name for API call
+        // URL: salon-spa-and-beauty-parlour → API: Salon, Spa and Beauty Parlour
+        // URL: beauty-and-cosmetics-shop → API: Beauty and Cosmetics Shop
+        const appNameForApi = params.appName
+          .split('-')
+          .map((word, index, arr) => {
+            // Keep 'and' lowercase unless it's the first word
+            if (word === 'and' && index > 0 && index < arr.length - 1) {
+              return 'and';
+            }
+            // Capitalize first letter
+            return word.charAt(0).toUpperCase() + word.slice(1);
+          })
+          .join(' ');
+        
+        console.log("📦 URL slug:", params.appName);
+        console.log("📦 Loading template for:", appNameForApi);
+        
+        // Fetch template data with proper app name
+        await dispatch(getTemplate(appNameForApi)).unwrap();
+      } catch (error) {
+        console.error("❌ Error initializing template:", error);
+      }
+    };
+
+    initializeAuth();
+  }, [params.appName, dispatch]);
+
+  // Separate useEffect for scroll tracking with throttle
+  useEffect(() => {
+    let ticking = false;
+    
     const trackPosition = () => {
       const divElement = navbarRef?.current;
-      if (!divElement) return; // Ensure divElement exists before proceeding
+      if (!divElement) return;
 
       const { top } = divElement.getBoundingClientRect();
 
@@ -75,12 +131,20 @@ const changeCurrentColorValues = useSelector(changeCurrentColorValue);
       } else {
         divElement.classList.remove("navBarHover");
       }
+      ticking = false;
     };
 
-    window.addEventListener("scroll", trackPosition);
+    const handleScroll = () => {
+      if (!ticking) {
+        window.requestAnimationFrame(trackPosition);
+        ticking = true;
+      }
+    };
+
+    window.addEventListener("scroll", handleScroll, { passive: true });
 
     return () => {
-      window.removeEventListener("scroll", trackPosition); // Pass the same event handler function here
+      window.removeEventListener("scroll", handleScroll);
     };
   }, []);
 
@@ -108,16 +172,22 @@ const changeCurrentColorValues = useSelector(changeCurrentColorValue);
   }, [location?.state]);
 
   const [Testimonialsdata, setTestimonialsdata] = useState([]);
-  useEffect(() => {
-    apicall()
-  }, [])
-
-  const apicall = async () => {
-    let res = await dispatch(getCustomertestimonials()).unwrap();
-    if (res?.data?.statusCode === 1) {
-      setTestimonialsdata(res?.data?.data);
+  
+  // 🚀 Memoized API call
+  const apicall = useCallback(async () => {
+    try {
+      const res = await dispatch(getCustomertestimonials()).unwrap();
+      if (res?.data?.statusCode === 1) {
+        setTestimonialsdata(res?.data?.data);
+      }
+    } catch (error) {
+      console.error("Error fetching testimonials:", error);
     }
-  }
+  }, [dispatch]);
+
+  useEffect(() => {
+    apicall();
+  }, [apicall]);
 useEffect(() => {
     if (location?.state?.scrollToId) {
       scrollToSection(location.state.scrollToId);
@@ -314,71 +384,72 @@ useEffect(() => {
                   <HeroSection data={templateData["Overview"][1]} />
                 )}
               </div>
-              <div id="ShowCase">
-                {templateData["Showcase"]?.[0] == "Showcase1" && (
-                  <ShowcasePreview data={templateData["Showcase"][1]?.[0]?.FieldValue} key={"ShowCase"} />
-                )}
-              </div>
-              <div id="Appview">
-                {templateData["Appview"]?.[0] == "Appview1" && (
-                  <ShowcasePreview data={templateData["Appview"][1]?.[0]?.FieldValue} key={"Appview"} />
-                )}
-              </div>
-              <div id="Testimonials">
-                {templateData["Testimonials"]?.[0] == "Testimonials1" && (
-                  <TestimonialPreView isDefault={false} />
-
-                )}
-              </div>
-              <div id="Features">
-                {templateData["Features"]?.[0] == "Features1" && (
-                  <Features1 data={templateData["Features"][1]} />
-                )}
-                {templateData["Features"]?.[0] == "Features2" && (
-                  <Features2 data={templateData["Features"][1]} />
-                )}
-                {templateData["Features"]?.[0] == "Features3" && (
-                  <Feature3 data={templateData["Features"][1]} />
-                )}
-              </div>
-              <div id="Pricing">
-                {templateData["Pricing"]?.[0] == "Pricing1" && (
-                  <Pricing1 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-                {templateData["Pricing"]?.[0] == "Pricing2" && (
-                  <Pricing2 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-                {templateData["Pricing"]?.[0] == "Pricing3" && (
-                  <Pricing3 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-              </div>
-              <div id="Faq">
-                {templateData["Faq"]?.[0] == "Faq1" && (
-                  <Faq1 data={templateData["Faq"][1]} />
-                )}
-                {templateData["Faq"]?.[0] == "Faq2" && (
-                  <Faq2 data={templateData["Faq"][1]} />
-                )}
-                {templateData["Faq"]?.[0] == "Faq3" && (
-                  <FAQSection data={templateData["Faq"][1]} />
-                )}
-              </div>
-              <div id="CTA">
-                {templateData["CTA"]?.[0] == "CTA1" && (
-                  <CTAPreview data={templateData["CTA"][1]} />
-                )}
-              </div>
-              <div id="Footer">
-                {templateData["Footer"]?.[0] == "Footer1" && (
-                  <Footer1 data={templateData["Footer"][1]} />
-                )}
-                {templateData["Footer"]?.[0] == "Footer2" && (
-                  <Footer2 data={templateData["Footer"][1]} />
-                )}
-                {templateData["Footer"]?.[0] == "Footer3" && (
-                  <FooterTemplate3 data={templateData["Footer"][1]} />
-                )}
-              </div>
+              <Suspense fallback={null}>
+                <div id="ShowCase">
+                  {templateData["Showcase"]?.[0] == "Showcase1" && (
+                    <ShowcasePreview data={templateData["Showcase"][1]?.[0]?.FieldValue} key={"ShowCase"} />
+                  )}
+                </div>
+                <div id="Appview">
+                  {templateData["Appview"]?.[0] == "Appview1" && (
+                    <ShowcasePreview data={templateData["Appview"][1]?.[0]?.FieldValue} key={"Appview"} />
+                  )}
+                </div>
+                <div id="Testimonials">
+                  {templateData["Testimonials"]?.[0] == "Testimonials1" && (
+                    <TestimonialPreView isDefault={false} />
+                  )}
+                </div>
+                <div id="Features">
+                  {templateData["Features"]?.[0] == "Features1" && (
+                    <Features1 data={templateData["Features"][1]} />
+                  )}
+                  {templateData["Features"]?.[0] == "Features2" && (
+                    <Features2 data={templateData["Features"][1]} />
+                  )}
+                  {templateData["Features"]?.[0] == "Features3" && (
+                    <Feature3 data={templateData["Features"][1]} />
+                  )}
+                </div>
+                <div id="Pricing">
+                  {templateData["Pricing"]?.[0] == "Pricing1" && (
+                    <Pricing1 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                  {templateData["Pricing"]?.[0] == "Pricing2" && (
+                    <Pricing2 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                  {templateData["Pricing"]?.[0] == "Pricing3" && (
+                    <Pricing3 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                </div>
+                <div id="Faq">
+                  {templateData["Faq"]?.[0] == "Faq1" && (
+                    <Faq1 data={templateData["Faq"][1]} />
+                  )}
+                  {templateData["Faq"]?.[0] == "Faq2" && (
+                    <Faq2 data={templateData["Faq"][1]} />
+                  )}
+                  {templateData["Faq"]?.[0] == "Faq3" && (
+                    <FAQSection data={templateData["Faq"][1]} />
+                  )}
+                </div>
+                <div id="CTA">
+                  {templateData["CTA"]?.[0] == "CTA1" && (
+                    <CTAPreview data={templateData["CTA"][1]} />
+                  )}
+                </div>
+                <div id="Footer">
+                  {templateData["Footer"]?.[0] == "Footer1" && (
+                    <Footer1 data={templateData["Footer"][1]} />
+                  )}
+                  {templateData["Footer"]?.[0] == "Footer2" && (
+                    <Footer2 data={templateData["Footer"][1]} />
+                  )}
+                  {templateData["Footer"]?.[0] == "Footer3" && (
+                    <FooterTemplate3 data={templateData["Footer"][1]} />
+                  )}
+                </div>
+              </Suspense>
             </div>
           )}
           {templateData?.Navbar?.[0] === "Navbar1" && (
@@ -408,70 +479,72 @@ useEffect(() => {
                   <HeroSection data={templateData["Overview"][1]} />
                 )}
               </div>
-              <div id="ShowCase">
-                {templateData["Showcase"]?.[0] == "Showcase1" && (
-                  <ShowcasePreview data={templateData["Showcase"][1]?.[0]?.FieldValue} key={"ShowCase"} />
-                )}
-              </div>
-              <div id="Appview">
-                {templateData["Appview"]?.[0] == "Appview1" && (
-                  <ShowcasePreview data={templateData["Appview"][1]?.[0]?.FieldValue} key={"Appview"} />
-                )}
-              </div>
-              <div id="Testimonials">
-                {templateData["Testimonials"]?.[0] == "Testimonials1" && (
-                  <TestimonialPreView isDefault={false} />
-                )}
-              </div>
-              <div id="Features">
-                {templateData["Features"]?.[0] == "Features1" && (
-                  <Features1 data={templateData["Features"][1]} />
-                )}
-                {templateData["Features"]?.[0] == "Features2" && (
-                  <Features2 data={templateData["Features"][1]} />
-                )}
-                {templateData["Features"]?.[0] == "Features3" && (
-                  <Feature3 data={templateData["Features"][1]} />
-                )}
-              </div>
-              <div id="Pricing">
-                {templateData["Pricing"]?.[0] == "Pricing1" && (
-                  <Pricing1 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-                {templateData["Pricing"]?.[0] == "Pricing2" && (
-                  <Pricing2 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-                {templateData["Pricing"]?.[0] == "Pricing3" && (
-                  <Pricing3 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-              </div>
-              <div id="Faq">
-                {templateData["Faq"]?.[0] == "Faq1" && (
-                  <Faq1 data={templateData["Faq"][1]} />
-                )}
-                {templateData["Faq"]?.[0] == "Faq2" && (
-                  <Faq2 data={templateData["Faq"][1]} />
-                )}
-                {templateData["Faq"]?.[0] == "Faq3" && (
-                  <FAQSection data={templateData["Faq"][1]} />
-                )}
-              </div>
-              <div id="CTA">
-                {templateData["CTA"]?.[0] == "CTA1" && (
-                  <CTAPreview data={templateData["CTA"][1]} />
-                )}
-              </div>
-              <div id="Footer">
-                {templateData["Footer"]?.[0] == "Footer1" && (
-                  <Footer1 data={templateData["Footer"][1]} />
-                )}
-                {templateData["Footer"]?.[0] == "Footer2" && (
-                  <Footer2 data={templateData["Footer"][1]} />
-                )}
-                {templateData["Footer"]?.[0] == "Footer3" && (
-                  <FooterTemplate3 data={templateData["Footer"][1]} />
-                )}
-              </div>
+              <Suspense fallback={null}>
+                <div id="ShowCase">
+                  {templateData["Showcase"]?.[0] == "Showcase1" && (
+                    <ShowcasePreview data={templateData["Showcase"][1]?.[0]?.FieldValue} key={"ShowCase"} />
+                  )}
+                </div>
+                <div id="Appview">
+                  {templateData["Appview"]?.[0] == "Appview1" && (
+                    <ShowcasePreview data={templateData["Appview"][1]?.[0]?.FieldValue} key={"Appview"} />
+                  )}
+                </div>
+                <div id="Testimonials">
+                  {templateData["Testimonials"]?.[0] == "Testimonials1" && (
+                    <TestimonialPreView isDefault={false} />
+                  )}
+                </div>
+                <div id="Features">
+                  {templateData["Features"]?.[0] == "Features1" && (
+                    <Features1 data={templateData["Features"][1]} />
+                  )}
+                  {templateData["Features"]?.[0] == "Features2" && (
+                    <Features2 data={templateData["Features"][1]} />
+                  )}
+                  {templateData["Features"]?.[0] == "Features3" && (
+                    <Feature3 data={templateData["Features"][1]} />
+                  )}
+                </div>
+                <div id="Pricing">
+                  {templateData["Pricing"]?.[0] == "Pricing1" && (
+                    <Pricing1 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                  {templateData["Pricing"]?.[0] == "Pricing2" && (
+                    <Pricing2 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                  {templateData["Pricing"]?.[0] == "Pricing3" && (
+                    <Pricing3 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                </div>
+                <div id="Faq">
+                  {templateData["Faq"]?.[0] == "Faq1" && (
+                    <Faq1 data={templateData["Faq"][1]} />
+                  )}
+                  {templateData["Faq"]?.[0] == "Faq2" && (
+                    <Faq2 data={templateData["Faq"][1]} />
+                  )}
+                  {templateData["Faq"]?.[0] == "Faq3" && (
+                    <FAQSection data={templateData["Faq"][1]} />
+                  )}
+                </div>
+                <div id="CTA">
+                  {templateData["CTA"]?.[0] == "CTA1" && (
+                    <CTAPreview data={templateData["CTA"][1]} />
+                  )}
+                </div>
+                <div id="Footer">
+                  {templateData["Footer"]?.[0] == "Footer1" && (
+                    <Footer1 data={templateData["Footer"][1]} />
+                  )}
+                  {templateData["Footer"]?.[0] == "Footer2" && (
+                    <Footer2 data={templateData["Footer"][1]} />
+                  )}
+                  {templateData["Footer"]?.[0] == "Footer3" && (
+                    <FooterTemplate3 data={templateData["Footer"][1]} />
+                  )}
+                </div>
+              </Suspense>
             </div>
           )}
           {templateData?.Navbar?.[0] === "Navbar3" && (
@@ -501,94 +574,96 @@ useEffect(() => {
                   <HeroSection data={templateData["Overview"][1]} />
                 )}
               </div>
-              <div id="ShowCase">
-                {templateData["Showcase"]?.[0] == "Showcase1" && (
-                  <ShowcasePreview data={templateData["Showcase"][1]?.[0]?.FieldValue} key={"ShowCase"} />
-                )}
-              </div>
-              <div id="Appview">
-                {templateData["Appview"]?.[0] == "Appview1" && (
-                  <ShowcasePreview data={templateData["Appview"][1]?.[0]?.FieldValue} key={"Appview"} />
-                )}
-              </div>
-              <div id="Testimonials">
-                {templateData["Testimonials"]?.[0] == "Testimonials1" && (
-                  <TestimonialPreView isDefault={false} />)}
-              </div>
-              <div id="Features">
-                {templateData["Features"]?.[0] == "Features1" && (
-                  <Features1 data={templateData["Features"][1]} />
-                )}
-                {templateData["Features"]?.[0] == "Features2" && (
-                  <Features2 data={templateData["Features"][1]} />
-                )}
-                {templateData["Features"]?.[0] == "Features3" && (
-                  <Feature3 data={templateData["Features"][1]} />
-                )}
-              </div>
-              <div id="Pricing">
-                {templateData["Pricing"]?.[0] == "Pricing1" && (
-                  <Pricing1 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-                {templateData["Pricing"]?.[0] == "Pricing2" && (
-                  <Pricing2 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-                {templateData["Pricing"]?.[0] == "Pricing3" && (
-                  <Pricing3 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
-                )}
-              </div>
-              <div id="Faq">
-                {templateData["Faq"]?.[0] == "Faq1" && (
-                  <Faq1 data={templateData["Faq"][1]} />
-                )}
-                {templateData["Faq"]?.[0] == "Faq2" && (
-                  <Faq2 data={templateData["Faq"][1]} />
-                )}
-                {/* {templateData["Faq"]?.[0] == "Faq3" && (
-                  <FAQSection data={templateData["Faq"][1]} />
-                     </div> 
-                     )} */}
-                {templateData["Faq"]?.[0] === "Faq3" && (
-                  <div style={{ 
-                   margin:"0 0 2rem 0", width:"100%",
-                    display:"flex", alignItems:"center", flexDirection:"row", justifyContent:"center", gap:"1rem"
-                     }}>
-                    <div style={{fontSize:"16px",fontWeight:"600", margin:"1rem 0",
-                      fontFamily: CurrentText?.head ? CurrentText?.head : '',
-                    }}>View complete FAQ list</div>
-                    <button
-                      scrollToId="backFaq"
-                      onClick={() => navigate( `${subDirectory}Faq`,
-                        { state: { faqData: templateData["Faq"][1], from: location.pathname, } }
-                      )}
-                      style={{  
-                        fontFamily: CurrentText?.para ? CurrentText?.para : '', gap:"10px", border:"none",
-                        backgroundColor: 'unset', display:"flex", alignItems:"center",
-                         color:"#000", cursor:"pointer" , borderBottom:"1px solid #000"
-                       }}
-                    >
-                      See all FAQs <LuMousePointerClick size={24}/>
-                    </button>
-                    {/* <FAQSection data={templateData["Faq"][1]} /> */}
-                  </div>
-                )}
-              </div>
-              <div id="CTA">
-                {templateData["CTA"]?.[0] == "CTA1" && (
-                  <CTAPreview data={templateData["CTA"][1]} />
-                )}
-              </div>
-              <div id="Footer">
-                {templateData["Footer"]?.[0] == "Footer1" && (
-                  <Footer1 data={templateData["Footer"][1]} />
-                )}
-                {templateData["Footer"]?.[0] == "Footer2" && (
-                  <Footer2 data={templateData["Footer"][1]} />
-                )}
-                {templateData["Footer"]?.[0] == "Footer3" && (
-                  <FooterTemplate3 data={templateData["Footer"][1]} />
-                )}
-              </div>
+              <Suspense fallback={null}>
+                <div id="ShowCase">
+                  {templateData["Showcase"]?.[0] == "Showcase1" && (
+                    <ShowcasePreview data={templateData["Showcase"][1]?.[0]?.FieldValue} key={"ShowCase"} />
+                  )}
+                </div>
+                <div id="Appview">
+                  {templateData["Appview"]?.[0] == "Appview1" && (
+                    <ShowcasePreview data={templateData["Appview"][1]?.[0]?.FieldValue} key={"Appview"} />
+                  )}
+                </div>
+                <div id="Testimonials">
+                  {templateData["Testimonials"]?.[0] == "Testimonials1" && (
+                    <TestimonialPreView isDefault={false} />)}
+                </div>
+                <div id="Features">
+                  {templateData["Features"]?.[0] == "Features1" && (
+                    <Features1 data={templateData["Features"][1]} />
+                  )}
+                  {templateData["Features"]?.[0] == "Features2" && (
+                    <Features2 data={templateData["Features"][1]} />
+                  )}
+                  {templateData["Features"]?.[0] == "Features3" && (
+                    <Feature3 data={templateData["Features"][1]} />
+                  )}
+                </div>
+                <div id="Pricing">
+                  {templateData["Pricing"]?.[0] == "Pricing1" && (
+                    <Pricing1 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                  {templateData["Pricing"]?.[0] == "Pricing2" && (
+                    <Pricing2 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                  {templateData["Pricing"]?.[0] == "Pricing3" && (
+                    <Pricing3 data={templateData["Pricing"][1]} AdminId={AdminId ? AdminId : location?.state?.AdminId} />
+                  )}
+                </div>
+                <div id="Faq">
+                  {templateData["Faq"]?.[0] == "Faq1" && (
+                    <Faq1 data={templateData["Faq"][1]} />
+                  )}
+                  {templateData["Faq"]?.[0] == "Faq2" && (
+                    <Faq2 data={templateData["Faq"][1]} />
+                  )}
+                  {/* {templateData["Faq"]?.[0] == "Faq3" && (
+                    <FAQSection data={templateData["Faq"][1]} />
+                       </div> 
+                       )} */}
+                  {templateData["Faq"]?.[0] === "Faq3" && (
+                    <div style={{ 
+                     margin:"0 0 2rem 0", width:"100%",
+                      display:"flex", alignItems:"center", flexDirection:"row", justifyContent:"center", gap:"1rem"
+                       }}>
+                      <div style={{fontSize:"16px",fontWeight:"600", margin:"1rem 0",
+                        fontFamily: CurrentText?.head ? CurrentText?.head : '',
+                      }}>View complete FAQ list</div>
+                      <button
+                        scrollToId="backFaq"
+                        onClick={() => navigate( `${subDirectory}Faq`,
+                          { state: { faqData: templateData["Faq"][1], from: location.pathname, } }
+                        )}
+                        style={{  
+                          fontFamily: CurrentText?.para ? CurrentText?.para : '', gap:"10px", border:"none",
+                          backgroundColor: 'unset', display:"flex", alignItems:"center",
+                           color:"#000", cursor:"pointer" , borderBottom:"1px solid #000"
+                         }}
+                      >
+                        See all FAQs <LuMousePointerClick size={24}/>
+                      </button>
+                      {/* <FAQSection data={templateData["Faq"][1]} /> */}
+                    </div>
+                  )}
+                </div>
+                <div id="CTA">
+                  {templateData["CTA"]?.[0] == "CTA1" && (
+                    <CTAPreview data={templateData["CTA"][1]} />
+                  )}
+                </div>
+                <div id="Footer">
+                  {templateData["Footer"]?.[0] == "Footer1" && (
+                    <Footer1 data={templateData["Footer"][1]} />
+                  )}
+                  {templateData["Footer"]?.[0] == "Footer2" && (
+                    <Footer2 data={templateData["Footer"][1]} />
+                  )}
+                  {templateData["Footer"]?.[0] == "Footer3" && (
+                    <FooterTemplate3 data={templateData["Footer"][1]} />
+                  )}
+                </div>
+              </Suspense>
             </div>
           )}
 
diff --git a/src/PozoApp/Components/ContactUs.jsx b/src/PozoApp/Components/ContactUs.jsx
index e7d09a0..2ef84dd 100644
--- a/src/PozoApp/Components/ContactUs.jsx
+++ b/src/PozoApp/Components/ContactUs.jsx
@@ -152,6 +152,15 @@ const ContactUs = () => {
         if (industry) {
             handleIndustry();
         }
+        // Clean URL: Remove special chars, convert spaces to hyphens
+        const cleanUrl = AppName
+          .replace(/[,]/g, '')           // Remove commas
+          .replace(/\s+/g, '-')          // Spaces to hyphens
+          .replace(/&/g, 'and')          // & to 'and'
+          .replace(/[^a-z0-9-]/gi, '')   // Remove other special chars
+          .toLowerCase();
+        navigate(`${subDirectory}${cleanUrl}`);
+        window.location.reload();
     };
 
     useEffect(() => {
diff --git a/src/PozoApp/Components/Footer.jsx b/src/PozoApp/Components/Footer.jsx
index 79ef874..9b02cac 100644
--- a/src/PozoApp/Components/Footer.jsx
+++ b/src/PozoApp/Components/Footer.jsx
@@ -1,12 +1,11 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState, useMemo } from "react";
 import "../Styles/Footer.scss";
 import pozominilogo from "../Images/pozominilogo.webp";
 import { PiInstagramLogoFill } from "react-icons/pi";
 import { FaFacebook } from "react-icons/fa";
 import { RiTwitterXFill } from "react-icons/ri";
 import { FaYoutube } from "react-icons/fa";
-import { getApplicationData } from "../../features/publicHome/publicHome";
-import { useDispatch } from "react-redux";
+import { BiSearch } from "react-icons/bi";
 import { gsap } from "gsap";
 import { ScrollTrigger } from "gsap/ScrollTrigger";
 import { useNavigate } from "react-router-dom";
@@ -14,46 +13,24 @@ import { sessionStore } from "../../Services/others";
 
 gsap.registerPlugin(ScrollTrigger);
 const subDirectory = import.meta.env.ENV_BASE_URL
-const Footer = () => {
+const Footer = ({ AppCategory = [] }) => {
   const navigate = useNavigate();
   const logoRef = useRef(null);
   const productsRef = useRef(null);
   const footerRef = useRef(null);
-  const dispatch = useDispatch();
   const [email, setEmail] = useState("");
   const [isLoading, setIsLoading] = useState(false);
   const [message, setMessage] = useState("");
   const [messageType, setMessageType] = useState("");
-  const [appList, setAppList] = useState([]);
-  const [isFooterVisible, setIsFooterVisible] = useState(false);
+  const [searchTerm, setSearchTerm] = useState("");
+  const [filteredApps, setFilteredApps] = useState([]);
+  const [currentCategoryPage, setCurrentCategoryPage] = useState(0);
 
   const scrollToTop = () => {
     window.scrollTo({ top: 0, behavior: "smooth" });
   };
 
   useEffect(() => {
-    // Intersection Observer for lazy loading
-    const observer = new IntersectionObserver(
-      (entries) => {
-        entries.forEach((entry) => {
-          console.log("👁️ Footer visibility:", entry.isIntersecting);
-          if (entry.isIntersecting && !isFooterVisible) {
-            console.log("🎯 Footer is visible! Loading apps...");
-            setIsFooterVisible(true);
-            fetchApplicationData();
-          }
-        });
-      },
-      { threshold: 0.1 }
-    );
-
-    if (footerRef.current) {
-      console.log("✅ Observer attached to footer");
-      observer.observe(footerRef.current);
-    } else {
-      console.log("❌ footerRef is null");
-    }
-
     // Logo animation
     if (logoRef.current) {
       gsap.fromTo(
@@ -92,36 +69,159 @@ const Footer = () => {
         },
       );
     }
-
-    return () => {
-      if (footerRef.current) {
-        observer.unobserve(footerRef.current);
-      }
-    };
   }, []);
 
-  const fetchApplicationData = async () => {
-    try {
-      console.log("🔥 Footer: Fetching apps data...");
-      const res = await dispatch(getApplicationData())?.unwrap();
-      console.log("📦 Footer API Response:", res?.data);
-      if (res?.data?.statusCode === 1) {
-        const activeApps = res?.data?.data?.filter(app => app.ActiveStatus === "A") || [];
-        console.log("✅ Footer Active Apps:", activeApps.length, activeApps);
-        setAppList(activeApps);
-      }
-    } catch (error) {
-      console.error("❌ Error fetching apps:", error);
-    }
-  };
-
   const redirectApp = (appName, appId) => {
     sessionStore("AppId", appId);
     sessionStore("AppName", appName);
-    navigate(`${subDirectory}${appName}`);
+    // Clean URL: Remove special chars, convert spaces to hyphens
+    const cleanUrl = appName
+      .replace(/[,]/g, '')           // Remove commas
+      .replace(/\s+/g, '-')          // Spaces to hyphens
+      .replace(/&/g, 'and')          // & to 'and'
+      .replace(/[^a-z0-9-]/gi, '')   // Remove other special chars
+      .toLowerCase();
+    navigate(`${subDirectory}${cleanUrl}`);
     window.scrollTo(0, 0);
   };
 
+  // Categorize apps (EXACT same logic as IndustriesList)
+  const categorizeApps = (apps) => {
+    const categories = {
+      // Consumer (Retail Universe)
+      foodBeverages: [],
+      wellness: [],
+      fashion: [],
+      electronics: [],
+      grocery: [],
+      services: [],
+      others: [],
+      // Manufacturing & Healthcare
+      healthcare: [],
+      manufacturing: [],
+      // Transportation & Hospitality
+      transportation: [],
+      hospitality: []
+    };
+
+    apps.forEach(app => {
+      const name = app.AppName?.toLowerCase() || "";
+      const category = app.CategoryName?.toLowerCase() || "";
+      
+      // Consumer categories
+      if (/(consumer)/i.test(category)) {
+        if (/(bakery|restaurant|dairy|food|cafe|coffee|ice|pickle|pozoresto|resto|eatery|diner|bistro|pizz|burger|juice|sweet|snack)/i.test(name)) {
+          categories.foodBeverages.push(app);
+        } else if (/(salon|spa|beauty|cosmetics|fitness|gym|yoga|wellness|massage|parlour|parlor)/i.test(name)) {
+          categories.wellness.push(app);
+        } else if (/(fashion|jewellery|jewelry|footwear|lifestyle|apparel|textile|cloth|garment|shoe|sandal|accessory)/i.test(name)) {
+          categories.fashion.push(app);
+        } else if (/(electronic|mobile|computer|appliance|laptop|phone|device|gadget|tech)/i.test(name)) {
+          categories.electronics.push(app);
+        } else if (/(grocery|departmental|wholesale|supermarket|mart|retail|store)/i.test(name)) {
+          categories.grocery.push(app);
+        } else if (/(stationery|xerox|print|coaching|cement|tuition|education|training|class)/i.test(name)) {
+          categories.services.push(app);
+        } else {
+          categories.others.push(app);
+        }
+      }
+      // Healthcare & Pharma
+      else if (/(healthcare|pharma)/i.test(category) || /(health|optical)/i.test(name)) {
+        categories.healthcare.push(app);
+      }
+      // Manufacturing
+      else if (/(manufacturing)/i.test(category) || /(manufacturer)/i.test(name)) {
+        categories.manufacturing.push(app);
+      }
+      // Transportation & Logistics
+      else if (/(transportation|logistics)/i.test(category) || /(parking|boating)/i.test(name)) {
+        categories.transportation.push(app);
+      }
+      // Hospitality & Entertainment
+      else if (/(hospitality|entertainment)/i.test(category) || /(hotel|resort)/i.test(name)) {
+        categories.hospitality.push(app);
+      }
+    });
+
+    return categories;
+  };
+
+  // 🚀 Memoize categorization - Only recalculate when AppCategory changes
+  const categorizedApps = useMemo(() => categorizeApps(AppCategory), [AppCategory]);
+
+  // 🔍 Search/Filter logic
+  useEffect(() => {
+    if (searchTerm.trim() === "") {
+      setFilteredApps([]);
+    } else {
+      const filtered = AppCategory.filter(app => 
+        app.AppName?.toLowerCase().includes(searchTerm.toLowerCase())
+      );
+      setFilteredApps(filtered);
+    }
+  }, [searchTerm, AppCategory]);
+
+  const handleSearchChange = (e) => {
+    setSearchTerm(e.target.value);
+  };
+
+  const clearSearch = () => {
+    setSearchTerm("");
+  };
+
+  // Organize all categories for pagination
+  const allCategories = useMemo(() => {
+    const cats = [];
+    if (categorizedApps.foodBeverages.length > 0) {
+      cats.push({ title: "Food & Beverages", apps: categorizedApps.foodBeverages });
+    }
+    if (categorizedApps.wellness.length > 0) {
+      cats.push({ title: "Wellness & Beauty", apps: categorizedApps.wellness });
+    }
+    if (categorizedApps.fashion.length > 0) {
+      cats.push({ title: "Fashion & Lifestyle", apps: categorizedApps.fashion });
+    }
+    if (categorizedApps.electronics.length > 0) {
+      cats.push({ title: "Electronics & Tech", apps: categorizedApps.electronics });
+    }
+    if (categorizedApps.grocery.length > 0) {
+      cats.push({ title: "Grocery & Retail", apps: categorizedApps.grocery });
+    }
+    if (categorizedApps.services.length > 0) {
+      cats.push({ title: "Services", apps: categorizedApps.services });
+    }
+    if (categorizedApps.healthcare.length > 0) {
+      cats.push({ title: "Healthcare & Pharma", apps: categorizedApps.healthcare });
+    }
+    if (categorizedApps.manufacturing.length > 0) {
+      cats.push({ title: "Manufacturing", apps: categorizedApps.manufacturing });
+    }
+    if (categorizedApps.transportation.length > 0) {
+      cats.push({ title: "Transportation", apps: categorizedApps.transportation });
+    }
+    if (categorizedApps.hospitality.length > 0) {
+      cats.push({ title: "Hospitality", apps: categorizedApps.hospitality });
+    }
+    if (categorizedApps.others.length > 0) {
+      cats.push({ title: "More Industries", apps: categorizedApps.others });
+    }
+    return cats;
+  }, [categorizedApps]);
+
+  const categoriesPerPage = 3;
+  const totalPages = Math.ceil(allCategories.length / categoriesPerPage);
+  const startIndex = currentCategoryPage * categoriesPerPage;
+  const visibleCategories = allCategories.slice(startIndex, startIndex + categoriesPerPage);
+
+  const handlePrevPage = () => {
+    setCurrentCategoryPage((prev) => Math.max(0, prev - 1));
+  };
+
+  const handleNextPage = () => {
+    setCurrentCategoryPage((prev) => Math.min(totalPages - 1, prev + 1));
+  };
+
   const handleSubscribe = async () => {
     if (!email) {
       setMessage("Please enter your email address");
@@ -177,7 +277,7 @@ const Footer = () => {
           </div>
 
           <div className="clutter">
-            Stay informed with only what matters <br /> —no spam, no clutter.
+            Stay informed with only what matters <br />—no spam, no clutter.
           </div>
 
           {/* <div className="inputOfFooter">
@@ -201,42 +301,118 @@ const Footer = () => {
 
         <div className="footerRight">
           <div className="footerProducts" ref={productsRef}>
-            <div>Products</div>
-            {(() => {
-              console.log("🔍 Rendering Footer Products:");
-              console.log("  - isFooterVisible:", isFooterVisible);
-              console.log("  - appList.length:", appList.length);
-              console.log("  - Showing:", isFooterVisible && appList.length > 0 ? "Dynamic" : "Static");
-              return null;
-            })()}
-            {isFooterVisible && appList.length > 0 ? (
-              appList.slice(0, 15).map((app) => (
-                <p 
-                  key={app.AppId}
-                  onClick={() => redirectApp(app.AppName?.toLowerCase(), app.AppId)}
-                  style={{ cursor: 'pointer' }}
-                >
-                  {app.AppName}
-                </p>
-              ))
+            {/* Top Bar: Title + Search + Navigation in one line */}
+            <div className="products-top-bar">
+              <div className="products-heading">Products</div>
+              
+              {/* Search Box */}
+              <div className="products-search-box">
+                <BiSearch className="products-search-icon" />
+                <input
+                  type="text"
+                  placeholder="Search products..."
+                  value={searchTerm}
+                  onChange={handleSearchChange}
+                  className="products-search-input"
+                />
+                {searchTerm && (
+                  <button onClick={clearSearch} className="products-search-clear">
+                    ✕
+                  </button>
+                )}
+              </div>
+
+              {/* Navigation Controls */}
+              {!searchTerm && (
+                <div className="footer-navigation">
+                  <button 
+                    onClick={handlePrevPage} 
+                    disabled={currentCategoryPage === 0}
+                    className="footer-nav-btn"
+                  >
+                    ‹
+                  </button>
+                  <div className="footer-page-indicator">
+                    {currentCategoryPage + 1} / {totalPages}
+                  </div>
+                  <button 
+                    onClick={handleNextPage} 
+                    disabled={currentCategoryPage === totalPages - 1}
+                    className="footer-nav-btn"
+                  >
+                    ›
+                  </button>
+                </div>
+              )}
+            </div>
+
+            {/* Search Results Count */}
+            {searchTerm && (
+              <div className="products-search-results-count">
+                {filteredApps.length} {filteredApps.length === 1 ? 'result' : 'results'} found
+              </div>
+            )}
+
+            {searchTerm && filteredApps.length > 0 ? (
+              // Search Results
+              <div className="footer-search-results">
+                {filteredApps.map((app) => (
+                  <p 
+                    key={app.AppId}
+                    onClick={() => redirectApp(app.AppName?.toLowerCase(), app.AppId)}
+                    className="search-result-item"
+                  >
+                    {app.AppName}
+                  </p>
+                ))}
+              </div>
+            ) : searchTerm && filteredApps.length === 0 ? (
+              // No Results
+              <div className="footer-no-results">
+                <p>No products found for "{searchTerm}"</p>
+              </div>
+            ) : AppCategory.length > 0 ? (
+              <div className="footer-columns-wrapper">
+                {visibleCategories.map((category, index) => (
+                  <div className="footer-column" key={index}>
+                    <div className="footer-category">{category.title}</div>
+                    {category.apps.map((app) => (
+                      <p 
+                        key={app.AppId}
+                        onClick={() => redirectApp(app.AppName?.toLowerCase(), app.AppId)}
+                      >
+                        {app.AppName}
+                      </p>
+                    ))}
+                  </div>
+                ))}
+              </div>
             ) : (
-              <>
-                <p>Restaurant</p>
-                <p>Bakery</p>
-                <p>Dairy Delights</p>
-                <p>Electrical, Electronics and Computers</p>
-                <p>Mobile & Accessories</p>
-                <p>Groceries</p>
-                <p>Cement</p>
-                <p>Lifestyle and Fashion</p>
-                <p>Fashion Jewellery</p>
-                <p>Footwear</p>
-                <p>Salon, Spa and Beauty Parlour</p>
-                <p>Beauty and Cosmetics shop</p>
-                <p>Fitness</p>
-                <p>Departmental Stores</p>
-                <p>Wholesale</p>
-              </>
+              <div className="footer-columns-wrapper">
+                {/* Column 1 - Static */}
+                <div className="footer-column">
+                  <div className="footer-category">Food & Beverages</div>
+                  <p onClick={() => navigate(`${subDirectory}dairy-delights`)}>Dairy Delights</p>
+                  <p onClick={() => navigate(`${subDirectory}restaurant`)}>Restaurant</p>
+                  <p onClick={() => navigate(`${subDirectory}bakery`)}>Bakery</p>
+                </div>
+
+                {/* Column 2 - Static */}
+                <div className="footer-column">
+                  <div className="footer-category">Wellness & Beauty</div>
+                  <p onClick={() => navigate(`${subDirectory}beauty-and-cosmetics-shop`)}>Beauty and Cosmetics shop</p>
+                  <p onClick={() => navigate(`${subDirectory}fitness`)}>Fitness</p>
+                  <p onClick={() => navigate(`${subDirectory}salon-spa-and-beauty-parlour`)}>Salon, Spa and Beauty Parlour</p>
+                </div>
+
+                {/* Column 3 - Static */}
+                <div className="footer-column">
+                  <div className="footer-category">Fashion & Lifestyle</div>
+                  <p onClick={() => navigate(`${subDirectory}lifestyle-and-fashion`)}>Lifestyle and Fashion</p>
+                  <p onClick={() => navigate(`${subDirectory}fashion-jewellery`)}>Fashion Jewellery</p>
+                  <p onClick={() => navigate(`${subDirectory}footwear`)}>Footwear</p>
+                </div>
+              </div>
             )}
           </div>
 
diff --git a/src/PozoApp/Components/Industries.jsx b/src/PozoApp/Components/Industries.jsx
index 9166d6f..e90a217 100644
--- a/src/PozoApp/Components/Industries.jsx
+++ b/src/PozoApp/Components/Industries.jsx
@@ -92,7 +92,14 @@ const Industries = () => {
    const redirectApp = (AppName, AppId) => {
             sessionStore("AppId", AppId);
             sessionStore("AppName", AppName);
-            navigate(`${subDirectory}${AppName}`);
+            // Clean URL: Remove special chars, convert spaces to hyphens
+            const cleanUrl = AppName
+              .replace(/[,]/g, '')           // Remove commas
+              .replace(/\s+/g, '-')          // Spaces to hyphens
+              .replace(/&/g, 'and')          // & to 'and'
+              .replace(/[^a-z0-9-]/gi, '')   // Remove other special chars
+              .toLowerCase();
+            navigate(`${subDirectory}${cleanUrl}`);
             window.location.reload();
         };
 
diff --git a/src/PozoApp/Components/Navbar.jsx b/src/PozoApp/Components/Navbar.jsx
index 54dfd3c..7da72a6 100644
--- a/src/PozoApp/Components/Navbar.jsx
+++ b/src/PozoApp/Components/Navbar.jsx
@@ -4,7 +4,7 @@ import { HiMiniArrowUpRight } from "react-icons/hi2";
 import { useLocation, useNavigate } from "react-router-dom";
 import { clearSession, getSession, sessionStore } from "../../Services/others";
 
-import { FaChevronDown } from "react-icons/fa";
+import { FaChevronDown, FaWhatsapp } from "react-icons/fa";
 import IndustriesList from "./IndustriesList";
 import { IoClose } from "react-icons/io5";
 import { HiMenu } from "react-icons/hi";
@@ -81,6 +81,17 @@ const Navbar = ({
     setIndustryRes(!industryRes);
   };
 
+  const [solutionsOpen, setSolutionsOpen] = useState(false);
+  const [solutionsOpenRes, setSolutionsOpenRes] = useState(false);
+
+  const handleSolutions = () => {
+    setSolutionsOpen(!solutionsOpen);
+  };
+
+  const handleSolutionsRes = () => {
+    setSolutionsOpenRes(!solutionsOpenRes);
+  };
+
   const handleNavbarResponsive = () => {
     // Force scroll to top with immediate execution
     document.documentElement.scrollTop = 0;
@@ -120,7 +131,7 @@ const Navbar = ({
   };
 
   const handlePricing = () => {
-    navigate(`${subDirectory}pricing-pozoapp`);
+    navigate(`${subDirectory}pricing`);
   };
   const handleNavigatePrivacy = () => {
     navigate(`${subDirectory}privacy-policy`);
@@ -166,7 +177,14 @@ const Navbar = ({
   const redirectApp = (AppName, AppId) => {
     sessionStore("AppId", AppId);
     sessionStore("AppName", AppName);
-    navigate(`${subDirectory}${AppName}`);
+    // Clean URL: Remove special chars, convert spaces to hyphens
+    const cleanUrl = AppName
+      .replace(/[,]/g, '')           // Remove commas
+      .replace(/\s+/g, '-')          // Spaces to hyphens
+      .replace(/&/g, 'and')          // & to 'and'
+      .replace(/[^a-z0-9-]/gi, '')   // Remove other special chars
+      .toLowerCase();
+    navigate(`${subDirectory}${cleanUrl}`);
     window.location.reload();
   };
 
@@ -298,6 +316,14 @@ const Navbar = ({
           PozoApp
         </div>
         <div className="navbarOption">
+          <p onClick={navigateAndScrollToTop}>Home</p>
+          <p
+            onClick={handleSolutions}
+            style={{ color: solutionsOpen ? "#1473f8ff" : "" }}
+          >
+            Solutions{" "}
+            {solutionsOpen ? <FaChevronUp size={10} /> : <FaChevronDown size={10} />}
+          </p>
           <p
             onClick={handleIndustry}
             style={{ color: industry ? "#1473f8ff" : "" }}
@@ -305,7 +331,6 @@ const Navbar = ({
             Industries{" "}
             {industry ? <FaChevronUp size={10} /> : <FaChevronDown size={10} />}
           </p>
-          <p onClick={scrollToSection}>Offerings </p>
           <p
             onClick={handleCompanyList}
             style={{ color: company ? "#1473f8ff" : "" }}
@@ -313,10 +338,36 @@ const Navbar = ({
             Company{" "}
             {company ? <FaChevronUp size={10} /> : <FaChevronDown size={10} />}
           </p>
-          <p onClick={handleBlogPage}>Blog</p>
           <p onClick={handlePricing}>Pricing</p>
-          <p onClick={handleNavigateContact}>Contact Us </p>
+          <p onClick={handleBlogPage}>Blog</p>
+          <p onClick={() => navigate(`${subDirectory}case-studies`)}>Case Studies</p>
+          <p onClick={handleNavigateContact}>Contact Us</p>
         </div>
+        {solutionsOpen && (
+          <div className="solutions-dropdown">
+            <div className="solutions-list">
+              <div className="solution-item" onClick={() => navigate(`${subDirectory}solutions/retail-billing`)}>
+                <span>Retail Billing</span>
+              </div>
+              <div className="solution-item" onClick={() => navigate(`${subDirectory}solutions/inventory-purchase`)}>
+                <span>Inventory & Purchase</span>
+              </div>
+              <div className="solution-item" onClick={() => navigate(`${subDirectory}solutions/weighing-scale-pos`)}>
+                <span>Weighing Scale POS</span>
+              </div>
+              <div className="solution-item" onClick={() => navigate(`${subDirectory}solutions/multi-store-erp`)}>
+                <span>Multi-Store ERP</span>
+              </div>
+              <div className="solution-item" onClick={() => navigate(`${subDirectory}solutions/gst-billing-e-invoice`)}>
+                <span>GST Billing & E-Invoice</span>
+              </div>
+              <div className="solution-item" onClick={() => navigate(`${subDirectory}solutions/offline-billing`)}>
+                <span>Offline Billing</span>
+              </div>
+            </div>
+          </div>
+        )}
+
         {industry && (
           <IndustriesList
             industryRef={industryRef}
@@ -327,11 +378,17 @@ const Navbar = ({
         )}
 
         <div className="signinBtnNavbar">
+          <div onClick={handleDemoModal}>Book Demo</div>
           <div onClick={handleNavigateStore}>
             <sub style={{ fontSize: "14px" }}>Store</sub>
             <sup>BETA</sup>
           </div>
-          <div onClick={handleDemoModal}>Get Demo</div>
+          <div 
+            onClick={() => window.open("https://wa.me/917324000012", "_blank")}
+            style={{ cursor: "pointer", display: "flex", alignItems: "center", gap: "0.5rem" }}
+          >
+            <FaWhatsapp style={{ fontSize: "20px" }} />
+          </div>
           {!userId ? (
             <button onClick={handleSiginOnclick}>
               Sign in
@@ -411,9 +468,42 @@ const Navbar = ({
               className={`NavbarMenuResponsive ${closingMenu ? "closing" : ""}`}
             >
               <div className="ResnavbarOption">
+                <span onClick={navigateAndScrollToTop} className="indusOpen">
+                  Home
+                </span>
+                <span onClick={handleSolutionsRes} className="indusOpen">
+                  Solutions{" "}
+                  {solutionsOpenRes ? (
+                    <FaChevronUp size={10} />
+                  ) : (
+                    <FaChevronDown size={10} />
+                  )}
+                </span>
+                {solutionsOpenRes && (
+                  <div className="solutions-dropdown-mobile">
+                    <div className="solution-item-mobile" onClick={() => navigate(`${subDirectory}solutions/retail-billing`)}>
+                      Retail Billing
+                    </div>
+                    <div className="solution-item-mobile" onClick={() => navigate(`${subDirectory}solutions/inventory-purchase`)}>
+                      Inventory & Purchase
+                    </div>
+                    <div className="solution-item-mobile" onClick={() => navigate(`${subDirectory}solutions/weighing-scale-pos`)}>
+                      Weighing Scale POS
+                    </div>
+                    <div className="solution-item-mobile" onClick={() => navigate(`${subDirectory}solutions/multi-store-erp`)}>
+                      Multi-Store ERP
+                    </div>
+                    <div className="solution-item-mobile" onClick={() => navigate(`${subDirectory}solutions/gst-billing-e-invoice`)}>
+                      GST Billing & E-Invoice
+                    </div>
+                    <div className="solution-item-mobile" onClick={() => navigate(`${subDirectory}solutions/offline-billing`)}>
+                      Offline Billing
+                    </div>
+                  </div>
+                )}
                 <span onClick={handleIndustryRes} className="indusOpen">
                   Industries{" "}
-                  {industry ? (
+                  {industryRes ? (
                     <FaChevronUp size={10} />
                   ) : (
                     <FaChevronDown size={10} />
@@ -428,9 +518,6 @@ const Navbar = ({
                     />
                   </>
                 )}
-                {/* <span onClick={scrollToSection} className="indusOpen">
-                                    Offerings
-                                </span> */}
                 <span className="indusOpen" onClick={handleCompanyListRes}>
                   Company <FaChevronDown size={10} />
                 </span>
@@ -438,31 +525,36 @@ const Navbar = ({
                   <div className="industryRes">
                     <div className="compnayListsRes">
                       <p onClick={handleAboutUs}>About Us</p>
-                      {/* <p>Partnership</p>
-                                            <p>Events</p>  */}
-                      {/* <p>Webinars</p> */}
                       <p onClick={handleNavigatePrivacy}>Privacy Policy </p>
                       <p onClick={handleNavigatetestimonials}>Testimonials </p>
-                      {/* <p>Terms </p> */}
                     </div>
                   </div>
                 )}
-                <span onClick={handleBlogPage} className="indusOpen">
-                  Blog{" "}
-                </span>
                 <span onClick={handlePricing} className="indusOpen">
-                  Pricing{" "}
+                  Pricing
+                </span>
+                <span onClick={handleBlogPage} className="indusOpen">
+                  Blog
+                </span>
+                <span onClick={() => navigate(`${subDirectory}case-studies`)} className="indusOpen">
+                  Case Studies
                 </span>
                 <span onClick={handleNavigateContact} className="indusOpen">
-                  Contact Us{" "}
+                  Contact Us
                 </span>
               </div>
               <div className="signinBtnNavbarRes">
+                <div onClick={handleDemoModal}>Book Demo</div>
                 <div onClick={handleNavigateStore}>
                   <sub style={{ fontSize: "14px" }}>Store</sub>
                   <sup>BETA</sup>
                 </div>
-                <div onClick={handleDemoModal}>Get Demo</div>
+                <div 
+                  onClick={() => window.open("https://wa.me/917324000012", "_blank")}
+                  style={{ cursor: "pointer", display: "flex", alignItems: "center", justifyContent: "center", gap: "0.5rem" }}
+                >
+                  <FaWhatsapp style={{ fontSize: "20px" }} />
+                </div>
                 <button onClick={handleSiginOnclick}>
                   <div></div>
                   Sign in
@@ -476,6 +568,19 @@ const Navbar = ({
           )}
         </div>
       </div>
+
+      {/* Mobile Sticky Footer for Book Demo & WhatsApp */}
+      <div className="mobile-sticky-footer">
+        <div onClick={handleDemoModal} className="mobile-sticky-btn">
+          Book Demo
+        </div>
+        <div 
+          onClick={() => window.open("https://wa.me/917324000012", "_blank")}
+          className="mobile-sticky-btn whatsapp-btn"
+        >
+          <FaWhatsapp style={{ fontSize: "20px" }} />
+        </div>
+      </div>
     </div>
   );
 };
diff --git a/src/PozoApp/Components/OverView.jsx b/src/PozoApp/Components/OverView.jsx
index e3fa700..48301c5 100644
--- a/src/PozoApp/Components/OverView.jsx
+++ b/src/PozoApp/Components/OverView.jsx
@@ -12,6 +12,8 @@ import Innovation from "../Images/Innovation.webp";
 import OverViewVideo from "../Videos/OverView.webm";
 import AnimatedText from "./AnimatedText/AnimatedText";
 import { useNavigate } from "react-router-dom";
+import { useDispatch } from "react-redux";
+import { getAdminPanel } from "../../features/AdminPanel/AdminPanel";
 
 const subDirectory = import.meta.env.BASE_URL;
 gsap.registerPlugin(ScrollTrigger, SplitText);
@@ -22,27 +24,97 @@ const OverView = ({
   handleModalSignInClose,
 }) => {
   const navigate = useNavigate();
+  const dispatch = useDispatch();
   const sloganRef = useRef(null);
   const featuresRef = useRef([]);
   const aiCardRef = useRef(null);
 
-  const features = [
+  // 🚀 Dynamic content from CMS
+  const [heroContent, setHeroContent] = useState({
+    mainHeadline: "Retail ERP & POS built for Indian MSMEs — fast billing, smart inventory, GST-ready.",
+    description: "A SaaS platform that empowers Small and Medium Businesses by digitizing operations and reducing Total Cost of Ownership with minimal investment.",
+    ctaButtonText: "Experience Now",
+    ctaButtonLink: "/signin"
+  });
+
+  const [offeringsContent, setOfferingsContent] = useState([
     {
+      id: 1,
       icon: Experience,
       title: "Experience",
       desc: "Proven expertise delivering real value",
     },
     {
+      id: 2,
       icon: Innovation,
       title: "Innovation",
       desc: "Smarter intelligence for better outcomes",
     },
     {
+      id: 3,
       icon: CostEfficiency,
       title: "Cost Efficiency",
       desc: "Maximum value with minimal cost",
     },
-  ];
+  ]);
+
+  // Fetch dynamic content from CMS
+  useEffect(() => {
+    fetchHeroContent();
+    fetchOfferingsContent();
+  }, []);
+
+  const fetchHeroContent = async () => {
+    try {
+      const res = await dispatch(
+        getAdminPanel({ sectionName: "HeroSection" })
+      ).unwrap();
+      
+      if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) {
+        const heroData = res.data.data[0];
+        if (heroData.Content) {
+          const content = JSON.parse(heroData.Content);
+          setHeroContent({
+            mainHeadline: content.mainHeadline || heroContent.mainHeadline,
+            description: content.description || heroContent.description,
+            ctaButtonText: content.ctaButtonText || heroContent.ctaButtonText,
+            ctaButtonLink: content.ctaButtonLink || heroContent.ctaButtonLink
+          });
+        }
+      }
+    } catch (error) {
+      console.log("Using default hero content");
+    }
+  };
+
+  const fetchOfferingsContent = async () => {
+    try {
+      const res = await dispatch(
+        getAdminPanel({ sectionName: "Offerings" })
+      ).unwrap();
+      
+      if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) {
+        const offeringsData = res.data.data[0];
+        if (offeringsData.Content) {
+          const content = JSON.parse(offeringsData.Content);
+          if (content.offerings && content.offerings.length > 0) {
+            // Map with icons
+            const mappedOfferings = content.offerings.map(offering => ({
+              ...offering,
+              icon: offering.icon === 'experience' ? Experience :
+                    offering.icon === 'innovation' ? Innovation :
+                    offering.icon === 'cost' ? CostEfficiency : Experience
+            }));
+            setOfferingsContent(mappedOfferings);
+          }
+        }
+      }
+    } catch (error) {
+      console.log("Using default offerings content");
+    }
+  };
+
+  const features = offeringsContent;
 
   useEffect(() => {
     // Slogan animation with SplitText
@@ -114,18 +186,30 @@ const OverView = ({
 
   return (
     <div className="OverView-Master">
-      {/* Background Video */}
-      <video autoPlay muted loop playsInline className="bg-video">
-        <source src={OverViewVideo} type="video/mp4" preload="metadata" />
+      {/* Background Video - Optimized loading */}
+      <video 
+        autoPlay 
+        muted 
+        loop 
+        playsInline 
+        className="bg-video"
+        preload="none"
+        loading="lazy"
+      >
+        <source src={OverViewVideo} type="video/webm" />
         {/* <source src="https://csjnrlpkmurliskqkmnp.supabase.co/storage/v1/object/public/Store/PozoAppBg3.mp4" type="video/mp4" /> */}
       </video>
       {/* Navbar */}
       {/* <Navbar /> */}
 
-      {/* Slogan */}
+      {/* Slogan - Dynamic from CMS */}
       <div className="overviewSlogan" ref={sloganRef}>
-        Streamline... Simplify... <br />
-        Succeed with Pozo Apps
+        {heroContent.mainHeadline.split('\n').map((line, i) => (
+          <React.Fragment key={i}>
+            {line}
+            {i < heroContent.mainHeadline.split('\n').length - 1 && <br />}
+          </React.Fragment>
+        ))}
       </div>
 
       {/* Hero Section */}
@@ -138,7 +222,7 @@ const OverView = ({
               className="feature-item"
               ref={(el) => (featuresRef.current[index] = el)}
             >
-              <img src={item.icon} alt={item.title} width={40} />
+              <img src={item.icon} alt={item.title} width={40} loading="lazy" />
               <div className="feature-text">
                 <h3>{item.title}</h3>
                 <p>{item.desc}</p>
@@ -151,14 +235,13 @@ const OverView = ({
         <div className="hero-right">
           <div className="ai-card">
             <p>
-              Agentic AI-powered SaaS solutions for businesses of all sizes –
-              from MSME to Enterprises.
+              {heroContent.description}
             </p>
             <button
               className="experience-btn"
-              onClick={() => navigate(`${subDirectory}signin`)}
+              onClick={() => navigate(`${subDirectory}${heroContent.ctaButtonLink.replace(/^\//, '')}`)}
             >
-              Experience Now
+              {heroContent.ctaButtonText}
               <div className="icon-container">
                 <HiMiniArrowUpRight className="icon-main" />
                 <HiMiniArrowUpRight className="icon-hover" />
diff --git a/src/PozoApp/Components/PricingPozoApp.jsx b/src/PozoApp/Components/PricingPozoApp.jsx
index ccfd08c..ab49f64 100644
--- a/src/PozoApp/Components/PricingPozoApp.jsx
+++ b/src/PozoApp/Components/PricingPozoApp.jsx
@@ -666,6 +666,15 @@ const PricingPozoApp = () => {
     if (industry) {
       handleIndustry();
     }
+    // Clean URL: Remove special chars, convert spaces to hyphens
+    const cleanUrl = AppName
+      .replace(/[,]/g, '')           // Remove commas
+      .replace(/\s+/g, '-')          // Spaces to hyphens
+      .replace(/&/g, 'and')          // & to 'and'
+      .replace(/[^a-z0-9-]/gi, '')   // Remove other special chars
+      .toLowerCase();
+    navigate(`${subDirectory}${cleanUrl}`);
+    window.location.reload();
   };
 
   // Moved loading check after all hooks
diff --git a/src/PozoApp/Components/ResponsiveApp.jsx b/src/PozoApp/Components/ResponsiveApp.jsx
index ed7c707..2e9585c 100644
--- a/src/PozoApp/Components/ResponsiveApp.jsx
+++ b/src/PozoApp/Components/ResponsiveApp.jsx
@@ -35,7 +35,7 @@ const ResponsiveApp = () => {
     };
 
     const handlePricing = () => {
-        navigate(`${subDirectory}pricing-pozoapp`);
+        navigate(`${subDirectory}pricing`);
     };
 
     const handleNavigateStore = () => {
diff --git a/src/PozoApp/Components/SignIn.jsx b/src/PozoApp/Components/SignIn.jsx
index 865c239..8ace57b 100644
--- a/src/PozoApp/Components/SignIn.jsx
+++ b/src/PozoApp/Components/SignIn.jsx
@@ -1,7 +1,6 @@
 import React, { useState, useEffect, useRef } from "react";
 import "../Styles/SignIn.scss";
-import pozominilogoWhite from "../Images/pozominilogoWhite.webp";
-import pozoAppLogo from "../Images/pozoAppLogo.webp";
+ import pozoAppLogo from "../Images/pozoAppLogo.webp";
 import { RiArrowRightUpLine } from "react-icons/ri";
 import { FaChevronDown } from "react-icons/fa";
 import { useNavigate, useLocation } from "react-router-dom";
@@ -719,7 +718,7 @@ const SignIn = () => {
             <div className="inputsTitle">
               <img
                 className="whitelogoPng"
-                src={pozominilogoWhite}
+                src={pozoAppLogo}
                 alt=""
                 onClick={navigateHomePage}
               />
diff --git a/src/PozoApp/Pages/CaseStudies.jsx b/src/PozoApp/Pages/CaseStudies.jsx
new file mode 100644
index 0000000..6c06108
--- /dev/null
+++ b/src/PozoApp/Pages/CaseStudies.jsx
@@ -0,0 +1,31 @@
+import React from "react";
+import Navbar from "../Components/Navbar";
+import Footer from "../Components/Footer";
+import "./CaseStudies.scss";
+
+const CaseStudies = () => {
+  return (
+    <div className="case-studies-page">
+      <Navbar isScrolled={true} forceTopZero={true} />
+      
+      <div className="case-studies-hero">
+        <div className="case-studies-hero-content">
+          <h1>Case Studies</h1>
+          <p>Success stories from businesses powered by PozoApp</p>
+        </div>
+      </div>
+
+      <div className="case-studies-container">
+        <div className="coming-soon-message">
+          <h2>Coming Soon</h2>
+          <p>We're currently working on bringing you inspiring success stories from our clients.</p>
+        </div>
+      </div>
+
+      <Footer />
+    </div>
+  );
+};
+
+export default CaseStudies;
+
diff --git a/src/PozoApp/Pages/CaseStudies.scss b/src/PozoApp/Pages/CaseStudies.scss
new file mode 100644
index 0000000..1635143
--- /dev/null
+++ b/src/PozoApp/Pages/CaseStudies.scss
@@ -0,0 +1,82 @@
+.case-studies-page {
+  min-height: 100vh;
+  background: #000;
+  color: #fff;
+  font-family: "NeueMontreal", sans-serif;
+}
+
+.case-studies-hero {
+  padding: 120px 2rem 80px;
+  text-align: center;
+  background: linear-gradient(135deg, #000 0%, #1a1a1a 100%);
+
+  @media (max-width: 768px) {
+    padding: 100px 1.5rem 60px;
+  }
+
+  .case-studies-hero-content {
+    max-width: 800px;
+    margin: 0 auto;
+
+    h1 {
+      font-size: 56px;
+      font-weight: 700;
+      margin: 0 0 1.5rem 0;
+      background: linear-gradient(135deg, #fff 0%, #999 100%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
+
+      @media (max-width: 768px) {
+        font-size: 36px;
+      }
+    }
+
+    p {
+      font-size: 22px;
+      color: #999;
+      margin: 0;
+      line-height: 1.5;
+
+      @media (max-width: 768px) {
+        font-size: 18px;
+      }
+    }
+  }
+}
+
+.case-studies-container {
+  padding: 120px 2rem;
+  max-width: 800px;
+  margin: 0 auto;
+  text-align: center;
+
+  @media (max-width: 768px) {
+    padding: 80px 1.5rem;
+  }
+
+  .coming-soon-message {
+    h2 {
+      font-size: 48px;
+      font-weight: 600;
+      margin: 0 0 1.5rem 0;
+      color: #fff;
+
+      @media (max-width: 768px) {
+        font-size: 32px;
+      }
+    }
+
+    p {
+      font-size: 20px;
+      color: #999;
+      line-height: 1.6;
+      margin: 0;
+
+      @media (max-width: 768px) {
+        font-size: 18px;
+      }
+    }
+  }
+}
+
diff --git a/src/PozoApp/Pages/HomePage.jsx b/src/PozoApp/Pages/HomePage.jsx
index c6bc266..2f65336 100644
--- a/src/PozoApp/Pages/HomePage.jsx
+++ b/src/PozoApp/Pages/HomePage.jsx
@@ -1,20 +1,9 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState, lazy, Suspense } from "react";
 import Lenis from "@studio-freight/lenis";
 import { gsap } from "gsap";
 import { ScrollTrigger } from "gsap/ScrollTrigger";
 import "./HomePage.scss";
 import { IoClose } from "react-icons/io5";
-import OverView from "../Components/OverView.jsx";
-import Offering from "../Components/Offering.jsx";
-import DigitalSection from "../Components/DigitalSection.jsx";
-import Footer from "../Components/Footer.jsx";
-import NoLimt from "../Components/NoLimt.jsx";
-import TrendingApp from "../Components/TrendingApp.jsx";
-import FaqSection from "../Components/FaqSection.jsx";
-import Insiders from "../Components/Insiders.jsx";
-import Industries from "../Components/Industries.jsx";
-import PozoVideo from "../Components/PozoVideo.jsx";
-import Loader from "../Components/Loader/PozoLoader.jsx";
 import { FaWhatsapp } from "react-icons/fa";
 import { useNavigate } from "react-router-dom";
 import { FaChevronUp } from "react-icons/fa";
@@ -27,15 +16,30 @@ import {
   getAllApplicationData,
 } from "../../features/publicHome/publicHome";
 import { getSession, sessionStore } from "../../Services/others";
-import Navbar from "../Components/Navbar.jsx";
-import IndustriesList from "../Components/IndustriesList.jsx";
-import CompanyList from "../Components/companyList.jsx";
-import BookDemo from "../Components/BookDemo.jsx";
-import ModalSignIn from "../Components/ModalSignIn.jsx";
-import SEO from "../../Components/SEO/SEO.jsx";
-import { getSeo } from "../../features/SEO/seo.js"; // assume this exists
+import { getSeo } from "../../features/SEO/seo.js";
 import { getConfigNames } from "../../features/configmasterPage/configmasterPage.js";
 
+// ✅ Critical imports - Load immediately
+import Navbar from "../Components/Navbar.jsx";
+import OverView from "../Components/OverView.jsx";
+import Loader from "../Components/Loader/PozoLoader.jsx";
+import SEO from "../../Components/SEO/SEO.jsx";
+
+// 🚀 Lazy imports - Code split for better performance
+const Offering = lazy(() => import("../Components/Offering.jsx"));
+const DigitalSection = lazy(() => import("../Components/DigitalSection.jsx"));
+const PozoVideo = lazy(() => import("../Components/PozoVideo.jsx"));
+const TrendingApp = lazy(() => import("../Components/TrendingApp.jsx"));
+const FaqSection = lazy(() => import("../Components/FaqSection.jsx"));
+const Insiders = lazy(() => import("../Components/Insiders.jsx"));
+const Footer = lazy(() => import("../Components/Footer.jsx"));
+
+// 🎯 Conditional lazy imports - Load only when needed
+const IndustriesList = lazy(() => import("../Components/IndustriesList.jsx"));
+const CompanyList = lazy(() => import("../Components/companyList.jsx"));
+const BookDemo = lazy(() => import("../Components/BookDemo.jsx"));
+const ModalSignIn = lazy(() => import("../Components/ModalSignIn.jsx"));
+
 // import og from "../../../public/og/home.jpg"
 
 const subDirectory = import.meta.env.BASE_URL;
@@ -66,68 +70,63 @@ const HomePage = () => {
   const [seoData, setSeoData] = useState(null);
   const [allpagesData, setAllpagesData] = useState([]);
 
+  // 🚀 Optimized: All independent API calls run in parallel
   useEffect(() => {
-    const fetchSEOData = async () => {
+    const initializeData = async () => {
       try {
-        // Get all pages
-        const Res = await dispatch(
-          getConfigNames({ TypeName: "SEO" })
-        ).unwrap();
-        if (Res?.data?.statusCode === 1) {
-          const pages = Res.data.data;
+        // Run all independent API calls in parallel!
+        const [seoConfigRes, appDataRes, tokenRes] = await Promise.all([
+          // SEO Config
+          dispatch(getConfigNames({ TypeName: "SEO" })).unwrap(),
+          // App Data
+          dispatch(getAllApplicationData()).unwrap(),
+          // Token
+          dispatch(PostToken({ username: "1000000001", password: "1234" })).unwrap()
+        ]);
+
+        // Process SEO data
+        if (seoConfigRes?.data?.statusCode === 1) {
+          const pages = seoConfigRes.data.data;
           setAllpagesData(pages);
-
-          // Find Home page ID
+          
           const SeoId = pages.find((e) => e.ConfigName === "home")?.ConfigId;
-          if (!SeoId) {
-            console.warn("Home page ConfigId not found");
-            return;
-          }
-
-          // Fetch SEO for Home page
-          const response = await dispatch(getSeo({ PageId: SeoId })).unwrap();
-          if (response?.data?.statusCode === 1) {
-            const data = response.data.data.find((e) => e.PageId === SeoId);
-            if (data) {
-              setSeoData({
-                metaTitle: data?.MetaTitle,
-                metaDescription: data?.MetaDesc,
-                keywords: data?.Keywords,
-                imageAltText: data?.ImgAltText,
-              });
-            }
+          if (SeoId) {
+            // Fetch SEO details (non-blocking)
+            dispatch(getSeo({ PageId: SeoId })).unwrap().then((response) => {
+              if (response?.data?.statusCode === 1) {
+                const data = response.data.data.find((e) => e.PageId === SeoId);
+                if (data) {
+                  setSeoData({
+                    metaTitle: data?.MetaTitle,
+                    metaDescription: data?.MetaDesc,
+                    keywords: data?.Keywords,
+                    imageAltText: data?.ImgAltText,
+                  });
+                }
+              }
+            });
           }
         }
+
+        // Process App data
+        if (appDataRes?.data?.statusCode === 1) {
+          const activeApps = appDataRes?.data?.data?.filter(
+            (value) => value?.ActiveStatus === "A"
+          );
+          setAppCategory(activeApps);
+        }
+
       } catch (error) {
-        console.error("Error fetching SEO data:", error);
+        console.error("Error initializing data:", error);
       }
     };
 
-    fetchSEOData();
-  }, [dispatch]);
-
-  useEffect(() => {
-    getAppData();
+    initializeData();
   }, []);
 
-  const getAppData = async () => {
-    try {
-      const response = await dispatch(getAllApplicationData()).unwrap();
-      if (response?.data?.statusCode === 1) {
-        let finalsubCategory = response?.data?.data?.filter(
-          (value) => value?.ActiveStatus === "A"
-        );
-        setAppCategory(finalsubCategory);
-      }
-    } catch (error) {
-      console.error("Error fetching app data:", error);
-    }
-  };
-  console.log(AppCategory, "AppCategory");
-
   useEffect(() => {
-    // Simulate loading delay
-    const timer = setTimeout(() => setLoading(false), 100);
+    // Show page immediately - don't wait!
+    const timer = setTimeout(() => setLoading(false), 300);
 
     // Lenis smooth scrolling
     const lenisInstance = new Lenis({
@@ -159,55 +158,44 @@ const HomePage = () => {
     };
   }, []);
 
-  // Separate useEffect for API calls
+  // 🚀 Optimized: Fetch categories in parallel with other data (if needed for navbar)
   useEffect(() => {
-    const fetchConfigName = async () => {
-      setSubCategory([]);
-      setAppCategory([]);
-      const response = await dispatch(getCategoryData()).unwrap();
-      if (response?.data?.statusCode === 1) {
-        let finalCategory = response?.data?.data;
-        setCategory(finalCategory);
-      }
-    };
-
-    const Tokens = async () => {
-      let data = {
-        username: "1000000001",
-        password: "1234",
-      };
+    const fetchCategoryData = async () => {
       try {
-        await dispatch(PostToken(data)).unwrap();
+        const response = await dispatch(getCategoryData()).unwrap();
+        if (response?.data?.statusCode === 1) {
+          const finalCategory = response?.data?.data;
+          setCategory(finalCategory);
+          
+          // Auto-fetch first subcategory (non-blocking)
+          if (finalCategory?.[0]?.CateId) {
+            dispatch(getSubCategoryData(finalCategory[0].CateId)).unwrap()
+              .then((subRes) => {
+                if (subRes?.data?.statusCode === 1) {
+                  const activeSubCat = subRes?.data?.data?.filter(
+                    (value) => value.ActiveStatus === "A"
+                  );
+                  setSubCategory(activeSubCat);
+                }
+              })
+              .catch((err) => console.error("Error fetching subcategory:", err));
+          }
+        }
       } catch (error) {
-        console.error("Error fetching token:", error);
+        console.error("Error fetching categories:", error);
       }
     };
 
-    const initializeData = async () => {
-      await fetchConfigName();
-      await Tokens();
-    };
-    initializeData();
-  }, []);
-  // Auto-fetch subcategories when categories load
-  useEffect(() => {
-    const getSubCategory = async (cateId) => {
-      // setAppCategory([]);
-      const response = await dispatch(getSubCategoryData(cateId)).unwrap();
-      if (response?.data?.statusCode === 1) {
-        let finalsubCategory = response?.data?.data?.filter(
-          (value) => value.ActiveStatus === "A"
-        );
-        setSubCategory(finalsubCategory);
-      }
-    };
-
-    if (Category?.[0]?.CateId != undefined) {
-      getSubCategory(Category?.[0]?.CateId);
+    // Only fetch if needed for navbar/menu
+    if (AppCategory.length > 0) {
+      // Already have app data, skip category fetch
+    } else {
+      fetchCategoryData();
     }
-  }, [Category]);
+  }, [AppCategory]);
 
   // Auto-fetch apps when subcategories load
+  // Commented out - not needed with getAllApplicationData
   // useEffect(() => {
   //   const getAppData = async (subcatId) => {
   //     const response = await dispatch(getApplicationData(subcatId)).unwrap();
@@ -224,8 +212,6 @@ const HomePage = () => {
   //   }
   // }, [SubCategory]);
 
-  if (loading) return <Loader />;
-
   const scrollToTop = () => {
     if (lenis) {
       lenis.scrollTo(0, { duration: 1.5 });
@@ -235,7 +221,16 @@ const HomePage = () => {
   };
 
   const redirectApp = async (AppName, AppId) => {
-    navigate(`${subDirectory}${AppName}`);
+    sessionStore("AppId", AppId);
+    sessionStore("AppName", AppName);
+    // Clean URL: Remove special chars, convert spaces to hyphens
+    const cleanUrl = AppName
+      .replace(/[,]/g, '')           // Remove commas
+      .replace(/\s+/g, '-')          // Spaces to hyphens
+      .replace(/&/g, 'and')          // & to 'and'
+      .replace(/[^a-z0-9-]/gi, '')   // Remove other special chars
+      .toLowerCase();
+    navigate(`${subDirectory}${cleanUrl}`);
     window.location.reload();
   };
 
@@ -329,32 +324,30 @@ const HomePage = () => {
             handleModalSignInClose={handleModalSignInClose}
           />
         </section>
-        <section>
-          <Offering />
-        </section>
-        <section>
-          <DigitalSection />
-        </section>
-        <section>
-          <PozoVideo />
-        </section>
-
-        {/* Application DropDown */}
-        {/* <section>
-          <Industries />
-        </section> */}
-        <section>
-          <TrendingApp />
-        </section>
-        <section>
-          <FaqSection />
-        </section>
-        <section>
-          <Insiders />
-        </section>
-        <section>
-          <Footer />
-        </section>
+        
+        <Suspense fallback={null}>
+          <section>
+            <Offering />
+          </section>
+          <section>
+            <DigitalSection />
+          </section>
+          <section>
+            <PozoVideo />
+          </section>
+          <section>
+            <TrendingApp />
+          </section>
+          <section>
+            <FaqSection />
+          </section>
+          <section>
+            <Insiders />
+          </section>
+          <section>
+            <Footer AppCategory={AppCategory} />
+          </section>
+        </Suspense>
 
         <div
           className="folatingWhatsapp"
@@ -371,24 +364,36 @@ const HomePage = () => {
         )}
 
         {industry && (
-          <IndustriesList
-            industryRef={industryRef}
-            closingIndustry={closingIndustry}
-            AppCategory={AppCategory}
-            redirectApp={redirectApp}
-          />
+          <Suspense fallback={null}>
+            <IndustriesList
+              industryRef={industryRef}
+              closingIndustry={closingIndustry}
+              AppCategory={AppCategory}
+              redirectApp={redirectApp}
+            />
+          </Suspense>
         )}
 
         {company && (
-          <CompanyList
-            companyRef={companyRef}
-            closingCompany={closingCompany}
-          />
+          <Suspense fallback={null}>
+            <CompanyList
+              companyRef={companyRef}
+              closingCompany={closingCompany}
+            />
+          </Suspense>
         )}
 
-        {demoModal && <BookDemo onClose={handleDemoModalClose} />}
+        {demoModal && (
+          <Suspense fallback={null}>
+            <BookDemo onClose={handleDemoModalClose} />
+          </Suspense>
+        )}
 
-        {modalSignIn && <ModalSignIn onClose={handleModalSignInClose} />}
+        {modalSignIn && (
+          <Suspense fallback={null}>
+            <ModalSignIn onClose={handleModalSignInClose} />
+          </Suspense>
+        )}
       </div>
     </>
   );
diff --git a/src/PozoApp/Pages/Solutions.jsx b/src/PozoApp/Pages/Solutions.jsx
new file mode 100644
index 0000000..ef09d2f
--- /dev/null
+++ b/src/PozoApp/Pages/Solutions.jsx
@@ -0,0 +1,97 @@
+import React from "react";
+import { useNavigate } from "react-router-dom";
+import "./Solutions.scss";
+import Navbar from "../Components/Navbar";
+import Footer from "../Components/Footer";
+
+const subDirectory = import.meta.env.BASE_URL;
+
+const Solutions = () => {
+  const navigate = useNavigate();
+
+  const solutions = [
+    {
+      id: 1,
+      title: "Retail Billing",
+      description: "Fast, intuitive billing system for retail stores with GST compliance",
+      icon: "🛒",
+      path: "retail-billing",
+    },
+    {
+      id: 2,
+      title: "Inventory & Purchase",
+      description: "Smart inventory management with real-time stock tracking",
+      icon: "📦",
+      path: "inventory-purchase",
+    },
+    {
+      id: 3,
+      title: "Weighing Scale POS",
+      description: "Integrated weighing scale with POS for seamless billing",
+      icon: "⚖️",
+      path: "weighing-scale-pos",
+    },
+    {
+      id: 4,
+      title: "Multi-Store ERP",
+      description: "Manage multiple stores from one centralized platform",
+      icon: "🏪",
+      path: "multi-store-erp",
+    },
+    {
+      id: 5,
+      title: "GST Billing & E-Invoice",
+      description: "GST-ready billing with automated e-invoice generation",
+      icon: "📄",
+      path: "gst-billing-e-invoice",
+    },
+    {
+      id: 6,
+      title: "Offline Billing",
+      description: "Continue billing even without internet connectivity",
+      icon: "📴",
+      path: "offline-billing",
+    },
+  ];
+
+  const handleSolutionClick = (path) => {
+    navigate(`${subDirectory}solutions/${path}`);
+  };
+
+  return (
+    <div className="solutions-page">
+      <Navbar isScrolled={true} forceTopZero={true} />
+      
+      <div className="solutions-hero">
+        <div className="solutions-hero-content">
+          <h1>Our Solutions</h1>
+          <p>Comprehensive retail management solutions for Indian MSMEs</p>
+        </div>
+      </div>
+
+      <div className="solutions-grid-container">
+        <div className="solutions-grid">
+          {solutions.map((solution) => (
+            <div
+              key={solution.id}
+              className="solution-card"
+              onClick={() => handleSolutionClick(solution.path)}
+            >
+              <div className="solution-icon">{solution.icon}</div>
+              <h3>{solution.title}</h3>
+              <p>{solution.description}</p>
+              <button className="solution-btn">
+                Learn More →
+              </button>
+            </div>
+          ))}
+        </div>
+      </div>
+
+      <Footer />
+    </div>
+  );
+};
+
+export default Solutions;
+
diff --git a/src/PozoApp/Pages/Solutions.scss b/src/PozoApp/Pages/Solutions.scss
new file mode 100644
index 0000000..4e3da7f
--- /dev/null
+++ b/src/PozoApp/Pages/Solutions.scss
@@ -0,0 +1,134 @@
+.solutions-page {
+  min-height: 100vh;
+  background: #000;
+  color: #fff;
+  font-family: "NeueMontreal", sans-serif;
+}
+
+.solutions-hero {
+  padding: 120px 2rem 80px;
+  text-align: center;
+  background: linear-gradient(135deg, #000 0%, #1a1a1a 100%);
+
+  @media (max-width: 768px) {
+    padding: 100px 1.5rem 60px;
+  }
+
+  .solutions-hero-content {
+    max-width: 800px;
+    margin: 0 auto;
+
+    h1 {
+      font-size: 56px;
+      font-weight: 700;
+      margin: 0 0 1.5rem 0;
+      background: linear-gradient(135deg, #fff 0%, #999 100%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
+
+      @media (max-width: 768px) {
+        font-size: 36px;
+      }
+    }
+
+    p {
+      font-size: 22px;
+      color: #999;
+      margin: 0;
+      line-height: 1.5;
+
+      @media (max-width: 768px) {
+        font-size: 18px;
+      }
+    }
+  }
+}
+
+.solutions-grid-container {
+  padding: 80px 2rem 120px;
+  max-width: 1400px;
+  margin: 0 auto;
+
+  @media (max-width: 768px) {
+    padding: 60px 1.5rem 80px;
+  }
+}
+
+.solutions-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(350px, 1fr));
+  gap: 2rem;
+
+  @media (max-width: 768px) {
+    grid-template-columns: 1fr;
+    gap: 1.5rem;
+  }
+}
+
+.solution-card {
+  background: rgba(255, 255, 255, 0.05);
+  backdrop-filter: blur(20px);
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  border-radius: 16px;
+  padding: 2.5rem;
+  cursor: pointer;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+
+  @media (max-width: 768px) {
+    padding: 2rem;
+  }
+
+  &:hover {
+    background: rgba(255, 255, 255, 0.08);
+    border-color: rgba(255, 255, 255, 0.2);
+    transform: translateY(-5px);
+    box-shadow: 0 12px 40px rgba(0, 0, 0, 0.4);
+  }
+
+  .solution-icon {
+    font-size: 48px;
+    margin-bottom: 1.5rem;
+  }
+
+  h3 {
+    font-size: 24px;
+    font-weight: 600;
+    margin: 0 0 1rem 0;
+    color: #fff;
+
+    @media (max-width: 768px) {
+      font-size: 22px;
+    }
+  }
+
+  p {
+    font-size: 16px;
+    color: #999;
+    line-height: 1.6;
+    margin: 0 0 1.5rem 0;
+
+    @media (max-width: 768px) {
+      font-size: 15px;
+    }
+  }
+
+  .solution-btn {
+    background: transparent;
+    border: 1px solid #fff;
+    color: #fff;
+    padding: 0.75rem 1.5rem;
+    border-radius: 6px;
+    font-size: 15px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 0.3s;
+    font-family: inherit;
+
+    &:hover {
+      background: #fff;
+      color: #000;
+    }
+  }
+}
+
diff --git a/src/PozoApp/Styles/Footer.scss b/src/PozoApp/Styles/Footer.scss
index ec3e39e..62e2b4d 100644
--- a/src/PozoApp/Styles/Footer.scss
+++ b/src/PozoApp/Styles/Footer.scss
@@ -1,17 +1,24 @@
 .Footer-Master {
     width: 100%;
     background-color: #010101;
-    padding: 1.5rem 4rem 0 1.5rem;
+    // padding: 3rem 4rem 2rem 4rem;
+    padding: 2rem 1rem 1rem 1rem;
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     justify-content: space-between;
-    gap: 2rem;
+    gap: 4rem;
     font-family: "NeueMontreal";
 
+    @media (max-width: 1024px) {
+        gap: 3rem;
+        padding: 2.5rem 2rem 2rem 2rem;
+    }
+
     @media (max-width: 768px) {
         flex-direction: column;
         align-items: flex-start;
-        padding: 1rem 1rem 1rem 1rem;
+        padding: 2rem 1.5rem 1.5rem 1.5rem;
+        gap: 2.5rem;
     }
 
     .footerLeft {
@@ -28,12 +35,13 @@
 
         div {
             text-align: left;
-            font-size: 16px;
+            font-size: 23px !important;
         }
     }
 
     .clutter {
-        font-size: 16px;
+        font-size: 16px !important;
+
         text-align: left;
         margin-top: 1rem;
 
@@ -70,53 +78,307 @@
         color: #fff;
         display: flex;
         align-items: flex-start;
-        gap: 16px;
-        flex-wrap: wrap;
-        @media (max-width: 500px) {
+        gap: 2rem;
+        flex: 1;
+        max-width: 1000px;
+        
+        @media (max-width: 768px) {
             flex-direction: column;
-            margin-bottom: 3rem;
+            gap: 2rem;
+            width: 100%;
         }
     }
 
     .footerProducts {
-        display: grid;
-        grid-template-columns: repeat(3, 1fr);
-        gap: 8px;
-        column-gap: 2rem;
+        display: flex;
+        flex-direction: column;
+        gap: 0;
+        width: 100%;
+        max-width: 1100px;
 
-        @media (max-width: 768px) {
-            grid-template-columns: repeat(2, 1fr);
-        }
+        // Top Bar - Everything in one line
+        .products-top-bar {
+            display: flex;
+            align-items: center;
+            gap: 2rem;
+            margin-bottom: 1.5rem;
+            flex-wrap: wrap;
 
-        div {
-            font-size: 18px;
-            font-family: "NeueMontreal";
-            font-weight: 400;
-            grid-column: span 3;
-
-            @media (max-width: 768px) {
-                grid-column: span 2;
+            @media (max-width: 900px) {
+                flex-direction: column;
+                align-items: stretch;
+                gap: 1rem;
             }
         }
 
-        p {
-            font-size: 13.5px;
+        // Main "Products" heading
+        .products-heading {
+            font-size: 18px;
             font-family: "NeueMontreal";
-            font-weight: 400;
-            cursor: pointer;
-            transition: all 0.3s ease;
+            font-weight: 500;
+            color: #fff;
+            flex-shrink: 0;
 
-            &:hover {
-                color: #418df7;
+            @media (max-width: 900px) {
+                margin-bottom: 0;
+            }
+        }
+
+        // Search Box (in top bar)
+        .products-search-box {
+            position: relative;
+            display: flex;
+            align-items: center;
+            flex: 1;
+            max-width: 350px;
+            
+            @media (max-width: 900px) {
+                max-width: 100%;
+            }
+
+            .products-search-icon {
+                position: absolute;
+                left: 16px;
+                font-size: 18px;
+                color: rgba(255, 255, 255, 0.5);
+                pointer-events: none;
+                z-index: 1;
+            }
+
+            .products-search-input {
+                width: 100%;
+                padding: 10px 40px 10px 45px;
+                background: rgba(255, 255, 255, 0.1);
+                border: 1px solid rgba(255, 255, 255, 0.2);
+                border-radius: 8px;
+                color: #fff;
+                font-family: "NeueMontreal";
+                font-size: 14px;
+                transition: all 0.3s ease;
+                outline: none;
+
+                &::placeholder {
+                    color: rgba(255, 255, 255, 0.5);
+                }
+
+                &:focus {
+                    background: rgba(255, 255, 255, 0.15);
+                    border-color: #3588fd;
+                    box-shadow: 0 0 0 3px rgba(53, 136, 253, 0.1);
+                }
+            }
+
+            .products-search-clear {
+                position: absolute;
+                right: 12px;
+                background: none;
+                border: none;
+                color: #fff;
+                font-size: 18px;
+                cursor: pointer;
+                padding: 4px 8px;
+                transition: all 0.2s ease;
+                opacity: 0.6;
+
+                &:hover {
+                    opacity: 1;
+                    transform: scale(1.1);
+                }
+            }
+        }
+
+        // Search Results Count
+        .products-search-results-count {
+            font-size: 12px;
+            color: #888;
+            margin-bottom: 1rem;
+            font-family: "NeueMontreal";
+        }
+
+        // Search Results
+        .footer-search-results {
+            display: grid;
+            grid-template-columns: repeat(3, 1fr);
+            gap: 0.5rem 2rem;
+            margin-top: 1rem;
+            
+            @media (max-width: 1024px) {
+                grid-template-columns: repeat(2, 1fr);
+            }
+
+            @media (max-width: 600px) {
+                grid-template-columns: 1fr;
+            }
+
+            .search-result-item {
+                font-size: 14px;
+                font-family: "NeueMontreal";
+                font-weight: 400;
+                color: #fff;
+                cursor: pointer;
+                transition: all 0.25s ease;
+                padding: 8px 12px;
+                border-radius: 6px;
+                background: rgba(53, 136, 253, 0.05);
+                border: 1px solid rgba(53, 136, 253, 0.1);
+
+                &:hover {
+                    color: #3588fd;
+                    background: rgba(53, 136, 253, 0.15);
+                    border-color: rgba(53, 136, 253, 0.3);
+                    transform: translateX(3px);
+                }
+            }
+        }
+
+        // No Results
+        .footer-no-results {
+            text-align: center;
+            padding: 2rem;
+            color: #888;
+            font-family: "NeueMontreal";
+            font-size: 14px;
+            
+            p {
+                margin: 0;
+                color: #888 !important;
+                cursor: default !important;
+                
+                &:hover {
+                    color: #888 !important;
+                    transform: none !important;
+                }
+            }
+        }
+
+        // Navigation Controls (in top bar)
+        .footer-navigation {
+            display: flex;
+            align-items: center;
+            gap: 0.8rem;
+            margin-left: auto;
+            flex-shrink: 0;
+
+            @media (max-width: 900px) {
+                margin-left: 0;
+                justify-content: center;
+            }
+
+            .footer-nav-btn {
+                background: rgba(255, 255, 255, 0.1);
+                border: 1px solid rgba(255, 255, 255, 0.2);
+                color: #fff;
+                width: 36px;
+                height: 36px;
+                border-radius: 6px;
+                font-size: 20px;
+                cursor: pointer;
+                transition: all 0.3s ease;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-weight: 300;
+
+                &:hover:not(:disabled) {
+                    background: rgba(53, 136, 253, 0.2);
+                    border-color: #3588fd;
+                    transform: scale(1.05);
+                }
+
+                &:disabled {
+                    opacity: 0.3;
+                    cursor: not-allowed;
+                }
+            }
+
+            .footer-page-indicator {
+                font-size: 12px;
+                color: #888;
+                font-family: "NeueMontreal";
+                min-width: 60px;
+                text-align: center;
+            }
+        }
+
+        // Container for columns
+        .footer-columns-wrapper {
+            display: flex;
+            gap: 4rem;
+            // min-height: 300px;
+            
+            @media (max-width: 1024px) {
+                gap: 3rem;
+            }
+
+            @media (max-width: 768px) {
+                flex-direction: column;
+                gap: 2rem;
+            }
+        }
+
+        // Individual columns
+        .footer-column {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            gap: 0.2rem;
+            min-width: 0;
+
+            // Category headers (Food & Beverages, Wellness, etc.)
+            .footer-category {
+                font-size: 11px;
+                font-family: "NeueMontreal";
+                font-weight: 500;
+                color: #888;
+                text-transform: uppercase;
+                letter-spacing: 0.8px; 
+                
+                &:first-child {
+                    margin-top: 0;
+                }
+                
+                @media (max-width: 600px) {
+                    font-size: 10px;
+                }
+            }
+
+            // Product links
+            p {
+                font-size: 13px;
+                font-family: "NeueMontreal";
+                font-weight: 400;
+                color: #fff;
+                cursor: pointer;
+                transition: all 0.25s ease;
+                line-height: 1.9;
+                padding: 0px 0;
+                text-wrap: nowrap;
+
+                &:hover {
+                    color: #3588fd;
+                    transform: translateX(3px);
+                }
+
+                @media (max-width: 600px) {
+                    font-size: 13.5px;
+                    line-height: 1.8;
+                }
             }
         }
     }
 
     .footerContact {
+        display: flex;
+        flex-direction: column;
+        gap: 0.5rem;
+        min-width: 100px;
+
         div {
             font-size: 18px;
             font-family: "NeueMontreal";
-            font-weight: 400;
+            font-weight: 500;
+            color: #fff;
+            margin-bottom: 0.3rem;
         }
 
         a {
@@ -126,10 +388,12 @@
             cursor: pointer;
             color: #fff;
             text-decoration: none;
-            transition: all 0.3s ease;
+            transition: all 0.25s ease;
+            line-height: 1.8;
 
             &:hover {
-                color: #418df7;
+                color: #3588fd;
+                transform: translateX(3px);
             }
         }
     }
@@ -137,25 +401,31 @@
     .footePhone {
         display: flex;
         flex-direction: column;
-        align-items: flex-start;
+        gap: 0.5rem;
+        min-width: 100px;
 
         div {
             font-size: 18px;
             font-family: "NeueMontreal";
-            font-weight: 400;
+            font-weight: 500;
+            color: #fff;
+            margin-bottom: 0.3rem;
         }
 
         a {
-            font-size: 13px;
+            font-size: 14px;
             font-family: "NeueMontreal";
             font-weight: 400;
             cursor: pointer;
             color: #fff;
             text-decoration: none;
-            transition: all 0.3s ease;
+            transition: all 0.25s ease;
+            line-height: 1.8;
+            letter-spacing: 0.3px;
 
             &:hover {
-                color: #418df7;
+                color: #3588fd;
+                transform: translateX(3px);
             }
         }
     }
@@ -163,10 +433,9 @@
 
 .policyDiv {
     background-color: #010101;
-    padding: 0 1rem 2.5rem 1rem;
+    padding: 0 1rem 0.5rem 1rem;
     color: #fff;
-    display: flex;
-    align-items: flex-end;
+    display: flex; 
     justify-content: space-between;
 
     @media (max-width: 768px) {
diff --git a/src/PozoApp/Styles/Navbar.scss b/src/PozoApp/Styles/Navbar.scss
index ff45df2..d7bc248 100644
--- a/src/PozoApp/Styles/Navbar.scss
+++ b/src/PozoApp/Styles/Navbar.scss
@@ -135,6 +135,82 @@
     }
 }
 
+// Solutions Dropdown
+.solutions-dropdown {
+    position: fixed;
+    top: 4.5rem;
+    left: 12%;
+    background-color: #fff;
+    // padding: 1.5rem 2rem;
+    border-radius: 12px;
+    animation: fadeInIndustry 0.3s ease;
+    box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px;
+    z-index: 100;
+    min-width: 280px;
+    max-width: 320px;
+
+    .solutions-list {
+        display: flex;
+        flex-direction: column;
+        gap: 0;
+
+        .solution-item {
+            padding: 0.6rem 1rem;
+            cursor: pointer;
+            transition: color 0.2s ease;
+            color: #000;
+            font-size: 14px;
+            font-weight: 400;
+            letter-spacing: 0.3px;
+            border-bottom: 1px solid #f0f0f0;
+
+            &:last-child {
+                border-bottom: none;
+            }
+
+            &:hover {
+                color: #1473f8;
+            }
+
+            span {
+                display: block;
+            }
+        }
+    }
+}
+
+.solutions-dropdown-mobile {
+    padding: 0.5rem 0 0.5rem 1.5rem;
+    display: flex;
+    flex-direction: column;
+    gap: 0;
+    margin: 0.5rem 0;
+    background: rgba(255, 255, 255, 0.03);
+    border-radius: 6px;
+
+    .solution-item-mobile {
+        padding: 0.75rem 1rem;
+        cursor: pointer;
+        transition: color 0.2s;
+        color: #e5e5e5;
+        font-size: 13px;
+        letter-spacing: 0.3px;
+        border-bottom: 1px solid rgba(255, 255, 255, 0.05);
+
+        &:last-child {
+            border-bottom: none;
+        }
+
+        &:hover {
+            color: #1473f8;
+        }
+
+        &:active {
+            color: #1473f8;
+        }
+    }
+}
+
 .IndustriesTypes {
     display: flex;
     align-items: flex-start;
@@ -679,6 +755,67 @@
     }
 }
 
+// Mobile Sticky Footer for Book Demo & WhatsApp
+.mobile-sticky-footer {
+    display: none;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%);
+    backdrop-filter: blur(20px);
+    box-shadow: 0 -4px 20px rgba(0, 0, 0, 0.12);
+    padding: 1rem 1.25rem;
+    gap: 1rem;
+    z-index: 999;
+    border-top: 1px solid rgba(0, 0, 0, 0.08);
+
+    @media (max-width: 768px) {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .mobile-sticky-btn {
+        flex: 1;
+        padding: 1rem 1.75rem;
+        background: linear-gradient(135deg, #000 0%, #1a1a1a 100%);
+        color: #fff;
+        border-radius: 12px;
+        font-size: 15px;
+        font-weight: 500;
+        cursor: pointer;
+        transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-family: "NeueMontreal", sans-serif;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+        letter-spacing: 0.3px;
+
+        &:hover {
+            transform: translateY(-2px);
+            box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2);
+        }
+
+        &:active {
+            transform: scale(0.98);
+        }
+
+        &.whatsapp-btn {
+            background: linear-gradient(135deg, #25D366 0%, #1ea952 100%);
+            flex: 0;
+            min-width: 60px;
+            padding: 1rem;
+            box-shadow: 0 4px 12px rgba(37, 211, 102, 0.3);
+
+            &:hover {
+                box-shadow: 0 6px 16px rgba(37, 211, 102, 0.4);
+            }
+        }
+    }
+}
+
 @keyframes fadeInMenu {
     from {
         opacity: 0;
diff --git a/src/PozoApp/Styles/Offering.scss b/src/PozoApp/Styles/Offering.scss
index 5e84645..1bcd315 100644
--- a/src/PozoApp/Styles/Offering.scss
+++ b/src/PozoApp/Styles/Offering.scss
@@ -141,11 +141,12 @@
   @media (max-width: 768px) {
     .slide {
       width: 300px;
-      height: 60vh;
+        height: 50vh;
     }
 
     .slide-track {
-      width: calc(200% + 1rem);
+        width: calc(1000% + 1rem);
+        animation: scroll 12s linear infinite;
     }
   }
 }
diff --git a/src/PozoApp/Styles/OverView.scss b/src/PozoApp/Styles/OverView.scss
index eef03e2..cad3259 100644
--- a/src/PozoApp/Styles/OverView.scss
+++ b/src/PozoApp/Styles/OverView.scss
@@ -1,6 +1,7 @@
 .OverView-Master {
     width: 100vw;
-    height: 115vh;
+    min-height: 100vh;
+    height: auto;
     background: #000;
     display: flex;
     flex-direction: column;
@@ -42,8 +43,9 @@
 
     // Slogan - Hero Title
     .overviewSlogan {
-        font-size: 5vw;
+        font-size: 4.5vw;
         font-weight: 500;
+        width:80vw;
         line-height: 1.2;
         margin: 6.5rem 1.5rem 0 1.5rem;
         position: relative;
@@ -83,9 +85,10 @@
         display: flex;
         flex-direction: row;
         justify-content: space-between;
-        align-items: flex-end;
+        align-items: flex-start;
         margin: 0 1.5rem;
         margin-top: 5.5rem;
+        margin-bottom: 3rem;
         position: relative;
         z-index: 2;
         gap: 3rem;
@@ -125,11 +128,12 @@
         display: flex;
         flex-direction: column;
         gap: 1.2rem;
-        justify-content: flex-end;
+        justify-content: flex-start;
         flex: 1;
+        min-height: fit-content;
         @media (max-width: 600px) {
             gap: 1rem;
-             padding:16px 0;
+            padding: 16px 0;
         }
     }
 
@@ -267,7 +271,7 @@
         -webkit-backdrop-filter: blur(30px);
         border-radius: 20px;
         border: 1px solid rgba(255, 255, 255, 0.18);
-        padding: 2rem;
+        padding: 1.75rem;
         max-width: 500px;
         margin-right: 5rem;
         box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
@@ -318,10 +322,10 @@
         }
 
         p {
-            font-size: 24px;
+            font-size: 22px;
             font-family: "NeueMontreal";
-            line-height: 1.4;
-            margin: 0 0 1.5rem 0;
+            line-height: 1.35;
+            margin: 0 0 1.25rem 0;
             color: #fff;
             font-weight: 400;
 
diff --git a/src/PozoApp/Videos/OverView.webm b/src/PozoApp/Videos/OverView.webm
index bc7a782..12ba893 100644
Binary files a/src/PozoApp/Videos/OverView.webm and b/src/PozoApp/Videos/OverView.webm differ
diff --git a/src/PozoApp/Videos/OverView0.webm b/src/PozoApp/Videos/OverView0.webm
new file mode 100644
index 0000000..bc7a782
Binary files /dev/null and b/src/PozoApp/Videos/OverView0.webm differ
diff --git a/src/PozoApp/Videos/OverView1.webm b/src/PozoApp/Videos/OverView1.webm
new file mode 100644
index 0000000..2983be4
Binary files /dev/null and b/src/PozoApp/Videos/OverView1.webm differ
diff --git a/src/check.jsx b/src/check.jsx
index 5f927c5..716c6a7 100644
--- a/src/check.jsx
+++ b/src/check.jsx
@@ -1,599 +1,464 @@
-import { useEffect, useState, useRef } from 'react';
-import './MembershipCard.scss';
-import { useDispatch } from 'react-redux';
-import { useSelector } from 'react-redux';
-import { StoredSessionData } from '../../../../Features/ThemeChange/ThemeChange';
-import { getBranchDetail, getCompBranchData } from '../../../../Features/BrachLogin/BranchLogin';
-import { Button, Input, Modal, message } from 'antd';
-import { PrinterOutlined, ShareAltOutlined } from '@ant-design/icons';
-import html2canvas from 'html2canvas';
-import { FcSportsMode } from "react-icons/fc";
-import defaultuser from "../../../../Images/dashboard/user.jpg";
-import { printDiv } from '../../../../Services/Others';
+import { useState, useEffect, useRef, useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux'
+import { useLocation, useNavigate } from 'react-router-dom';
+import { Form, Tooltip, Switch } from "antd";
+import { ArrowRightOutlined, InfoCircleOutlined } from "@ant-design/icons";
+import { InputField } from "../../Components/Forms/InputField.jsx";
+import { TextAreaInput } from "../../Components/Forms/TextArea.jsx";
+import Buttons from "../../Components/Forms/Buttons.jsx";
+import { Messages } from "../../Components/Notifications/Messages";
+import Imageupload from "../../Components/Forms/Upload.jsx";
+import { DropDowns } from '../../Components/Forms/DropDown.jsx';
+import FormHeader from '../pageComponents/FormHeader.jsx';
+import { DefaultModal } from '../../Components/Modal/DefaultModal.jsx';
+import { changeBreadCrumb } from '../../features/appPage/centerPage.js';
+import { onlineimages, uploadImage } from '../../features/applications/bannerImage.js'
+import {
+    getCategoryData,
+    getSubCategoryData,
+    categoryActiveDataSelector,
+    subCategoryActiveDataSelector,
+    postApplicationData,
+    putApplicationData
+} from "../../features/applicationPage/applicationPage.js";
+import { getSession, validateSafeInput } from "../../Services/others";
+
+const subDirectory = import.meta.env.ENV_BASE_URL
+const homepageurl = import.meta.env.ENV_MAIN_REDIRECT_URL;
+
+const ApplicationForm = ({ formType }) => {
+
+    const navigate = useNavigate();
+    const dispatch = useDispatch();
+    const location = useLocation();
+    const formRef = useRef(null);
+    const state = location?.state
+    const editstate = state?.editstate
+    const categoryData = useSelector(categoryActiveDataSelector)
+    const subCategoryData = useSelector(subCategoryActiveDataSelector)
+    const [messageType, setMessageType] = useState(null);
+    const [messageData, setMessageData] = useState(null);
+    const [SelectedCategory, setSelectedCategory] = useState(null);
+    const [SelectedSubCategory, setSelectedSubCategory] = useState(null);
+    const [imageUrl, setImageUrl] = useState('');
+    const [onlineLogo, setOnlineLogo] = useState(false);
+    const [imagedata, setimagedata] = useState();
+    const [selectedImage, setSelectedImage] = useState();
+    const [onlinelogoImage, setOnlinelogoImage] = useState();
+
+
+    const items = [
+        {
+            name: "Home",
+            link: `${subDirectory}landing-page/home`,
+        },
+
+        {
+            name: "Application",
+            link: `${subDirectory}setting/application-master/`,
+        },
+        {
+            name: editstate ? "Edit" : "New",
+            link: null
+        },
+
+    ];
 
 
 
-function safeNumber(v) {
-  const n = Number(v);
-  return Number.isFinite(n) ? n : 0;
-}
-
-function getCurrentMembership(memberships) {
-  if (!memberships?.length) return null;
-
-  const sorted = [...memberships].sort(
-    (a, b) => new Date(a.CreatedDate) - new Date(b.CreatedDate)
-  );
-
-  const active = sorted.find(
-    (m) => m.RemainingDays > 0 || m.RemainingSessionHrs > 0
-  );
-  if (active) return active;
-
-  const now = new Date();
-  const next = sorted.find((m) => new Date(m.CreatedDate) > now);
-  return next || null;
-}
-
-function formatAadhaar(aadhaar) {
-  if (!aadhaar) return '';
-  const str = String(aadhaar);
-  if (str.length <= 4) return str;
-  const lastFour = str.slice(-4);
-  const masked = 'X'.repeat(str.length - 4);
-  return `${masked}${lastFour}`;
-}
-
-function formatDate(dateStr) {
-  if (!dateStr) return '';
-  const date = new Date(dateStr);
-  const day = String(date.getDate()).padStart(2, '0');
-  const month = date.toLocaleString('en-US', { month: 'short' });
-  const year = date.getFullYear();
-  return `${day} ${month} ${year}`;
-}
-
-const MembershipCard = ({ MembershipDetail = [], selectedCustomer = {}, showCard = false }) => {
-  const dispatch = useDispatch();
-  const SessionData = useSelector(StoredSessionData);
-  const AppId = SessionData?.AppId;
-  const CompId = SessionData?.CompId;
-  const BranchId = SessionData?.BranchId;
-  const UserId = SessionData?.UserId;
-  console.log(selectedCustomer, "selectedCustomer")
-  const [activeMembership, setActiveMembership] = useState(null);
-  const [branchName, setBranchName] = useState('Guest');
-  const [branchLogo, setBranchLogo] = useState(null);
-  const [emailModalVisible, setEmailModalVisible] = useState(false);
-  const [emailInput, setEmailInput] = useState('');
-  const [base64Image, setBase64Image] = useState(null);
-  const [base64CustImage, setBase64CustImage] = useState(null);
-
-  const cardRef = useRef(null);
-
-  const duration = safeNumber(activeMembership?.PlanDuration);
-  const remaining = safeNumber(activeMembership?.RemainingDays);
-  const usedDays = Math.max(0, duration - remaining);
-  const daysPct = duration > 0 ? Math.round((usedDays / duration) * 100) : 0;
-
-  const freeHrs = safeNumber(activeMembership?.FreeSessionHrs);
-  const remainingHrs = safeNumber(activeMembership?.RemainingSessionHrs);
-  const usedHrs = Math.max(0, freeHrs - remainingHrs);
-  const hrsPct = freeHrs > 0 ? Math.round((usedHrs / freeHrs) * 100) : 0;
-
-  const discountLabel = `${activeMembership?.Discount}${activeMembership?.DiscountType === 'P' ? '%' : ''}`;
-
-  useEffect(() => {
-    if (MembershipDetail?.length === 0) return;
-    const currentActiveMembership = getCurrentMembership(MembershipDetail);
-    if (currentActiveMembership) {
-      setActiveMembership(currentActiveMembership);
-    } else {
-      setActiveMembership(null);
-    }
-    fetchBranchDtls();
-  }, [MembershipDetail]);
-
-  const fetchBranchDtls = async () => {
-    const response = await dispatch(
-      getBranchDetail({ BrId: BranchId })
-    ).unwrap();
-    if (response?.data?.statusCode === 1) {
-      setBranchName(
-        response?.data?.data?.filter((item) => item?.BrId == BranchId)?.[0]?.BrName || 'Guest'
-      );
-      setBranchLogo(
-        response?.data?.data?.filter((item) => item?.BrId == BranchId)?.[0]?.CompLogo || 'Guest'
-      );
-    }
-  };
-
-  useEffect(() => {
-    async function fetchImage() {
-      try {
-        const base64 = await imageUrlToBase64(branchLogo);
-        setBase64Image(base64);
-      } catch (error) {
-        console.log('Error converting image', error.message);
-      }
-    }
-    if (branchLogo) {
-      fetchImage();
-    }
-  }, [branchLogo]);
-
-  useEffect(() => {
-    async function fetchCustomerImage() {
-      try {
-        const base64 = await imageUrlToBase64(selectedCustomer?.CustomerProfile);
-        setBase64CustImage(base64);
-      } catch (error) {
-        console.log('Error converting image', error.message);
-      }
-    }
-    if (selectedCustomer?.CustomerProfile) {
-      fetchCustomerImage();
-    }
-  }, [selectedCustomer?.CustomerProfile])
-
-  const imageUrlToBase64 = async (url) => {
-    try {
-      const response = await fetch(url);
-      const blob = await response.blob();
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onloadend = () => resolve(reader.result);
-        reader.onerror = reject;
-        reader.readAsDataURL(blob);
-      });
-    } catch (error) {
-      console.error('Error fetching or converting image:', error);
-      throw error;
-    }
-  };
-
-  const handlePrint = async () => {
-    if (!cardRef.current) return;
-    const style = `
-    <style>
-.membershipCardContainer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 20px;
-  padding: 20px;
-}
-
-.physicalMembershipCard {
-  font-family: 'Poppins' !important;
-  width: 340px;
-  height: 225px;
-  background-image: linear-gradient(to top, #1e3c72 0%, #1e3c72 1%, #2a5298 100%);
-  border-radius: 16px;
-  padding: 20px;
-  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.15);
-  color: white;
-  position: relative;
-  overflow: hidden;
-}
-
-.physicalMembershipCard::before {
-  content: '';
-  position: absolute;
-  top: -50%;
-  right: -20%;
-  width: 200px;
-  height: 200px;
-  background: radial-gradient(circle, rgba(255, 255, 255, 0.1) 0%, transparent 70%);
-  border-radius: 50%;
-}
-
-.cardHeader {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  margin-bottom: 16px;
-}
-
-.cardLogo {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.logoIcon {
-  background: white;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 22px;
-  padding: 5px;
-}
-
-.brandName {
-  font-size: 14px;
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 0.5px;
-}
-
-.priorityBadge {
-  background-color: #ff9800;
-  padding: 4px 12px;
-  border-radius: 12px;
-  font-size: 10px;
-  font-weight: 700;
-  letter-spacing: 0.5px;
-}
-
-.priorityBadge span {
-  color: #fff;
-}
-
-.cardMemberName {
-  font-size: 20px;
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 0.5px;
-  margin-bottom: 4px;
-}
-
-.cardMemberId {
-  font-size: 11px;
-  opacity: 0.9;
-  margin-bottom: 12px;
-}
-
-.cardDates {
-  display: flex;
-  gap: 24px;
-  margin-bottom: 12px;
-  font-size: 11px;
-}
-
-.dateGroup .dateLabel {
-  opacity: 0.8;
-  font-size: 9px;
-  margin-bottom: 2px;
-}
-
-.dateGroup .dateValue {
-  font-weight: 600;
-  font-size: 11px;
-}
-
-.cardInfo {
-  margin-bottom: 12px;
-}
-
-.infoRow {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 4px;
-  font-size: 11px;
-}
-
-.infoLabel {
-  opacity: 0.8;
-  font-size: 9px;
-}
-
-.infoValue {
-  font-weight: 600;
-}
-
-.membership-name {
-  position: absolute;
-  right: 20px;
-  top: 42px;
-  background-color: #019b01;
-  padding: 4px 12px;
-  border-radius: 12px;
-  font-size: 13px;
-  font-weight: 600;
-  letter-spacing: 0.3px;
-}
-
-.cardFooter {
-  position: absolute;
-  bottom: 22%;
-  right: 24px;
-}
-
-.user-profile img {
-  border-radius: 6px;
-}
-
-.cardActions {
-  display: flex;
-  gap: 12px;
-  justify-content: center;
-}
-
-.cardActions button {
-  min-width: 120px;
-}
-
-@media (max-width: 420px) {
-  .physicalMembershipCard {
-    width: 300px;
-    height: 190px;
-    padding: 16px;
-  }
-  
-  .logoIcon {
-    width: 28px;
-    height: 28px;
-    font-size: 16px;
-  }
-  
-  .brandName {
-    font-size: 12px;
-  }
-  
-  .cardMemberName {
-    font-size: 18px;
-  }
-  
-  .cardMemberId {
-    font-size: 10px;
-  }
-  
-  .cardDates {
-    gap: 16px;
-    font-size: 10px;
-  }
-  
-  .dateGroup .dateLabel {
-    font-size: 8px;
-  }
-  
-  .dateGroup .dateValue {
-    font-size: 10px;
-  }
-  
-  .infoRow {
-    font-size: 10px;
-  }
-  
-  .infoLabel {
-    font-size: 8px;
-  }
-  
-  .cardActions {
-    flex-direction: column;
-  }
-  
-  .cardActions button {
-    width: 100%;
-  }
-}
-    </style>
-`;
-    const printStyles = document.createElement('style');
-    printStyles.innerHTML = `
-        @page { size: A4; margin: 0.5in; }
-        @media print {
-            * { -webkit-print-color-adjust: exact !important; }
-            body * { visibility: hidden; }
-            #physicalMembershipCard, #physicalMembershipCard * { visibility: visible; }
-            #physicalMembershipCard {
-                position: absolute !important;
-                left: 0 !important;
-                top: 0 !important;
-                width: 340px !important;
-                height: 225px !important;
-                background: linear-gradient(to top, #1e3c72 0%, #2a5298 100%) !important;
-                border-radius: 16px !important;
-                padding: 20px !important;
-                color: white !important;
-                font-family: Arial, sans-serif !important;
-                box-shadow: none !important;
-            }
-            .cardHeader { display: flex !important; justify-content: space-between !important; }
-            .cardLogo { display: flex !important; align-items: center !important; gap: 8px !important; }
-            .logoIcon { background: white !important; border-radius: 50% !important; padding: 5px !important; }
-            .brandName { font-size: 14px !important; font-weight: 700 !important; }
-            .priorityBadge { background: #ff9800 !important; padding: 4px 12px !important; border-radius: 12px !important; }
-            .membership-name { position: absolute !important; right: 20px !important; top: 42px !important; background: #019b01 !important; padding: 4px 12px !important; border-radius: 12px !important; }
-            .cardMemberName { font-size: 20px !important; font-weight: 700 !important; }
-            .cardDates { display: flex !important; gap: 24px !important; }
-            .cardFooter { position: absolute !important; bottom: 22% !important; right: 24px !important; }
+    useEffect(() => {
+        dispatch(changeBreadCrumb({ items: items }));
+        dispatch(getCategoryData()).unwrap()
+        dispatch(getSubCategoryData()).unwrap()
+        OnlineImageCall();
+        if (editstate) {
+            setImageUrl(editstate?.AppLogo)
+            formRef.current?.setFieldsValue({ CateId: editstate.CateId, SubCateId: editstate.SubCateId })
+            setSelectedCategory(editstate.CateId)
+            setSelectedSubCategory(editstate.SubCateId)
         }
-    `;
-    
-    document.head.appendChild(printStyles);
-    window.print();
-    document.head.removeChild(printStyles);
-  };
 
-  const handleShare = () => {
-    if (selectedCustomer?.CustEmail) {
-      shareCard(selectedCustomer.CustEmail);
-    } else {
-      setEmailModalVisible(true);
+    }, []);
+    const OnlineImageCall = async () => {
+        let Appname = formRef?.current?.getFieldsValue().AppName;
+        if (Appname !== null && Appname !== undefined) {
+            let response = await dispatch(onlineimages(formRef?.current?.getFieldsValue().AppName)).unwrap();
+            setimagedata(response?.data?.data);
+        }
     }
-  };
 
-  const shareCard = async (email) => {
-    try {
-      // Your API call here
-      // await dispatch(shareCardAction({ email, cardData: ... })).unwrap();
-      message.success(`Card shared successfully to ${email}`);
-      setEmailModalVisible(false);
-      setEmailInput('');
-    } catch (error) {
-      message.error('Failed to share card');
+
+    const onFinish = async (values) => {
+        let postData = {};
+        postData["AppDescription"] = values.AppDescription;
+        postData["AppId"] = values.AppId;
+        postData["AppURLType"] = SelectedCategory == categoryData?.filter(item => item?.ConfigName == "Retail")[0]?.ConfigId ? 'I' : 'E';;
+        postData["AppLogo"] = imageUrl;
+        postData["AppName"] = values.AppName;
+        postData["AppURL"] = SelectedCategory == categoryData?.filter(item => item?.ConfigName == "Retail")[0]?.ConfigId ? URLToggle ? homepageurl : values.AppURL : values.AppURL;
+        postData["CateId"] = values.CateId;
+        postData["CreatedBy"] = getSession('UserId')
+        postData["SubCateId"] = values.SubCateId;
+        postData["UpdatedBy"] = values.UpdatedBy;
+        let response = {}
+        if (formType === "add") {
+            try {
+                response = await dispatch(postApplicationData(postData)).unwrap()
+            }
+            catch (err) {
+                console.log(err, "err");
+                if (err["message"] == "Request failed with status code 422") {
+                    response = {
+                        data: {
+                            "statusCode": 0,
+                            "response": "Please Give Required Fields",
+                            'data': []
+                        }
+                    }
+                }
+            }
+
+        }
+        else if (formType === "edit") {
+
+            postData["AppId"] = editstate?.AppId
+            postData["UpdatedBy"] = getSession('UserId')
+            try {
+                response = await dispatch(putApplicationData(postData)).unwrap()
+            } catch (err) {
+                console.log(err, "err");
+                if (err["message"] == "Request failed with status code 422") {
+                    response = {
+                        data: {
+                            "statusCode": 0,
+                            "response": "Please Give Required Fields",
+                            'data': []
+                        }
+                    }
+                }
+            }
+        }
+        if (response?.data?.statusCode == 1) {
+            navigate(`${subDirectory}setting/application-master/`, {
+                state: {
+                    Notiffy: {
+                        messageType: "success",
+                        messageData: response?.data?.response,
+
+                    }
+                }
+            })
+        } else {
+            setMessageType("error")
+            setMessageData(response?.data?.response)
+        }
+    };
+
+
+    const onComplete = useCallback(() => {
+        setMessageData(null);
+        setMessageType(null);
+
+
+    }, [])
+
+    const selectCategory = async (e) => {
+        formRef.current?.setFieldsValue({ CateId: e })
+        await setSelectedCategory(e)
+
     }
-  };
-
-  const handleEmailSubmit = () => {
-    if (!emailInput || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(emailInput)) {
-      message.error('Please enter a valid email address');
-      return;
+    const selectSubCategory = async (e) => {
+        formRef.current?.setFieldsValue({ SubCateId: e })
+        await setSelectedSubCategory(e)
     }
-    shareCard(emailInput);
-  };
 
-  if (!showCard) {
-    // Original membership details view
+
+
+    const addLogo = () => {
+        let Appname = formRef?.current?.getFieldsValue().AppName
+        if (Appname !== null && Appname !== undefined) {
+            OnlineImageCall()
+            setOnlineLogo(true)
+        }
+        else {
+            setMessageType("error")
+            setMessageData("Eneter Application Name")
+        }
+    }
+
+
+    const Logosubmit = async () => {
+        let response = await fetch(selectedImage.image);
+
+        let data = await response.blob();
+        let metadata = {
+            type: "image/jpeg",
+        };
+
+        let file = new File([data], "image.jpg", metadata);
+        let uploadImgData = await dispatch(uploadImage(file)).unwrap()
+        if (uploadImgData?.data?.status) {
+            setOnlinelogoImage(uploadImgData?.data?.image)
+            setImageUrl(uploadImgData?.data?.image)
+        }
+        setOnlineLogo(false);
+    }
+
+    const [URLToggle, setURLTogglel] = useState(false);
+    const onChange = (checked) => {
+        console.log(`switch to ${checked}`);
+        setURLTogglel(checked);
+    };
+
+    formType == "edit" && editstate?.AppUrlType !== 'I' ? formRef?.current?.setFieldsValue({ AppURL: editstate?.AppUrl }) : '';
     return (
-      <div className="memberShipCard" role="region" aria-label={`${activeMembership?.MemberName} membership card`}>
-        <div className="memberShipHeader">
-          <div className="memberShipTitle">{activeMembership?.MemberName || '-'}</div>
-          <div className="memberShipRemark">{activeMembership?.Remarks || ''}</div>
-        </div>
+        <div className='pageOverAll'>
+            <div className='userPage'>
+                <div className='userPageContent'>
+                    <Messages messageType={messageType} messageData={messageData} onComplete={onComplete} />
+                    <div className="formName">
+                        <FormHeader title={'Application'} />
+                    </div>
+                    <div className='formDiv'>
+                        <Form ref={formRef} className="formDivAnt" onFinish={onFinish} initialValues={editstate}>
+                            <div className='formDivS'>
+                                <div className='inputForm'>
+                                    <Form.Item
+                                        name="AppName"
 
-        <div className="memberShipBody">
-          <div className="memberShipInfoRow">
-            <div className="memberShipLabel">Duration</div>
-            <div className="memberShipValue">{duration} days</div>
-          </div>
+                                        rules={[
+                                            {
+                                                required: true,
+                                                pattern: /^(?!\s*$).+/,
+                                                message: "Please Enter Application Name",
+                                            },
+                                            {
+                                                validator: async (_, value) => {
+                                                    await validateSafeInput(value);
 
-          <div className="memberShipProgressGroup">
-            <div className="memberShipSmallLabel">Remaining</div>
-            <div className="memberShipProgressBar">
-              <div className="memberShipProgress" style={{ width: `${Math.max(0, 100 - daysPct)}%` }} />
+                                                    if (value && !/^.{1,50}$/.test(value)) {
+                                                        return Promise.reject("Application Name must be 1 to 50 characters.");
+                                                    }
+
+                                                    return Promise.resolve();
+                                                },
+                                            },
+                                        ]}
+
+                                    >
+                                        <InputField
+                                            field="AppName"
+                                            autoComplete="off"
+                                            label={<label className="required">Application Name </label>}
+                                            fieldState={true}
+                                            fieldApi={true}
+                                            isOnChange={formType == "edit" ? true : false}
+                                        />
+                                    </Form.Item>
+                                    <Form.Item
+                                        name="CateId"
+                                        rules={[
+                                            {
+                                                required: true,
+                                                message: "Please Select Module",
+                                            },
+                                        ]}
+                                    >
+                                        <DropDowns
+                                            options={categoryData?.map((option) => ({
+                                                value: option.ConfigId,
+                                                label: option.ConfigName,
+                                            }))}
+                                            label={<label className="required">Module</label>}
+                                            onChangeFunction={selectCategory}
+                                            optionsNames={{ value: "ConfigId", label: "ConfigName" }}
+                                            className='field-DropDown'
+                                            isOnchanges={(formType == "edit" || SelectedCategory) ? true : false}
+                                            valueData={SelectedCategory}
+                                            disabled={formType == "edit" ? true : false}
+                                        />
+                                    </Form.Item>
+                                    <Form.Item
+                                        name="SubCateId"
+                                        rules={[
+                                            {
+                                                required: true,
+                                                message: "Please Select Sub Module ",
+                                            },
+                                        ]}
+                                    >
+                                        <DropDowns
+                                            options={subCategoryData?.map((option) => ({
+                                                value: option.ConfigId,
+                                                label: option.ConfigName,
+                                            }))}
+                                            label={<label className="required">Sub Module</label>}
+                                            onChangeFunction={selectSubCategory}
+                                            optionsNames={{ value: "ConfigId", label: "ConfigName" }}
+                                            className='field-DropDown'
+                                            isOnchanges={(formType == "edit" || SelectedSubCategory) ? true : false}
+                                            valueData={SelectedSubCategory}
+                                            disabled={formType == "edit" ? true : false}
+
+                                        />
+                                    </Form.Item>
+                                    <Form.Item
+                                        name="AppDescription"
+
+                                        rules={[
+                                            {
+                                                pattern: /^(?!\s*$).+/,
+                                                message: "Please Enter Application Description",
+                                            },
+                                            {
+                                                validator: async (_, value) => {
+                                                    await validateSafeInput(value);
+                                                    return Promise.resolve();
+                                                },
+                                            },
+                                        ]}>
+                                        <TextAreaInput
+                                            field="AppDescription"
+                                            autoComplete="off"
+                                            label="Description"
+                                            fieldState={true}
+                                            fieldApi={true}
+                                            isOnChange={formType == "edit" ? true : false}
+                                        />
+
+                                    </Form.Item>
+
+
+                                    <div className="upload_btn">
+                                        <p>Upload Logo</p>
+                                        <Imageupload
+                                            singleImage={true}
+                                            updateImageUrl={setImageUrl}
+                                            ImageLink={onlinelogoImage ? onlinelogoImage : editstate?.AppLogo ? editstate?.AppLogo : ""}
+                                        />
+                                        <button type="button"
+                                            style={{
+                                                width: '6.5rem',
+                                                backgroundColor: '#dbd1d1',
+                                                color: '#000000',
+                                                border: '0.5px solid gray',
+                                                borderRadius: '3px',
+                                                padding: '3px'
+                                            }}
+                                            onClick={addLogo}
+                                        >Browse Image</button>
+                                    </div>
+
+
+                                    {
+                                        SelectedCategory == null ? '' :
+                                            SelectedCategory == categoryData?.filter(item => item?.ConfigName == "Retail")?.[0]?.ConfigId ?
+                                                <>
+                                                    <div>Retail URL : <Switch onChange={onChange} /> </div>
+                                                    {URLToggle ?
+                                                        <div style={{ display: 'flex', gap: '0.5rem' }}>
+                                                            <p>URL:</p>
+                                                            <p style={{ color: '#1292EE' }}>https://pozo.app{homepageurl}</p>
+                                                        </div> :
+                                                        <Form.Item
+                                                            name="AppURL"
+                                                            rules={[
+
+                                                                {
+                                                                    validator: async (_, value) => {
+                                                                        await validateSafeInput(value); // To block HTML tags & SQL keywords
+                                                                        return Promise.resolve();
+                                                                    },
+                                                                },
+                                                            ]}
+                                                        >
+                                                            <InputField
+                                                                field="BrMobile"
+                                                                label="App URL"
+                                                                fieldState={true}
+                                                                fieldApi={true}
+                                                                autoComplete={"nope"}
+                                                                isOnChange={formType == "edit" && editstate?.AppUrl?.length > 0 ? true : false}
+                                                                suffix={<Tooltip title={`/apps/yourApplication`}>
+                                                                    <InfoCircleOutlined
+                                                                        style={{
+                                                                            color: 'rgba(0,0,0,.45)',
+                                                                        }}
+                                                                    />
+                                                                </Tooltip>}
+                                                            />
+                                                        </Form.Item>}
+                                                </>
+                                                :
+                                                <Form.Item
+                                                    name="AppURL"
+                                                    rules={[
+
+                                                        {
+                                                            validator: async (_, value) => {
+                                                                await validateSafeInput(value); // To block HTML tags & SQL keywords
+                                                                return Promise.resolve();
+                                                            },
+                                                        },
+                                                    ]}
+                                                    className='appUrlInput'
+                                                >
+                                                    <InputField
+                                                        field="BrMobile"
+                                                        label="App URL"
+                                                        fieldState={true}
+                                                        fieldApi={true}
+                                                        autoComplete={"nope"}
+                                                        isOnChange={formType == "edit" && editstate?.AppUrl?.length > 0 ? true : false}
+                                                        suffix={<Tooltip title={`/apps/yourApplication`}>
+                                                            <InfoCircleOutlined
+                                                                style={{
+                                                                    color: 'rgba(0,0,0,.45)',
+                                                                }}
+                                                            />
+                                                        </Tooltip>}
+                                                    />
+                                                </Form.Item>}
+                                </div>
+                            </div>
+                            <div className='submitButton'>
+                                <Buttons
+                                    buttonText="SUBMIT"
+                                    color="901D77"
+                                    icon={<ArrowRightOutlined />}
+                                />
+                            </div>
+                        </Form>
+                    </div>
+                </div>
             </div>
-            <div className="memberShipSmallValue">{remaining}d left</div>
-          </div>
-
-          <div className="memberShipInfoRow">
-            <div className="memberShipLabel">Free Hrs</div>
-            <div className="memberShipValue">{freeHrs} hrs</div>
-          </div>
-
-          <div className="memberShipProgressGroup">
-            <div className="memberShipSmallLabel">Sessions left</div>
-            <div className="memberShipProgressBar">
-              <div className="memberShipProgress" style={{ width: `${Math.max(0, 100 - hrsPct)}%` }} />
-            </div>
-            <div className="memberShipSmallValue">{remainingHrs}h</div>
-          </div>
-
-          <div className="memberShipGridRow">
-            <div>
-              <div className="memberShipGridLabel">Discount</div>
-              <div className="memberShipGridValue">{discountLabel}</div>
-            </div>
-            <div>
-              <div className="memberShipGridLabel">Priority</div>
-              <div className="memberShipGridValue">{activeMembership?.Priority === 'Y' ? 'Yes' : 'No'}</div>
-            </div>
-          </div>
-        </div>
-
-        {activeMembership?.Priority === 'Y' && (
-          <div className="memberShipFooter">
-            <div className="memberShipPriorityDays" title={activeMembership?.Prioritydays}>
-              {activeMembership?.Prioritydays || '-'}
-            </div>
-          </div>
-        )}
-      </div>
-    );
-  }
-
-  // Card view
-  return (
-    <div className="membershipCardContainer">
-      <div ref={cardRef} id='physicalMembershipCard' className="physicalMembershipCard">
-        <div className="cardHeader">
-          <div className="cardLogo">
-            <div className="logoIcon">
-              {base64Image ? <img src={base64Image} alt="Branch Logo" height={"30"} width={"30"} /> : <FcSportsMode size={25} />}
-            </div>
-            <span className="brandName">{branchName}</span>
-          </div>
-          {activeMembership?.Priority === 'Y' && (
-            <div className="priorityBadge">
-              <span>PRIORITY</span>
-            </div>
-          )}
-          <div className='membership-name'>
-            {activeMembership?.MemberName}
-          </div>
-        </div>
-
-        <div className="cardMemberName">{selectedCustomer?.CustName || 'Member'}</div>
-        <div className="cardMemberId">ID: {selectedCustomer?.CustId || '-'}</div>
-
-        <div className="cardDates">
-          <div className="dateGroup">
-            <div className="dateLabel">VALID FROM</div>
-            <div className="dateValue">{formatDate(activeMembership?.PlanStartDate)}</div>
-          </div>
-          <div className="dateGroup">
-            <div className="dateLabel">VALID UNTIL</div>
-            <div className="dateValue">{formatDate(activeMembership?.PlanEndDate)}</div>
-          </div>
-        </div>
-
-        <div className="cardInfo">
-          <div className="infoRow">
-            <span className="infoLabel">MOBILE</span>
-            <span className="infoValue">{selectedCustomer?.value || '-'}</span>
-          </div>
-          {selectedCustomer?.AadhaarNo && <div className="infoRow">
-            <span className="infoLabel">AADHAAR</span>
-            <span className="infoValue">{formatAadhaar(selectedCustomer?.AadhaarNo)}</span>
-          </div>}
-        </div>
-
-        <div className="cardFooter">
-          {/* <div className="qrPlaceholder">
-                        <div className="qrGrid">
-                            {[...Array(16)].map((_, i) => (
-                                <div key={i} className="qrCell" />
+            <DefaultModal
+                title="ONLINE LOGO IMAGE UPLOADER"
+                width={800}
+                open={onlineLogo}
+                footer={true}
+                buttonText="Submit"
+                children={
+                    <Form className="">
+                        <div className="productonlineImg">
+                            {imagedata?.map((item, index) => (
+                                <div
+                                    className={`singleimg ${selectedImage === item ? "selected" : ""
+                                        }`}
+                                    key={index}
+                                    onClick={() => setSelectedImage(item)}
+                                >
+                                    <img src={item.image} alt="no image" width={120} height={100} />
+                                </div>
                             ))}
                         </div>
-                    </div> */}
-          <div className='user-profile'>
-            {base64CustImage ? <img src={base64CustImage} alt="Customer Profile" height={"50"} width={"50"} /> :
-              <img src={defaultuser} alt="Customer Profile" height={"50"} width={"50"} />
-            }
-          </div>
+                    </Form>
+                }
+                handleSubmit={Logosubmit}
+                handleCancel={() => { setOnlineLogo(false) }}
+            ></DefaultModal>
         </div>
-      </div>
+    );
+}
 
-      <div className="cardActions">
-        <Button
-          icon={<PrinterOutlined />}
-          onClick={handlePrint}
-          type="default"
-        >
-          Print
-        </Button>
-        <Button
-          icon={<ShareAltOutlined />}
-          onClick={handleShare}
-          type="primary"
-        >
-          Share
-        </Button>
-      </div>
-
-      <Modal
-        title="Enter Email Address"
-        open={emailModalVisible}
-        onOk={handleEmailSubmit}
-        onCancel={() => {
-          setEmailModalVisible(false);
-          setEmailInput('');
-        }}
-        okText="Share"
-      >
-        <Input
-          placeholder="Enter email address"
-          value={emailInput}
-          onChange={(e) => setEmailInput(e.target.value)}
-          onPressEnter={handleEmailSubmit}
-        />
-      </Modal>
-    </div>
-  );
-};
-
-export default MembershipCard;
\ No newline at end of file
+export default ApplicationForm;
\ No newline at end of file
diff --git a/src/check.scss b/src/check.scss
index 3f7440e..0e34724 100644
--- a/src/check.scss
+++ b/src/check.scss
@@ -15,6 +15,7 @@
         align-items: center;
         gap: 16px;
         position: relative;
+
         @media (max-width: 768px) {
             display: none;
         }
@@ -28,6 +29,7 @@
             gap: 3px;
             cursor: pointer;
         }
+
         svg {
             margin-top: 4px;
             display: flex;
@@ -108,6 +110,7 @@
                 transform: translate(0, 0);
             }
         }
+
         sup {
             font-size: 10px;
             background-color: #e68200;
@@ -124,6 +127,7 @@
         cursor: pointer;
         letter-spacing: 0.2px;
         -webkit-text-stroke: 0.2px;
+
         @media (max-width: 768px) {
             z-index: 50;
             position: relative;
@@ -136,7 +140,7 @@
     align-items: flex-start;
     justify-content: space-between;
     width: 80%;
-    margin-bottom: 4rem;
+    margin-bottom: 0;
     gap: 1rem;
     position: fixed;
     top: 4rem;
@@ -146,8 +150,12 @@
     border-radius: 12px;
     animation: fadeInIndustry 0.5s ease;
     height: 85vh;
+    max-height: calc(100vh - 5rem);
     box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px;
     z-index: 100;
+    overflow: hidden;
+    isolation: isolate;
+    touch-action: none;
 
     &.closing {
         animation: fadeOutIndustry 0.4s ease;
@@ -158,17 +166,41 @@
         display: none;
     }
 }
+
 .IndustriesOne,
 .IndustriesTwo,
 .IndustriesThree {
     width: 30%;
     font-family: "NeueMontreal";
     height: 100%;
+    max-height: calc(85vh - 4rem);
     border-right: 2px dashed #9e9e9e;
-    height: 80vh;
-    overflow: auto;
+    overflow-y: auto;
+    overflow-x: hidden;
     scrollbar-width: thin;
-    padding-bottom: 4rem;
+    padding-bottom: 2rem;
+    padding-right: 1rem;
+    overscroll-behavior: contain;
+    touch-action: pan-y;
+
+    // Custom scrollbar styling
+    &::-webkit-scrollbar {
+        width: 6px;
+    }
+
+    &::-webkit-scrollbar-track {
+        background: #f1f1f1;
+        border-radius: 10px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        background: #888;
+        border-radius: 10px;
+
+        &:hover {
+            background: #555;
+        }
+    }
 
     @media (max-width: 768px) {
         width: 100%;
@@ -203,6 +235,7 @@
         &:hover {
             color: #3588fd;
         }
+
         span {
             color: #ffffff;
             background-color: rgba(255, 115, 0, 0.966);
@@ -223,6 +256,7 @@
     z-index: 100;
     position: relative;
     display: none;
+
     @media (max-width: 768px) {
         display: flex;
     }
@@ -247,10 +281,12 @@
         &.closing {
             animation: fadeOutMenu 0.4s ease;
         }
+
         @media (max-width: 1300px) {
             top: 8%;
         }
     }
+
     .ResNavHeader {
         width: 100%;
         display: flex;
@@ -258,12 +294,14 @@
         align-items: center;
         justify-content: space-between;
     }
+
     .ResNavHeaderClose {
         display: flex;
         align-items: center;
         font-family: "NeueMontreal";
         gap: 4px;
         cursor: pointer;
+
         div {
             display: flex;
             align-items: center;
@@ -271,6 +309,7 @@
             font-size: 14px;
         }
     }
+
     .ResnavbarOption {
         width: 100%;
         font-family: "NeueMontreal";
@@ -279,6 +318,7 @@
         display: flex;
         flex-direction: column;
         gap: 1rem;
+
         .indusOpen {
             font-size: 16px;
             display: flex;
@@ -289,7 +329,38 @@
             border-bottom: 2px dashed #868686;
             padding-bottom: 10px;
         }
+
+        @media (max-width: 768px) {
+            .IndustriesTypes {
+                position: relative;
+                top: unset;
+                left: unset;
+                width: 100%;
+                background-color: #383838;
+                color: #fff;
+                overflow: auto;
+                isolation: unset;
+                touch-action: unset;
+                height: 70vh;
+                box-shadow: unset !important;
+            }
+
+            .IndustriesOne,
+            .IndustriesTwo,
+            .IndustriesThree {
+                border-right: none;
+                height: max-content;
+                max-height: 40vh;
+                margin-bottom: 2rem;
+
+                >div,
+                >p {
+                    color: #fff;
+                }
+            }
+        }
     }
+
     .industryRes {
         background-color: #383838;
         color: #fff;
@@ -312,12 +383,14 @@
             font-size: 16px;
             margin: 10px 0;
         }
+
         p {
             font-family: "NeueMontreal";
             font-size: 14px;
             margin-bottom: 4px;
             color: #cecece;
             cursor: pointer;
+
             &:hover {
                 color: #3588fd;
             }
@@ -331,6 +404,7 @@
             margin-bottom: 4px;
             cursor: pointer;
             transition: all 0.2s;
+
             &:hover {
                 color: #3588fd;
             }
@@ -345,6 +419,7 @@
         font-family: "NeueMontreal";
         margin-top: 3rem;
         width: 100%;
+
         sup {
             font-size: 10px;
             background-color: #e68200;
@@ -421,12 +496,14 @@
         }
     }
 }
+
 @keyframes fadeInMenu {
     from {
         opacity: 0;
         // transform: translateY(-50px);
         height: 0vh;
     }
+
     to {
         opacity: 1;
         // transform: translateY(0);
@@ -440,18 +517,21 @@
         // transform: translateY(0);
         height: 100vh;
     }
+
     to {
         opacity: 0;
         // transform: translateY(-50px);
         height: 0vh;
     }
 }
+
 @keyframes fadeInIndustry {
     from {
         opacity: 0;
         transform: translateY(-10px);
         height: 0vh;
     }
+
     to {
         opacity: 1;
         transform: translateY(0);
@@ -465,18 +545,21 @@
         height: 80vh;
         transform: translateY(0);
     }
+
     to {
         opacity: 0;
         height: 0vh;
         transform: translateY(-10px);
     }
 }
+
 @keyframes fadeInCompany {
     from {
         opacity: 0;
         transform: translateY(-10px);
         height: 0px;
     }
+
     to {
         opacity: 1;
         transform: translateY(0);
@@ -490,6 +573,7 @@
         height: 250px;
         transform: translateY(0);
     }
+
     to {
         opacity: 0;
         height: 0px;
@@ -502,6 +586,7 @@
         opacity: 0;
         transform: translateY(-10px);
     }
+
     to {
         opacity: 1;
         transform: translateY(0);
@@ -513,6 +598,7 @@
         opacity: 1;
         transform: translateY(0);
     }
+
     to {
         opacity: 0;
         transform: translateY(-10px);
@@ -524,6 +610,7 @@
         opacity: 0;
         transform: translateY(-10px);
     }
+
     to {
         opacity: 1;
         transform: translateY(0);
@@ -535,6 +622,7 @@
         opacity: 1;
         transform: translateY(0);
     }
+
     to {
         opacity: 0;
         transform: translateY(-10px);
@@ -546,6 +634,7 @@
         opacity: 0;
         transform: translateX(100%);
     }
+
     to {
         opacity: 1;
         transform: translateX(0);
@@ -557,6 +646,7 @@
         opacity: 1;
         transform: translateX(0);
     }
+
     to {
         opacity: 0;
         transform: translateX(100%);
@@ -588,6 +678,7 @@
         cursor: pointer;
         letter-spacing: 0.2px;
         transition: all 0.3s ease;
+
         &:hover {
             color: #3588fd;
         }
@@ -598,4 +689,4 @@
     .IndustriesTypes {
         display: block;
     }
-}
+}
\ No newline at end of file
diff --git a/src/routesConfig.jsx b/src/routesConfig.jsx
index ae08810..eca5b19 100644
--- a/src/routesConfig.jsx
+++ b/src/routesConfig.jsx
@@ -93,11 +93,14 @@ import SignIn from "./PozoApp/Components/SignIn.jsx";
 import LiveSession from "./PozoApp/Components/LiveSession.jsx";
 import ContactUs from "./PozoApp/Components/ContactUs.jsx";
 import PricingPozoApp from "./PozoApp/Components/PricingPozoApp.jsx";
+import Solutions from "./PozoApp/Pages/Solutions.jsx";
+import CaseStudies from "./PozoApp/Pages/CaseStudies.jsx";
 import GatewayMasterConfiguration from "./Pages/GatewayMasterConfiguration/GatewayMasterConfiguration.jsx";
 import GatewayMasterConfigurationList from "./Pages/GatewayMasterConfiguration/GatewayMasterConfigurationList.jsx";
 import AdminPanelWrapper from "./AdminPanel/AdminPanelWrapper.jsx";
 import Blog from "./AdminPanel/Blog/Blog.jsx";
 import BlogDetail from "./AdminPanel/Blog/BlogDetail.jsx";
+import LandingPageCMS from "./LandingPageCMS/LandingPageCMS.jsx";
 import PostEditorPage from "./Pages/PostEditorPage.jsx";
 import PrivacyPolicy from "./PozoApp/Company/PrivacyPolicy.jsx";
 import CookiePolicy from "./PozoApp/Company/CookiePolicy.jsx";
@@ -117,6 +120,12 @@ export const routesConfig = [
     access: "Marketing",
     empAccess: "Admin Panel",
   },
+  {
+    path: `${subDirectory}landing-cms`,
+    component: LandingPageCMS,
+    access: "Marketing",
+    empAccess: "Admin Panel",
+  },
   { path: `${subDirectory}:appName`, component: Template, access: "Public" },
   { path: `${subDirectory}feature1`, component: Feature1 },
   { path: `${subDirectory}pdf`, component: PdfPage, access: "Admin" },
@@ -168,7 +177,7 @@ export const routesConfig = [
   { path: `${subDirectory}homepage`, component: PublicHome, access: "Public" },
   // { path: `${subDirectory}signinnew`, component: SignIn, access: "Public" },
   {
-    path: `${subDirectory}pricing-pozoapp`,
+    path: `${subDirectory}pricing`,
     component: PricingPozoApp,
     access: "Public",
   },
@@ -178,6 +187,8 @@ export const routesConfig = [
     access: "Public",
   },
   { path: `${subDirectory}contact-us`, component: ContactUs, access: "Public" },
+  { path: `${subDirectory}solutions`, component: Solutions, access: "Public" },
+  { path: `${subDirectory}case-studies`, component: CaseStudies, access: "Public" },
   { path: `${subDirectory}blog`, component: Blog, access: "Public" },
   // {
   //   path: `${subDirectory}blog/blog-details/:id`,
diff --git a/vite.config.js b/vite.config.js
index 291da17..4561d6d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -65,13 +65,14 @@ export default defineConfig(({ command, mode, ssrBuild }) => {
         //   },
         // }),
       ],
-      base: "/home/",
+      base: "/",  // Changed from "/home/" to "/" for clean SEO URLs
       envDir: "src",
       envPrefix: "ENV_",
     };
   } else {
     return {
       plugins: [react()],
+      base: "/",  // Changed from default to "/" for consistency
       envDir: "src",
       envPrefix: "ENV_",