diff --git a/src/App.tsx b/src/App.tsx
index a9a2fef..1922221 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -10,7 +10,7 @@ import { SharedSummaryDetail } from '@/pages/SharedSummaries/SharedSummaryDetail
 import { WorkNotes } from '@/pages/WorkNotes';
 import { CreateRequest } from '@/pages/CreateRequest';
 import { ClaimManagementWizard } from '@/dealer-claim/components/request-creation/ClaimManagementWizard';
-import { DealerDashboard } from '@/dealer-claim/pages/Dashboard';
+// import { DealerDashboard } from '@/dealer-claim/pages/Dashboard';
 import { MyRequests } from '@/pages/MyRequests';
 import { Requests } from '@/pages/Requests/Requests';
 import { UserAllRequests } from '@/pages/Requests/UserAllRequests';
@@ -84,7 +84,8 @@ function DashboardRoute({ onNavigate, onNewRequest }: { onNavigate?: (page: stri
 
   // Render dealer-specific dashboard if user is a dealer
   if (isDealer) {
-    return <DealerDashboard onNavigate={onNavigate} onNewRequest={onNewRequest} />;
+    console.log("isDealer", isDealer)
+    // return <DealerDashboard onNavigate={onNavigate} onNewRequest={onNewRequest} />;
   }
 
   // Render regular dashboard for all other users
diff --git a/src/components/layout/PageLayout/PageLayout.tsx b/src/components/layout/PageLayout/PageLayout.tsx
index bfe0083..689dc03 100644
--- a/src/components/layout/PageLayout/PageLayout.tsx
+++ b/src/components/layout/PageLayout/PageLayout.tsx
@@ -72,14 +72,15 @@ export function PageLayout({ children, currentPage = 'dashboard', onNavigate, on
     const items = [
       { id: 'dashboard', label: 'Dashboard', icon: Home },
       // Add "All Requests" for all users (admin sees org-level, regular users see their participant requests)
-      { id: 'requests', label: 'All Requests', icon: List, adminOnly: false }
+      { id: 'requests', label: 'All Requests', icon: List, adminOnly: false },
+      { id: 'my-requests', label: 'My Requests', icon: User }
       // { id: 'admin/templates', label: 'Admin Templates', icon: Plus, adminOnly: true },
     ];
 
     // Add remaining menu items (exclude "My Requests" for dealers)
-    if (!isDealer) {
-      items.push({ id: 'my-requests', label: 'My Requests', icon: User });
-    }
+    // if (!isDealer) {
+    //   items.push({ id: 'my-requests', label: 'My Requests', icon: User });
+    // }
 
     items.push(
       { id: 'open-requests', label: 'Open Requests', icon: FileText },
@@ -275,18 +276,18 @@ export function PageLayout({ children, currentPage = 'dashboard', onNavigate, on
             </div>
 
             {/* Quick Action in Sidebar - Right below menu items */}
-            {!isDealer && (
-              <div className="mt-6 pt-6 border-t border-gray-800 px-3">
-                <Button
-                  onClick={onNewRequest}
-                  className="w-full bg-re-green hover:bg-re-green/90 text-white text-sm font-medium"
-                  size="sm"
-                >
-                  <Plus className="w-4 h-4 mr-2" />
-                  Raise New Request
-                </Button>
-              </div>
-            )}
+            {/* {!isDealer && ( */}
+            <div className="mt-6 pt-6 border-t border-gray-800 px-3">
+              <Button
+                onClick={onNewRequest}
+                className="w-full bg-re-green hover:bg-re-green/90 text-white text-sm font-medium"
+                size="sm"
+              >
+                <Plus className="w-4 h-4 mr-2" />
+                Raise New Request
+              </Button>
+            </div>
+            {/* )} */}
           </div>
         </div>
       </aside>
diff --git a/src/components/workflow/CreateRequest/TemplateSelectionStep.tsx b/src/components/workflow/CreateRequest/TemplateSelectionStep.tsx
index f70387b..f5d3ee1 100644
--- a/src/components/workflow/CreateRequest/TemplateSelectionStep.tsx
+++ b/src/components/workflow/CreateRequest/TemplateSelectionStep.tsx
@@ -107,8 +107,8 @@ export function TemplateSelectionStep({
             <p>No admin templates available yet.</p>
           </div>
         ) : (
-          displayTemplates.map((template) => {
-            const isComingSoon = false;
+          displayTemplates.map((template, index) => {
+            const isComingSoon = index === 1;
             const isDisabled = isComingSoon;
             const isCategoryCard = template.id === 'admin-templates-category';
             // const isCustomCard = template.id === 'custom';
@@ -124,7 +124,7 @@ export function TemplateSelectionStep({
               >
                 <Card
                   className={`h-full transition-all duration-300 border-2 ${isDisabled
-                    ? 'border-gray-200 bg-gray-50/50 opacity-85 cursor-not-allowed'
+                    ? 'border-gray-200 bg-gray-50/50 opacity-50 cursor-not-allowed'
                     : isSelected
                       ? 'border-blue-500 shadow-xl bg-blue-50/50 ring-2 ring-blue-200 cursor-pointer'
                       : isCategoryCard
diff --git a/src/custom/components/ClosedRequestsFilters.tsx b/src/custom/components/ClosedRequestsFilters.tsx
index fda46c9..0b01498 100644
--- a/src/custom/components/ClosedRequestsFilters.tsx
+++ b/src/custom/components/ClosedRequestsFilters.tsx
@@ -31,14 +31,14 @@ export function StandardClosedRequestsFilters({
   searchTerm,
   priorityFilter,
   statusFilter,
-  templateTypeFilter,
+  templateTypeFilter: _templateTypeFilter,
   sortBy,
   sortOrder,
   activeFiltersCount,
   onSearchChange,
   onPriorityChange,
   onStatusChange,
-  onTemplateTypeChange,
+  onTemplateTypeChange: _onTemplateTypeChange,
   onSortByChange,
   onSortOrderChange,
   onClearFilters,
@@ -131,7 +131,7 @@ export function StandardClosedRequestsFilters({
             </SelectContent>
           </Select>
 
-          <Select value={templateTypeFilter} onValueChange={onTemplateTypeChange}>
+          {/* <Select value={_templateTypeFilter} onValueChange={_onTemplateTypeChange}>
             <SelectTrigger className="h-9 sm:h-10 md:h-11 text-sm sm:text-base bg-gray-50 border-gray-200 focus:bg-white" data-testid="closed-requests-template-type-filter">
               <SelectValue placeholder="All Templates" />
             </SelectTrigger>
@@ -140,7 +140,7 @@ export function StandardClosedRequestsFilters({
               <SelectItem value="CUSTOM">Non-Templatized</SelectItem>
               <SelectItem value="DEALER CLAIM">Dealer Claim</SelectItem>
             </SelectContent>
-          </Select>
+          </Select> */}
 
           <div className="flex gap-2">
             <Select value={sortBy} onValueChange={(value) => onSortByChange(value as 'created' | 'due' | 'priority')}>
diff --git a/src/custom/components/RequestsFilters.tsx b/src/custom/components/RequestsFilters.tsx
index aa543e3..8199891 100644
--- a/src/custom/components/RequestsFilters.tsx
+++ b/src/custom/components/RequestsFilters.tsx
@@ -31,13 +31,13 @@ export function StandardRequestsFilters({
   searchTerm,
   statusFilter,
   priorityFilter,
-  templateTypeFilter,
+  templateTypeFilter: _templateTypeFilter,
   sortBy,
   sortOrder,
   onSearchChange,
   onStatusFilterChange,
   onPriorityFilterChange,
-  onTemplateTypeFilterChange,
+  onTemplateTypeFilterChange: _onTemplateTypeFilterChange,
   onSortByChange,
   onSortOrderChange,
   onClearFilters,
@@ -120,7 +120,7 @@ export function StandardRequestsFilters({
             </SelectContent>
           </Select>
 
-          <Select value={templateTypeFilter} onValueChange={onTemplateTypeFilterChange}>
+          {/* <Select value={templateTypeFilter} onValueChange={onTemplateTypeFilterChange}>
             <SelectTrigger className="h-9 sm:h-10 md:h-11 text-sm sm:text-base bg-gray-50 border-gray-200 focus:bg-white focus:border-blue-400 focus:ring-1 focus:ring-blue-200">
               <SelectValue placeholder="All Templates" />
             </SelectTrigger>
@@ -129,7 +129,7 @@ export function StandardRequestsFilters({
               <SelectItem value="CUSTOM">Non-Templatized</SelectItem>
               <SelectItem value="DEALER CLAIM">Dealer Claim</SelectItem>
             </SelectContent>
-          </Select>
+          </Select> */}
 
           <div className="flex gap-2">
             <Select value={sortBy} onValueChange={(value: any) => onSortByChange(value)}>
diff --git a/src/custom/components/UserAllRequestsFilters.tsx b/src/custom/components/UserAllRequestsFilters.tsx
index cf31ec6..52fbc0d 100644
--- a/src/custom/components/UserAllRequestsFilters.tsx
+++ b/src/custom/components/UserAllRequestsFilters.tsx
@@ -87,7 +87,7 @@ export function StandardUserAllRequestsFilters({
   searchTerm,
   statusFilter,
   priorityFilter,
-  templateTypeFilter,
+  templateTypeFilter: _templateTypeFilter,
   departmentFilter,
   slaComplianceFilter,
   initiatorFilter: _initiatorFilter,
@@ -104,7 +104,7 @@ export function StandardUserAllRequestsFilters({
   onSearchChange,
   onStatusChange,
   onPriorityChange,
-  onTemplateTypeChange,
+  onTemplateTypeChange: _onTemplateTypeChange,
   onDepartmentChange,
   onSlaComplianceChange,
   onInitiatorChange: _onInitiatorChange,
@@ -180,7 +180,7 @@ export function StandardUserAllRequestsFilters({
               </SelectContent>
             </Select>
 
-            <Select value={templateTypeFilter} onValueChange={onTemplateTypeChange}>
+            {/* <Select value={_templateTypeFilter} onValueChange={_onTemplateTypeChange}>
               <SelectTrigger className="h-10" data-testid="template-type-filter">
                 <SelectValue placeholder="All Templates" />
               </SelectTrigger>
@@ -189,7 +189,7 @@ export function StandardUserAllRequestsFilters({
                 <SelectItem value="CUSTOM">Custom</SelectItem>
                 <SelectItem value="DEALER CLAIM">Dealer Claim</SelectItem>
               </SelectContent>
-            </Select>
+            </Select> */}
 
             <Select
               value={departmentFilter}
diff --git a/src/pages/Auth/Auth.tsx b/src/pages/Auth/Auth.tsx
index e6b8d87..24bc6a0 100644
--- a/src/pages/Auth/Auth.tsx
+++ b/src/pages/Auth/Auth.tsx
@@ -2,13 +2,13 @@ import { useState, useEffect } from 'react';
 import { useAuth } from '@/contexts/AuthContext';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardHeader } from '@/components/ui/card';
-import { LogIn, Shield } from 'lucide-react';
+import { LogIn } from 'lucide-react';
 import { ReLogo, LandingPageImage } from '@/assets';
-import { initiateTanflowLogin } from '@/services/tanflowAuth';
+// import { initiateTanflowLogin } from '@/services/tanflowAuth';
 
 export function Auth() {
   const { login, isLoading, error } = useAuth();
-  const [tanflowLoading, setTanflowLoading] = useState(false);
+  const [tanflowLoading] = useState(false);
   const [imageLoaded, setImageLoaded] = useState(false);
 
   // Preload the background image
@@ -41,21 +41,21 @@ export function Auth() {
     }
   };
 
-  const handleTanflowLogin = () => {
-    // Clear any existing session data
-    localStorage.clear();
-    sessionStorage.clear();
+  // const handleTanflowLogin = () => {
+  //   // Clear any existing session data
+  //   localStorage.clear();
+  //   sessionStorage.clear();
 
-    setTanflowLoading(true);
-    try {
-      initiateTanflowLogin();
-    } catch (loginError) {
-      console.error('========================================');
-      console.error('TANFLOW LOGIN ERROR');
-      console.error('Error details:', loginError);
-      setTanflowLoading(false);
-    }
-  };
+  //   setTanflowLoading(true);
+  //   try {
+  //     initiateTanflowLogin();
+  //   } catch (loginError) {
+  //     console.error('========================================');
+  //     console.error('TANFLOW LOGIN ERROR');
+  //     console.error('Error details:', loginError);
+  //     setTanflowLoading(false);
+  //   }
+  // };
 
   if (error) {
     console.error('Auth Error in Auth Component:', {
@@ -124,7 +124,7 @@ export function Auth() {
               )}
             </Button>
 
-            <div className="relative">
+            {/* <div className="relative">
               <div className="absolute inset-0 flex items-center">
                 <span className="w-full border-t border-gray-700"></span>
               </div>
@@ -152,7 +152,7 @@ export function Auth() {
                   Dealer Login
                 </>
               )}
-            </Button>
+            </Button> */}
           </div>
 
           <div className="text-center text-sm text-gray-400 mt-4">
diff --git a/src/pages/MyRequests/components/MyRequestsFilters.tsx b/src/pages/MyRequests/components/MyRequestsFilters.tsx
index 64d4a5d..8b1de00 100644
--- a/src/pages/MyRequests/components/MyRequestsFilters.tsx
+++ b/src/pages/MyRequests/components/MyRequestsFilters.tsx
@@ -22,11 +22,11 @@ export function MyRequestsFilters({
   searchTerm,
   statusFilter,
   priorityFilter,
-  templateTypeFilter,
+  templateTypeFilter: _templateTypeFilter,
   onSearchChange,
   onStatusChange,
   onPriorityChange,
-  onTemplateTypeChange,
+  onTemplateTypeChange: _onTemplateTypeChange,
 }: MyRequestsFiltersProps) {
   return (
     <Card className="border-gray-200" data-testid="my-requests-filters">
@@ -76,7 +76,7 @@ export function MyRequestsFilters({
               </SelectContent>
             </Select>
 
-            <Select value={templateTypeFilter} onValueChange={onTemplateTypeChange}>
+            {/* <Select value={_templateTypeFilter} onValueChange={_onTemplateTypeChange}>
               <SelectTrigger
                 className="flex-1 md:w-28 lg:w-32 text-xs sm:text-sm bg-white border-gray-300 hover:border-gray-400 focus:border-blue-400 focus:ring-1 focus:ring-blue-200 h-9 sm:h-10"
                 data-testid="template-type-filter"
@@ -88,7 +88,7 @@ export function MyRequestsFilters({
                 <SelectItem value="CUSTOM">Non-Templatized</SelectItem>
                 <SelectItem value="DEALER CLAIM">Dealer Claim</SelectItem>
               </SelectContent>
-            </Select>
+            </Select> */}
           </div>
         </div>
       </CardContent>
diff --git a/src/pages/Requests/Requests.tsx b/src/pages/Requests/Requests.tsx
index d068817..cb7546d 100644
--- a/src/pages/Requests/Requests.tsx
+++ b/src/pages/Requests/Requests.tsx
@@ -574,7 +574,7 @@ export function Requests({ onViewRequest }: RequestsProps) {
                 </SelectContent>
               </Select>
 
-              <Select value={filters.templateTypeFilter} onValueChange={filters.setTemplateTypeFilter}>
+              {/* <Select value={filters.templateTypeFilter} onValueChange={filters.setTemplateTypeFilter}>
                 <SelectTrigger className="h-10" data-testid="template-type-filter">
                   <SelectValue placeholder="All Templates" />
                 </SelectTrigger>
@@ -583,7 +583,7 @@ export function Requests({ onViewRequest }: RequestsProps) {
                   <SelectItem value="CUSTOM">Non-Templatized</SelectItem>
                   <SelectItem value="DEALER CLAIM">Dealer Claim</SelectItem>
                 </SelectContent>
-              </Select>
+              </Select> */}
 
               <Select
                 value={filters.departmentFilter}
diff --git a/src/pages/Settings/Settings.tsx b/src/pages/Settings/Settings.tsx
index 5508fda..20c3d11 100644
--- a/src/pages/Settings/Settings.tsx
+++ b/src/pages/Settings/Settings.tsx
@@ -200,14 +200,14 @@ export function Settings() {
                 <span className="hidden sm:inline">Holidays</span>
                 <span className="sm:hidden">Holidays</span>
               </TabsTrigger>
-              <TabsTrigger
+              {/* <TabsTrigger
                 value="templates"
                 className="flex items-center justify-center gap-2 py-3 rounded-lg data-[state=active]:bg-white data-[state=active]:shadow-md transition-all"
               >
                 <FileText className="w-4 h-4" />
                 <span className="hidden sm:inline">Templates</span>
                 <span className="sm:hidden">Templates</span>
-              </TabsTrigger>
+              </TabsTrigger> */}
             </TabsList>
 
             {/* Fixed width container to prevent layout shifts */}