diff --git a/app/habits/page.tsx b/app/habits/page.tsx
index db6bb0e..4ce0f9d 100644
--- a/app/habits/page.tsx
+++ b/app/habits/page.tsx
@@ -3,7 +3,7 @@ import HabitList from '@/components/HabitList'
 export default function HabitsPage() {
   return (
     <div className="flex flex-col">
-      <HabitList />
+      <HabitList isTasksView={false} />
     </div>
   )
 }
diff --git a/app/tasks/page.tsx b/app/tasks/page.tsx
new file mode 100644
index 0000000..1b53c84
--- /dev/null
+++ b/app/tasks/page.tsx
@@ -0,0 +1,10 @@
+import HabitList from '@/components/HabitList'
+
+export default function TasksPage() {
+  return (
+    <div className="flex flex-col">
+      <HabitList isTasksView={true} />
+    </div>
+  )
+}
+
diff --git a/components/DailyOverview.tsx b/components/DailyOverview.tsx
index 69091f6..de2f133 100644
--- a/components/DailyOverview.tsx
+++ b/components/DailyOverview.tsx
@@ -220,12 +220,6 @@ const ItemSection = ({
                           <Link
                             href={`/habits?highlight=${habit.id}`}
                             className="flex items-center gap-1 hover:text-primary transition-colors"
-                            onClick={() => {
-                              const newViewType = isTask ? 'tasks' : 'habits';
-                              if (browserSettings.viewType !== newViewType) {
-                                setBrowserSettings(prev => ({ ...prev, viewType: newViewType }));
-                              }
-                            }}
                           >
                             {isTask && isTaskOverdue(habit, settings.system.timezone) && !isCompleted && (
                               <TooltipProvider>
@@ -314,12 +308,6 @@ const ItemSection = ({
         <Link
           href={viewLink}
           className="text-sm text-muted-foreground hover:text-primary flex items-center gap-1"
-          onClick={() => {
-            const newViewType = isTask ? 'tasks' : 'habits';
-            if (browserSettings.viewType !== newViewType) {
-              setBrowserSettings(prev => ({ ...prev, viewType: newViewType }));
-            }
-          }}
         >
           View
           <ArrowRight className="h-3 w-3" />
diff --git a/components/HabitItem.tsx b/components/HabitItem.tsx
index 21febf0..f99cbd6 100644
--- a/components/HabitItem.tsx
+++ b/components/HabitItem.tsx
@@ -6,7 +6,7 @@ import {
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
 import { useHabits } from '@/hooks/useHabits'
-import { browserSettingsAtom, settingsAtom, usersAtom } from '@/lib/atoms'
+import { settingsAtom, usersAtom } from '@/lib/atoms'
 import { useHelpers } from '@/lib/client-helpers'
 import { Habit, User } from '@/lib/types'
 import { convertMachineReadableFrequencyToHumanReadable, getCompletionsForToday, isTaskOverdue } from '@/lib/utils'
@@ -15,6 +15,7 @@ import { Check, Coins, Edit, MoreVertical, Pin, Undo2 } from 'lucide-react'; //
 import { useEffect, useState } from 'react'
 import { HabitContextMenuItems } from './HabitContextMenuItems'
 import { Avatar, AvatarFallback, AvatarImage } from './ui/avatar'
+import { usePathname } from 'next/navigation'
 
 interface HabitItemProps {
   habit: Habit
@@ -53,9 +54,7 @@ export default function HabitItem({ habit, onEdit, onDelete }: HabitItemProps) {
   const { currentUser, hasPermission } = useHelpers()
   const canWrite = hasPermission('habit', 'write')
   const canInteract = hasPermission('habit', 'interact')
-  const [browserSettings] = useAtom(browserSettingsAtom)
-  const isTasksView = browserSettings.viewType === 'tasks'
-  const isRecurRule = !isTasksView
+  const pathname = usePathname();
 
   useEffect(() => {
     const params = new URLSearchParams(window.location.search)
@@ -83,7 +82,7 @@ export default function HabitItem({ habit, onEdit, onDelete }: HabitItemProps) {
     >
       <CardHeader className="flex-none">
         <div className="flex justify-between items-start">
-          <CardTitle className={`line-clamp-1 ${habit.archived ? 'text-gray-400 dark:text-gray-500' : ''} flex items-center ${isTasksView ? 'w-full' : ''} justify-between`}>
+          <CardTitle className={`line-clamp-1 ${habit.archived ? 'text-gray-400 dark:text-gray-500' : ''} flex items-center ${pathname.includes("tasks") ? 'w-full' : ''} justify-between`}>
             <div className="flex items-center gap-1">
               {habit.pinned && (
                 <Pin className="h-4 w-4 text-yellow-500" />
@@ -108,7 +107,7 @@ export default function HabitItem({ habit, onEdit, onDelete }: HabitItemProps) {
         <p className={`text-sm ${habit.archived ? 'text-gray-400 dark:text-gray-500' : 'text-gray-500'}`}>
           When: {convertMachineReadableFrequencyToHumanReadable({
             frequency: habit.frequency,
-            isRecurRule,
+            isRecurRule: pathname.includes("habits"),
             timezone: settings.system.timezone
           })}
         </p>
diff --git a/components/HabitList.tsx b/components/HabitList.tsx
index e1cfd70..ac9877a 100644
--- a/components/HabitList.tsx
+++ b/components/HabitList.tsx
@@ -5,7 +5,7 @@ import { Input } from '@/components/ui/input'; // Added
 import { Label } from '@/components/ui/label'; // Added
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; // Added
 import { useHabits } from '@/hooks/useHabits'
-import { browserSettingsAtom, habitsAtom } from '@/lib/atoms'
+import { habitsAtom } from '@/lib/atoms'
 import { HabitIcon, TaskIcon } from '@/lib/constants'
 import { Habit } from '@/lib/types'
 import { getHabitFreq } from '@/lib/utils'; // Added
@@ -19,12 +19,9 @@ import EmptyState from './EmptyState'
 import HabitItem from './HabitItem'
 import { ViewToggle } from './ViewToggle'
 
-export default function HabitList() {
+export default function HabitList({ isTasksView }: { isTasksView: boolean}) {
   const { saveHabit, deleteHabit } = useHabits()
   const [habitsData] = useAtom(habitsAtom) // setHabitsData removed as it's not used
-  const [browserSettings] = useAtom(browserSettingsAtom)
-  const isTasksView = browserSettings.viewType === 'tasks'
-  // const [settings] = useAtom(settingsAtom); // settingsAtom is not directly used in HabitList itself.
 
   type SortableField = 'name' | 'coinReward' | 'dueDate' | 'frequency';
   type SortOrder = 'asc' | 'desc';
@@ -131,9 +128,6 @@ export default function HabitList() {
           </Button>
         </span>
       </div>
-      <div className='py-4'>
-        <ViewToggle />
-      </div>
 
       {/* Search and Sort Controls */}
       <div className="flex flex-col sm:flex-row items-center gap-4 my-4">
diff --git a/components/Navigation.tsx b/components/Navigation.tsx
index a745a38..7ba7a91 100644
--- a/components/Navigation.tsx
+++ b/components/Navigation.tsx
@@ -1,9 +1,7 @@
 'use client'
 
-import { browserSettingsAtom } from '@/lib/atoms'
 import { useHelpers } from '@/lib/client-helpers'
 import { HabitIcon, TaskIcon } from '@/lib/constants'
-import { useAtom } from 'jotai'
 import { Calendar, Coins, Gift, Home } from 'lucide-react'
 import Link from 'next/link'
 import { useEffect, useState } from 'react'
@@ -12,32 +10,24 @@ import { usePathname } from 'next/navigation'
 
 type ViewPort = 'main' | 'mobile'
 
-const navItems = (isTasksView: boolean) => [
+const navItems = () => [
   { icon: Home, label: 'Dashboard', href: '/', position: 'main' },
-  {
-    icon: isTasksView ? TaskIcon : HabitIcon,
-    label: isTasksView ? 'Tasks' : 'Habits',
-    href: '/habits',
-    position: 'main'
-  },
+  { icon: HabitIcon, label: 'Habits', href: '/habits', position: 'main' },
+  { icon: TaskIcon, label: 'Tasks', href: '/tasks', position: 'main' },
   { icon: Calendar, label: 'Calendar', href: '/calendar', position: 'main' },
   { icon: Gift, label: 'Wishlist', href: '/wishlist', position: 'main' },
   { icon: Coins, label: 'Coins', href: '/coins', position: 'main' },
 ]
 
 interface NavigationProps {
-  className?: string
   viewPort: ViewPort
 }
 
-export default function Navigation({ className, viewPort }: NavigationProps) {
+export default function Navigation({ viewPort }: NavigationProps) {
   const [showAbout, setShowAbout] = useState(false)
   const [isMobileView, setIsMobileView] = useState(false)
-  const [browserSettings] = useAtom(browserSettingsAtom)
-  const isTasksView = browserSettings.viewType === 'tasks'
   const { isIOS } = useHelpers()
   const pathname = usePathname();
-  console.log(pathname, pathname === navItems(false)[1].href)
 
   useEffect(() => {
     const handleResize = () => {
@@ -59,8 +49,8 @@ export default function Navigation({ className, viewPort }: NavigationProps) {
       <>
         <div className={isIOS ? "pb-20" : "pb-16"} /> {/* Add padding at the bottom to prevent content from being hidden */}
         <nav className={`lg:hidden fixed bottom-0 left-0 right-0 bg-white dark:bg-gray-800 shadow-lg ${isIOS ? "pb-4" : ""}`}>
-          <div className="grid grid-cols-5 w-full">
-            {[...navItems(isTasksView).filter(item => item.position === 'main'), ...navItems(isTasksView).filter(item => item.position === 'bottom')].map((item) => (
+          <div className="grid grid-cols-6 w-full">
+            {...navItems().map((item) => (
               <Link
                 key={item.label}
                 href={item.href}
@@ -88,7 +78,7 @@ export default function Navigation({ className, viewPort }: NavigationProps) {
           <div className="flex flex-col h-0 flex-1 bg-gray-800">
             <div className="flex-1 flex flex-col pt-5 pb-4 overflow-y-auto">
               <nav className="mt-5 flex-1 px-2 space-y-1">
-                {navItems(isTasksView).filter(item => item.position === 'main').map((item) => (
+                {navItems().filter(item => item.position === 'main').map((item) => (
                   <Link
                     key={item.label}
                     href={item.href}
diff --git a/components/ViewToggle.tsx b/components/ViewToggle.tsx
index b76bc92..b724d07 100644
--- a/components/ViewToggle.tsx
+++ b/components/ViewToggle.tsx
@@ -2,30 +2,26 @@
 
 import { browserSettingsAtom, habitsAtom, settingsAtom } from '@/lib/atoms'
 import { HabitIcon, TaskIcon } from '@/lib/constants'
-import type { ViewType } from '@/lib/types'
 import { cn, isHabitDueToday } from '@/lib/utils'
 import { useAtom } from 'jotai'
 import { NotificationBadge } from './ui/notification-badge'
+import { usePathname, useRouter } from 'next/navigation'
 
 interface ViewToggleProps {
-  defaultView?: ViewType
   className?: string
 }
 
 export function ViewToggle({
-  defaultView = 'habits',
   className
 }: ViewToggleProps) {
   const [browserSettings, setBrowserSettings] = useAtom(browserSettingsAtom)
   const [habits] = useAtom(habitsAtom)
   const [settings] = useAtom(settingsAtom)
+  const pathname = usePathname();
+  const router = useRouter();
 
-  const handleViewChange = (checked: boolean) => {
-    const newView = checked ? 'tasks' : 'habits'
-    setBrowserSettings({
-      ...browserSettings,
-      viewType: newView,
-    })
+  const handleViewChange = () => {
+    router.push(pathname.includes("habits") ? "/tasks" : "/habits");
   }
 
   // Calculate due tasks count
@@ -37,10 +33,10 @@ export function ViewToggle({
     <div className={cn('inline-flex rounded-full bg-muted/50 h-8', className)}>
       <div className="relative flex gap-0.5 rounded-full bg-background p-0.5 h-full">
         <button
-          onClick={() => handleViewChange(false)}
+          onClick={handleViewChange}
           className={cn(
             'relative z-10 rounded-full px-4 py-2 text-sm font-medium transition-colors flex items-center gap-2',
-            browserSettings.viewType === 'habits' ? 'text-primary-foreground' : 'text-muted-foreground hover:text-foreground'
+            pathname.includes('habits') ? 'text-primary-foreground' : 'text-muted-foreground hover:text-foreground'
           )}
         >
           <HabitIcon className="h-4 w-4" />
@@ -49,14 +45,14 @@ export function ViewToggle({
         <NotificationBadge 
           label={dueTasksCount}
           show={dueTasksCount > 0}
-          variant={browserSettings.viewType === 'tasks' ? 'secondary' : 'default'}
+          variant={pathname.includes('tasks') ? 'secondary' : 'default'}
           className="shadow-md"
         >
           <button
-            onClick={() => handleViewChange(true)}
+            onClick={handleViewChange}
             className={cn(
               'relative z-10 rounded-full px-4 py-2 text-sm font-medium transition-colors flex items-center gap-2',
-              browserSettings.viewType === 'tasks' ? 'text-primary-foreground' : 'text-muted-foreground hover:text-foreground'
+              pathname.includes('tasks') ? 'text-primary-foreground' : 'text-muted-foreground hover:text-foreground'
             )}
           >
             <TaskIcon className="h-4 w-4" />
@@ -66,7 +62,7 @@ export function ViewToggle({
         <div
           className={cn(
             'absolute left-0.5 top-0.5 h-[calc(100%-0.25rem)] rounded-full bg-primary transition-transform',
-            browserSettings.viewType === 'habits' ? 'w-[calc(50%-0.125rem)]' : 'w-[calc(50%-0.125rem)] translate-x-[calc(100%+0.125rem)]'
+            pathname.includes('habits') ? 'w-[calc(50%-0.125rem)]' : 'w-[calc(50%-0.125rem)] translate-x-[calc(100%+0.125rem)]'
           )}
         />
       </div>
diff --git a/lib/atoms.ts b/lib/atoms.ts
index 160c9b4..674a571 100644
--- a/lib/atoms.ts
+++ b/lib/atoms.ts
@@ -22,19 +22,16 @@ import {
   getDefaultSettings,
   getDefaultUsersData,
   getDefaultWishlistData,
-  Habit,
-  ViewType
+  Habit
 } from "./types";
 
 export interface BrowserSettings {
-  viewType: ViewType
   expandedHabits: boolean
   expandedTasks: boolean
   expandedWishlist: boolean
 }
 
 export const browserSettingsAtom = atomWithStorage('browserSettings', {
-  viewType: 'habits',
   expandedHabits: false,
   expandedTasks: false,
   expandedWishlist: false
diff --git a/lib/types.ts b/lib/types.ts
index a0c264c..004002d 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -181,8 +181,6 @@ export type CompletionCache = {
   }
 }
 
-export type ViewType = 'habits' | 'tasks'
-
 export interface JotaiHydrateInitialValues {
   settings: Settings;
   coins: CoinsData;