diff --git a/ui/app/settings/page.tsx b/ui/app/settings/page.tsx
index 6a1a2b21..373245f7 100644
--- a/ui/app/settings/page.tsx
+++ b/ui/app/settings/page.tsx
@@ -20,9 +20,8 @@ export default function SettingsPage() {
             <div className='flex items-center'>
               <h1 className='text-2xl font-bold tracking-tight'>Settings</h1>
             </div>
-            <Tabs defaultValue='server' className='w-full'>
+            <Tabs defaultValue='admin' className='w-full'>
               <TabsList className='mb-4'>
-                <TabsTrigger value='server'>Server Configuration</TabsTrigger>
                 <TabsTrigger value='admin'>Admin Settings</TabsTrigger>
               </TabsList>
               <TabsContent value='server'>
diff --git a/ui/components/app-sidebar.tsx b/ui/components/app-sidebar.tsx
index a4760077..4a11c709 100644
--- a/ui/components/app-sidebar.tsx
+++ b/ui/components/app-sidebar.tsx
@@ -1,7 +1,12 @@
 'use client';
 
 import * as React from 'react';
-import { DatabaseIcon, LayoutDashboardIcon, ServerIcon } from 'lucide-react';
+import {
+  DatabaseIcon,
+  LayoutDashboardIcon,
+  ServerIcon,
+  SettingsIcon,
+} from 'lucide-react';
 
 import { NavSecondary } from '@/components/nav-secondary';
 import {
@@ -38,17 +43,17 @@ const data = {
       url: '/providers',
       icon: ServerIcon,
     },
+    {
+      title: 'Settings',
+      url: '/settings',
+      icon: SettingsIcon,
+    },
     // {
     //   title: 'Transactions',
     //   url: '/transactions',
     //   icon: ReceiptIcon,
     // },
     // {
-    //   title: 'Settings',
-    //   url: '/settings',
-    //   icon: SettingsIcon,
-    // },
-    // {
     //   title: 'Credit',
     //   url: '/credits',
     //   icon: FolderIcon,
diff --git a/ui/components/nav-documents.tsx b/ui/components/nav-documents.tsx
index 6d4f0d6f..c0e940ac 100644
--- a/ui/components/nav-documents.tsx
+++ b/ui/components/nav-documents.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Link from 'next/link';
 import {
   FolderIcon,
   MoreHorizontalIcon,
@@ -41,10 +42,10 @@ export function NavDocuments({
         {items.map((item) => (
           <SidebarMenuItem key={item.name}>
             <SidebarMenuButton asChild>
-              <a href={item.url}>
+              <Link href={item.url}>
                 <item.icon />
                 <span>{item.name}</span>
-              </a>
+              </Link>
             </SidebarMenuButton>
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
diff --git a/ui/components/nav-main.tsx b/ui/components/nav-main.tsx
index 704f5f04..09121532 100644
--- a/ui/components/nav-main.tsx
+++ b/ui/components/nav-main.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Link from 'next/link';
 import { type LucideIcon } from 'lucide-react';
 
 import {
@@ -25,11 +26,11 @@ export function NavMain({
         <SidebarMenu>
           {items.map((item) => (
             <SidebarMenuItem key={item.title}>
-              <SidebarMenuButton tooltip={item.title}>
-                <a href={item.url}>
+              <SidebarMenuButton tooltip={item.title} asChild>
+                <Link href={item.url}>
                   <item.icon />
                   <span>{item.title}</span>
-                </a>
+                </Link>
               </SidebarMenuButton>
             </SidebarMenuItem>
           ))}
diff --git a/ui/components/nav-secondary.tsx b/ui/components/nav-secondary.tsx
index 8898b3d5..be41a897 100644
--- a/ui/components/nav-secondary.tsx
+++ b/ui/components/nav-secondary.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import * as React from 'react';
+import Link from 'next/link';
 import { LucideIcon } from 'lucide-react';
 
 import {
@@ -28,10 +29,10 @@ export function NavSecondary({
           {items.map((item) => (
             <SidebarMenuItem key={item.title}>
               <SidebarMenuButton asChild>
-                <a href={item.url}>
+                <Link href={item.url}>
                   <item.icon />
                   <span>{item.title}</span>
-                </a>
+                </Link>
               </SidebarMenuButton>
             </SidebarMenuItem>
           ))}