diff --git a/resources/components/resource-detail.vue b/resources/components/resource-detail.vue
index 830931a..a6b688e 100644
--- a/resources/components/resource-detail.vue
+++ b/resources/components/resource-detail.vue
@@ -14,7 +14,10 @@ defineProps<{
     <div class="flex flex-col gap-8">
       <Card>
         <template v-for="field of resource.fields.filter((f) => f.type === 'field')">
-          <div v-if="field.visibility.detail" class="flex border-b dark:border-surface-800">
+          <div
+            v-if="field.visibility.detail"
+            class="flex border-b last:border-none dark:border-surface-800"
+          >
             <div class="w-64 flex items-center py-4">
               {{ field.label }}
             </div>
diff --git a/resources/components/resource-form.vue b/resources/components/resource-form.vue
index 8024b4b..bfbf992 100644
--- a/resources/components/resource-form.vue
+++ b/resources/components/resource-form.vue
@@ -44,7 +44,10 @@ const emit = defineEmits<{
     <form class="flex flex-col gap-8" @submit.prevent="emit('submit', form.data())">
       <Card>
         <template v-for="field of resource.fields.filter((f) => f.type === 'field')">
-          <div v-if="field.visibility[action]" class="flex border-b dark:border-surface-800">
+          <div
+            v-if="field.visibility[action]"
+            class="flex border-b last:border-none dark:border-surface-800"
+          >
             <div class="w-64 flex items-center py-4">
               <label :for="field.name" class="cursor-pointer">
                 {{ field.label }}
diff --git a/resources/components/resource-peek.vue b/resources/components/resource-peek.vue
index e115ff1..75eaf64 100644
--- a/resources/components/resource-peek.vue
+++ b/resources/components/resource-peek.vue
@@ -12,21 +12,26 @@ defineProps<{
 
 <template>
   <div class="flex flex-col min-w-[300px]">
-    <template v-for="field of resource.fields.filter((f) => f.type === 'field')">
-      <div v-if="field.visibility.detail" class="flex border-b dark:border-surface-800">
-        <div class="w-24 flex items-center py-2">
-          {{ field.label }}
+    <div>
+      <template v-for="field of resource.fields.filter((f) => f.type === 'field')">
+        <div
+          v-if="field.visibility.detail"
+          class="flex border-b last:border-none dark:border-surface-800"
+        >
+          <div class="w-24 flex items-center py-2">
+            {{ field.label }}
+          </div>
+          <div class="flex items-center py-2">
+            <component
+              :is="field.detailComponent ?? field.indexComponent"
+              :field="field"
+              :record="data"
+              :value="data[field.name]"
+            />
+          </div>
         </div>
-        <div class="flex items-center py-2">
-          <component
-            :is="field.detailComponent ?? field.indexComponent"
-            :field="field"
-            :record="data"
-            :value="data[field.name]"
-          />
-        </div>
-      </div>
-    </template>
+      </template>
+    </div>
     <div class="mt-3 flex gap-2">
       <EditButton
         class="flex-1"
diff --git a/resources/components/resource-table.vue b/resources/components/resource-table.vue
index 987f813..b1306d7 100644
--- a/resources/components/resource-table.vue
+++ b/resources/components/resource-table.vue
@@ -71,16 +71,18 @@ function handleDeleted() {
         v-model:selected-rows="selectedRows"
       >
         <template #rowActions="{ data }">
-          <DetailButton rounded text label severity="secondary" :record-id="data.id" />
-          <EditButton rounded text label severity="info" :record-id="data.id" />
-          <DeleteButton
-            rounded
-            text
-            label
-            severity="danger"
-            :record-id="data.id"
-            @success="handleDeleted"
-          />
+          <div class="flex gap-1 flex-nowrap">
+            <DetailButton rounded text label severity="secondary" :record-id="data.id" />
+            <EditButton rounded text label severity="info" :record-id="data.id" />
+            <DeleteButton
+              rounded
+              text
+              label
+              severity="danger"
+              :record-id="data.id"
+              @success="handleDeleted"
+            />
+          </div>
         </template>
       </DataTable>
     </template>
diff --git a/resources/components/sidebar.vue b/resources/components/sidebar.vue
index c6fadc6..c3365c0 100644
--- a/resources/components/sidebar.vue
+++ b/resources/components/sidebar.vue
@@ -1,21 +1,14 @@
 <script setup lang="ts">
 import type { InferSerializable } from '../../src/types'
 import type { BaseResource } from '../../src/resources/base_resource'
-import { MenuItem as PrimeMenuItem } from 'primevue/menuitem'
-import { Link } from '@inertiajs/vue3'
-import { Ref, ref } from 'vue'
-import Menu from 'primevue/menu'
-import ThemeSelector from './ui/theme-selector.vue'
 import CreateMenu from './resource/create-menu.vue'
-import Badge from 'primevue/badge'
 import { Menu as MenuData } from '../../src/menu/menu'
+import Menu from './ui/menu/index.vue'
 
-const props = defineProps<{
+defineProps<{
   menu: InferSerializable<MenuData>[]
   resources: InferSerializable<BaseResource>[]
 }>()
-
-const items: Ref<PrimeMenuItem[]> = ref(props.menu)
 </script>
 
 <template>
@@ -26,29 +19,6 @@ const items: Ref<PrimeMenuItem[]> = ref(props.menu)
       <img src="https://adonis-cockpit.com/logo-horizontal.png" />
     </div>
     <CreateMenu />
-    <Menu
-      :model="items"
-      class="h-full flex flex-col border-none bg-transparent py-4"
-      :pt="{ list: { class: 'flex-1' } }"
-    >
-      <template #submenulabel="{ item }">
-        <span class="text-muted-color font-semibold text-sm">{{ item.label }}</span>
-      </template>
-      <template #item="{ item, props }">
-        <Link v-if="item.url" :href="item.url" class="flex items-center w-full py-1 px-3 gap-2">
-          <div class="w-4 h-4" :class="item.icon" />
-          <div>{{ item.label }}</div>
-          <Badge v-if="item.badge" class="ml-auto" :value="item.badge" />
-          <span
-            v-if="item.shortcut"
-            class="ml-auto border border-surface rounded bg-emphasis text-muted-color text-xs p-1"
-            >{{ item.shortcut }}</span
-          >
-        </Link>
-      </template>
-      <template #end>
-        <ThemeSelector />
-      </template>
-    </Menu>
+    <Menu :menu="menu" />
   </div>
 </template>
diff --git a/resources/components/ui/menu/category.vue b/resources/components/ui/menu/category.vue
new file mode 100644
index 0000000..10e0742
--- /dev/null
+++ b/resources/components/ui/menu/category.vue
@@ -0,0 +1,18 @@
+<script lang="ts" setup>
+import { MenuItem } from '../../../../src/menu/menu_item'
+import { InferSerializable } from '../../../../src/types'
+import Item from './item.vue'
+
+defineProps<{
+  item: InferSerializable<MenuItem>
+}>()
+</script>
+
+<template>
+  <ul class="mt-4 flex flex-col">
+    <li class="text-sm text-muted-color font-semibold mb-2">{{ item.label }}</li>
+    <li v-for="item in item.items">
+      <Item :item="item" />
+    </li>
+  </ul>
+</template>
diff --git a/resources/components/ui/menu/index.vue b/resources/components/ui/menu/index.vue
new file mode 100644
index 0000000..f329576
--- /dev/null
+++ b/resources/components/ui/menu/index.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import { Menu } from '../../../../src/menu/menu'
+import { InferSerializable } from '../../../../src/types'
+import MenuCategory from './category.vue'
+import MenuItem from './item.vue'
+
+defineProps<{
+  menu: InferSerializable<Menu>
+}>()
+</script>
+
+<template>
+  <ul class="flex flex-col py-6">
+    <li v-for="item of menu">
+      <MenuCategory v-if="item.items" :item="item" />
+      <MenuItem v-else :item="item" />
+    </li>
+  </ul>
+</template>
diff --git a/resources/components/ui/menu/item.vue b/resources/components/ui/menu/item.vue
new file mode 100644
index 0000000..ce3f70b
--- /dev/null
+++ b/resources/components/ui/menu/item.vue
@@ -0,0 +1,33 @@
+<script lang="ts" setup>
+import { Link } from '@inertiajs/vue3'
+import { MenuItem } from '../../../../src/menu/menu_item'
+import { InferSerializable } from '../../../../src/types'
+import { router } from '@inertiajs/vue3'
+import { ref } from 'vue'
+
+const props = defineProps<{
+  item: InferSerializable<MenuItem>
+}>()
+
+const isActive = ref<boolean>(false)
+
+router.on('navigate', (event: any) => {
+  const pathname = event.detail.page.url
+  if (props.item.prefixMatch) {
+    isActive.value = pathname.startsWith(props.item.url)
+  } else {
+    isActive.value = pathname === props.item.url
+  }
+})
+</script>
+
+<template>
+  <Link
+    :href="item.url"
+    class="px-2 py-1 hover:bg-indigo-700/20 aria-selected:bg-indigo-700/60 rounded-md duration-75 mb-1 flex gap-2 items-center"
+    :aria-selected="isActive"
+  >
+    <div class="w-4 h-4" :class="item.icon" />
+    {{ item.label }}
+  </Link>
+</template>
diff --git a/src/menu/menu_category.ts b/src/menu/menu_category.ts
index 18f746e..a362afc 100644
--- a/src/menu/menu_category.ts
+++ b/src/menu/menu_category.ts
@@ -20,16 +20,19 @@ export class MenuCategory implements Serializable {
     return item
   }
 
+  /**
+   * Adds an item from a resource.
+   */
   resource(resource: (new () => BaseResource) | BaseResource): MenuItem {
     const instance = resource instanceof BaseResource ? resource : new resource()
     const item = this.item(instance.labelPlural())
+      .prefixMatch()
+      .route(`cockpit.resources.index`, { slug: instance.name() })
 
     if (instance.icon) {
       item.icon(instance.icon())
     }
 
-    item.route(`cockpit.resources.index`, { slug: instance.name() })
-
     return item
   }
 
diff --git a/src/menu/menu_item.ts b/src/menu/menu_item.ts
index 685ebb5..ded6fe8 100644
--- a/src/menu/menu_item.ts
+++ b/src/menu/menu_item.ts
@@ -6,6 +6,7 @@ export class MenuItem {
   #href?: string
   #target?: string
   #icon?: string
+  #prefixMatch = false
 
   constructor(label: string) {
     this.#label = label
@@ -36,16 +37,21 @@ export class MenuItem {
     return this
   }
 
-  // public static resource(Resource: Type<BaseResource>): MenuItem {
-  //   const resource = new Resource()
-  //   const item = this.make().label(resource.labelPlural()).href(resource.route('index'))
-  //
-  //   if (resource.icon) {
-  //     item.icon(resource.icon())
-  //   }
-  //
-  //   return item
-  // }
+  /**
+   * Make the item active using prefix matching.
+   */
+  prefixMatch(): this {
+    this.#prefixMatch = true
+    return this
+  }
+
+  /**
+   * Make the item active using exact matching.
+   */
+  exactMatch(): this {
+    this.#prefixMatch = false
+    return this
+  }
 
   toJSON(): PrimeMenuItem {
     return {
@@ -53,6 +59,7 @@ export class MenuItem {
       url: this.#href,
       target: this.#target,
       icon: this.#icon,
+      prefixMatch: this.#prefixMatch,
     }
   }
 }