diff --git a/src/App.tsx b/src/App.tsx
index c30644e..17216cd 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -32,7 +32,7 @@ import { AuthCallback } from '@/pages/Auth/AuthCallback';
 import { createClaimRequest } from '@/services/dealerClaimApi';
 import { ManagerSelectionModal } from '@/components/modals/ManagerSelectionModal';
 import { navigateToRequest } from '@/utils/requestNavigation';
-// import { TokenManager } from '@/utils/tokenManager';
+import { TokenManager } from '@/utils/tokenManager';
 
 interface AppProps {
   onLogout?: () => void;
@@ -61,8 +61,8 @@ function DashboardRoute({ onNavigate, onNewRequest }: { onNavigate?: (page: stri
 
   useEffect(() => {
     try {
-      // const userData = TokenManager.getUserData();
-      // // setIsDealer(userData?.jobTitle === 'Dealer');
+      const userData = TokenManager.getUserData();
+      setIsDealer(userData?.jobTitle === 'Dealer');
     } catch (error) {
       console.error('[App] Error checking dealer status:', error);
       setIsDealer(false);
diff --git a/src/components/layout/PageLayout/PageLayout.tsx b/src/components/layout/PageLayout/PageLayout.tsx
index 68a0114..bfe0083 100644
--- a/src/components/layout/PageLayout/PageLayout.tsx
+++ b/src/components/layout/PageLayout/PageLayout.tsx
@@ -72,15 +72,14 @@ 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 },
-      { id: 'my-requests', label: 'My Requests', icon: User, adminOnly: false },
+      { id: 'requests', label: 'All Requests', icon: List, adminOnly: false }
       // { 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 },
@@ -276,18 +275,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/modals/TemplateSelectionModal.tsx b/src/components/modals/TemplateSelectionModal.tsx
index 8ffc419..27e6d4a 100644
--- a/src/components/modals/TemplateSelectionModal.tsx
+++ b/src/components/modals/TemplateSelectionModal.tsx
@@ -4,9 +4,9 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../ui
 import { Button } from '../ui/button';
 import { Badge } from '../ui/badge';
 import { Separator } from '../ui/separator';
-import { 
-  Receipt, 
-  Package, 
+import {
+  Receipt,
+  Package,
   ArrowRight,
   ArrowLeft,
   Clock,
@@ -96,7 +96,7 @@ export function TemplateSelectionModal({ open, onClose, onSelectTemplate }: Temp
 
   return (
     <Dialog open={open} onOpenChange={onClose}>
-      <DialogContent 
+      <DialogContent
         className="!fixed !inset-0 !top-0 !left-0 !right-0 !bottom-0 !w-screen !h-screen !max-w-none !translate-x-0 !translate-y-0 p-0 gap-0 border-0 !rounded-none bg-gradient-to-br from-gray-50 to-white [&>button]:hidden !m-0"
       >
         {/* Accessibility - Hidden Title and Description */}
@@ -118,7 +118,7 @@ export function TemplateSelectionModal({ open, onClose, onSelectTemplate }: Temp
         <div className="h-full overflow-y-auto">
           <div className="min-h-full flex flex-col items-center justify-center px-6 py-12">
             {/* Header Section */}
-            <motion.div 
+            <motion.div
               initial={{ opacity: 0, y: -20 }}
               animate={{ opacity: 1, y: 0 }}
               className="text-center mb-12 max-w-3xl"
@@ -150,14 +150,13 @@ export function TemplateSelectionModal({ open, onClose, onSelectTemplate }: Temp
                     whileHover={isDisabled ? {} : { scale: 1.03 }}
                     whileTap={isDisabled ? {} : { scale: 0.98 }}
                   >
-                    <Card 
-                      className={`h-full transition-all duration-300 border-2 ${
-                        isDisabled 
-                          ? 'opacity-50 cursor-not-allowed border-gray-200' 
-                          : isSelected 
-                            ? 'cursor-pointer border-blue-500 shadow-xl bg-blue-50/50 ring-2 ring-blue-200' 
-                            : 'cursor-pointer border-gray-200 hover:border-blue-300 hover:shadow-lg'
-                      }`}
+                    <Card
+                      className={`h-full transition-all duration-300 border-2 ${isDisabled
+                        ? 'opacity-50 cursor-not-allowed border-gray-200'
+                        : isSelected
+                          ? 'cursor-pointer border-blue-500 shadow-xl bg-blue-50/50 ring-2 ring-blue-200'
+                          : 'cursor-pointer border-gray-200 hover:border-blue-300 hover:shadow-lg'
+                        }`}
                       onClick={() => handleSelect(template.id)}
                     >
                       <CardHeader className="space-y-4 pb-4">
@@ -206,9 +205,9 @@ export function TemplateSelectionModal({ open, onClose, onSelectTemplate }: Temp
                             {template.category}
                           </Badge>
                         </div>
-                        
+
                         <Separator />
-                        
+
                         <div className="grid grid-cols-2 gap-3 text-xs text-gray-500">
                           <div className="flex items-center gap-1.5">
                             <Clock className="w-3.5 h-3.5" />
@@ -244,29 +243,28 @@ export function TemplateSelectionModal({ open, onClose, onSelectTemplate }: Temp
             </div>
 
             {/* Action Buttons */}
-            <motion.div 
+            <motion.div
               initial={{ opacity: 0, y: 20 }}
               animate={{ opacity: 1, y: 0 }}
               transition={{ delay: 0.3 }}
               className="flex flex-col sm:flex-row justify-center gap-4 mt-4"
             >
-              <Button 
-                variant="outline" 
+              <Button
+                variant="outline"
                 onClick={onClose}
                 size="lg"
                 className="px-8"
               >
                 Cancel
               </Button>
-              <Button 
+              <Button
                 onClick={handleContinue}
                 disabled={!selectedTemplate || isDealer || AVAILABLE_TEMPLATES.find(t => t.id === selectedTemplate)?.disabled}
                 size="lg"
-                className={`gap-2 px-8 ${
-                  selectedTemplate && !isDealer && !AVAILABLE_TEMPLATES.find(t => t.id === selectedTemplate)?.disabled
-                    ? 'bg-blue-600 hover:bg-blue-700' 
-                    : 'bg-gray-400 cursor-not-allowed'
-                }`}
+                className={`gap-2 px-8 ${selectedTemplate && !isDealer && !AVAILABLE_TEMPLATES.find(t => t.id === selectedTemplate)?.disabled
+                  ? 'bg-blue-600 hover:bg-blue-700'
+                  : 'bg-gray-400 cursor-not-allowed'
+                  }`}
               >
                 Continue with Template
                 <ArrowRight className="w-4 h-4" />
diff --git a/src/components/workflow/CreateRequest/TemplateSelectionStep.tsx b/src/components/workflow/CreateRequest/TemplateSelectionStep.tsx
index 4ab49c6..f70387b 100644
--- a/src/components/workflow/CreateRequest/TemplateSelectionStep.tsx
+++ b/src/components/workflow/CreateRequest/TemplateSelectionStep.tsx
@@ -108,7 +108,7 @@ export function TemplateSelectionStep({
           </div>
         ) : (
           displayTemplates.map((template) => {
-            const isComingSoon = template.id === 'existing-template' && viewMode === 'main'; // Only show coming soon for placeholder
+            const isComingSoon = false;
             const isDisabled = isComingSoon;
             const isCategoryCard = template.id === 'admin-templates-category';
             // const isCustomCard = template.id === 'custom';
diff --git a/src/custom/components/ClosedRequestsFilters.tsx b/src/custom/components/ClosedRequestsFilters.tsx
index 010e065..fda46c9 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,
   sortBy,
   sortOrder,
   activeFiltersCount,
   onSearchChange,
   onPriorityChange,
   onStatusChange,
-  // onTemplateTypeChange,
+  onTemplateTypeChange,
   onSortByChange,
   onSortOrderChange,
   onClearFilters,
@@ -130,7 +130,7 @@ export function StandardClosedRequestsFilters({
               </SelectItem>
             </SelectContent>
           </Select>
-          {/* 
+
           <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" />
@@ -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 406a682..aa543e3 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,
   sortBy,
   sortOrder,
   onSearchChange,
   onStatusFilterChange,
   onPriorityFilterChange,
-  // 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 43b22b0..cf31ec6 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,
   departmentFilter,
   slaComplianceFilter,
   initiatorFilter: _initiatorFilter,
@@ -104,7 +104,7 @@ export function StandardUserAllRequestsFilters({
   onSearchChange,
   onStatusChange,
   onPriorityChange,
-  // 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 4d99b84..e6b8d87 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 } from 'lucide-react';
+import { LogIn, Shield } 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] = useState(false);
+  const [tanflowLoading, setTanflowLoading] = useState(false);
   const [imageLoaded, setImageLoaded] = useState(false);
 
   // Preload the background image
@@ -41,7 +41,7 @@ export function Auth() {
     }
   };
 
-  /* const handleTanflowLogin = () => {
+  const handleTanflowLogin = () => {
     // Clear any existing session data
     localStorage.clear();
     sessionStorage.clear();
@@ -55,7 +55,7 @@ export function Auth() {
       console.error('Error details:', loginError);
       setTanflowLoading(false);
     }
-  }; */
+  };
 
   if (error) {
     console.error('Auth Error in Auth Component:', {
@@ -123,7 +123,7 @@ export function Auth() {
                 </>
               )}
             </Button>
-            {/* 
+
             <div className="relative">
               <div className="absolute inset-0 flex items-center">
                 <span className="w-full border-t border-gray-700"></span>
@@ -141,8 +141,8 @@ export function Auth() {
             >
               {tanflowLoading ? (
                 <>
-                  <div 
-                    className="mr-2 h-4 w-4 animate-spin rounded-full border-2 border-white border-t-transparent" 
+                  <div
+                    className="mr-2 h-4 w-4 animate-spin rounded-full border-2 border-white border-t-transparent"
                   />
                   Redirecting...
                 </>
@@ -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/ClosedRequests/components/ClosedRequestsFilters.tsx b/src/pages/ClosedRequests/components/ClosedRequestsFilters.tsx
index 5e23bed..e432731 100644
--- a/src/pages/ClosedRequests/components/ClosedRequestsFilters.tsx
+++ b/src/pages/ClosedRequests/components/ClosedRequestsFilters.tsx
@@ -29,14 +29,14 @@ export function ClosedRequestsFilters({
   searchTerm,
   priorityFilter,
   statusFilter,
-  // templateTypeFilter,
+  templateTypeFilter,
   sortBy,
   sortOrder,
   activeFiltersCount,
   onSearchChange,
   onPriorityChange,
   onStatusChange,
-  // onTemplateTypeChange,
+  onTemplateTypeChange,
   onSortByChange,
   onSortOrderChange,
   onClearFilters,
@@ -129,7 +129,7 @@ export function ClosedRequestsFilters({
             </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>
@@ -138,7 +138,7 @@ export function ClosedRequestsFilters({
               <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/pages/MyRequests/components/MyRequestsFilters.tsx b/src/pages/MyRequests/components/MyRequestsFilters.tsx
index c1a0cc4..64d4a5d 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,
   onSearchChange,
   onStatusChange,
   onPriorityChange,
-  // 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 05014ca..54d2510 100644
--- a/src/pages/Requests/Requests.tsx
+++ b/src/pages/Requests/Requests.tsx
@@ -590,7 +590,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>
@@ -599,7 +599,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 3c1586f..3f921ff 100644
--- a/src/pages/Settings/Settings.tsx
+++ b/src/pages/Settings/Settings.tsx
@@ -197,14 +197,14 @@ export function Settings() {
                 <span className="hidden sm:inline">Holidays</span>
                 <span className="sm:hidden">Holidays</span>
               </TabsTrigger>
-              {/* <TabsTrigger 
-                value="templates" 
+              <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 */}