diff --git a/api.saladeaula.digital/app/routes/orgs/admins.py b/api.saladeaula.digital/app/routes/orgs/admins.py
index e63b88a..eecbff4 100644
--- a/api.saladeaula.digital/app/routes/orgs/admins.py
+++ b/api.saladeaula.digital/app/routes/orgs/admins.py
@@ -20,6 +20,11 @@ def get_admins(org_id: str):
     )
 
 
+@router.post('/<org_id>/admins')
+def add(org_id: str):
+    return JSONResponse(HTTPStatus.CREATED)
+
+
 @router.delete('/<org_id>/admins/<user_id>')
 def revoke(org_id: str, user_id: str):
     with dyn.transact_writer() as transact:
@@ -28,4 +33,4 @@ def revoke(org_id: str, user_id: str):
             key=KeyPair(org_id, f'admins#{user_id}'),
         )
 
-    return JSONResponse(status_code=HTTPStatus.NO_CONTENT)
+    return JSONResponse(HTTPStatus.NO_CONTENT)
diff --git a/api.saladeaula.digital/app/routes/orgs/users/__init__.py b/api.saladeaula.digital/app/routes/orgs/users/__init__.py
index 8d48286..5933687 100644
--- a/api.saladeaula.digital/app/routes/orgs/users/__init__.py
+++ b/api.saladeaula.digital/app/routes/orgs/users/__init__.py
@@ -78,6 +78,11 @@ def unlink(org_id: str, user_id: str):
                 sk=user_id,
             )
         )
+        transact.delete(
+            key=KeyPair(org_id, f'admins#{user_id}'),
+            # Post-migration: uncomment the following line
+            # key=KeyPair(org_id, f'ADMIN#{user_id}'),
+        )
         transact.delete(
             key=KeyPair(
                 pk=user_id,
diff --git a/apps/admin.saladeaula.digital/app/components/range-calendar-filter.tsx b/apps/admin.saladeaula.digital/app/components/range-calendar-filter.tsx
index aa80863..513a2a1 100644
--- a/apps/admin.saladeaula.digital/app/components/range-calendar-filter.tsx
+++ b/apps/admin.saladeaula.digital/app/components/range-calendar-filter.tsx
@@ -68,12 +68,12 @@ export function RangeCalendarFilter({
     <Popover>
       <div
         className={cn(
-          'h-9 border rounded-md bg-muted border-dashed flex items-center justify-center',
+          'h-9 border rounded-md dark:bg-input/30 border-dashed flex items-center justify-center',
           className
         )}
       >
         <PopoverTrigger asChild>
-          <Button variant="ghost" size="sm" className="cursor-pointer">
+          <Button variant="ghost" size="sm" className="cursor-pointer h-full">
             <Icon /> {title}
             {dateRange && (
               <>
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.admins._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.admins._index/route.tsx
index 933d968..7ce8e2e 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.admins._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.admins._index/route.tsx
@@ -46,14 +46,14 @@ export function meta({}: Route.MetaArgs) {
 }
 
 export async function loader({ context, request, params }: Route.LoaderArgs) {
-  const admins = req({
+  const users = req({
     url: `/orgs/${params.orgid}/admins`,
     context,
     request
   }).then((r) => r.json())
 
   return {
-    data: admins
+    data: Promise.all([users, new Promise((r) => setTimeout(r, 5000))])
   }
 }
 
@@ -69,7 +69,7 @@ export default function Route({ loaderData: { data } }) {
 
       <Suspense fallback={<Skeleton />}>
         <Await resolve={data}>
-          {({ items }) => {
+          {([{ items }, _]) => {
             return (
               <div className="grid gap-4 lg:gap-8 md:grid-cols-2 lg:grid-cols-3">
                 {items.map(({ sk, name, email }: Admin) => {
@@ -151,7 +151,7 @@ function RevokeItem({ id }: { id: string }) {
   const { orgid } = useParams()
   const { revalidate } = useRevalidator()
 
-  const revoke = async (e: MouseEvent) => {
+  const revoke = async (e) => {
     e.preventDefault()
     set(true)
 
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
index a6d3d61..9d0de68 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments._index/route.tsx
@@ -8,12 +8,11 @@ import {
   FileSpreadsheetIcon,
   FileTextIcon,
   PlusCircleIcon,
-  PlusIcon,
-  TagIcon
+  PlusIcon
 } from 'lucide-react'
 import { MeiliSearchFilterBuilder } from 'meilisearch-helper'
 import { Suspense, useState } from 'react'
-import { Await, Link, useSearchParams } from 'react-router'
+import { Await, Link, useParams, useSearchParams } from 'react-router'
 import type { BookType } from 'xlsx'
 import * as XLSX from 'xlsx'
 
@@ -119,10 +118,7 @@ export default function Route({ loaderData: { data } }) {
               {selectedRows.length ? (
                 <>
                   <div className="flex gap-2.5 items-center">
-                    <DropdownMenuExport
-                      headers={headers}
-                      selectedRows={selectedRows}
-                    />
+                    <ExportMenu headers={headers} selectedRows={selectedRows} />
                   </div>
                 </>
               ) : (
@@ -248,18 +244,20 @@ function useRangeParams() {
   }
 }
 
-export function DropdownMenuExport({
+export function ExportMenu({
   headers,
   selectedRows = []
 }: {
   headers: Record<string, string>
   selectedRows: object[]
 }) {
-  const handleExport = (bookType: BookType) => () => {
+  const { orgid } = useParams()
+
+  const exportFile = (bookType: BookType) => () => {
     if (!selectedRows.length) {
       return
     }
-
+    const now = new Date()
     const header = Object.keys(headers)
     const data = selectedRows.map((data) => {
       const obj: Record<string, string> = flatten(data)
@@ -272,7 +270,7 @@ export function DropdownMenuExport({
       origin: 'A1'
     })
     XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1')
-    XLSX.writeFile(workbook, `${formatted.format(new Date())}.${bookType}`, {
+    XLSX.writeFile(workbook, `${orgid}_users_${+now}.${bookType}`, {
       bookType,
       compression: true
     })
@@ -287,10 +285,10 @@ export function DropdownMenuExport({
       </DropdownMenuTrigger>
       <DropdownMenuContent className="w-52" align="start">
         <DropdownMenuGroup className="*:cursor-pointer">
-          <DropdownMenuItem onClick={handleExport('xlsx')}>
+          <DropdownMenuItem onClick={exportFile('xlsx')}>
             <FileSpreadsheetIcon /> Microsoft Excel (.xlsx)
           </DropdownMenuItem>
-          <DropdownMenuItem onClick={handleExport('csv')}>
+          <DropdownMenuItem onClick={exportFile('csv')}>
             <FileTextIcon /> CSV (.csv)
           </DropdownMenuItem>
         </DropdownMenuGroup>
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
index 2391f44..32a3362 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
@@ -1,3 +1,5 @@
+import type { Route } from './+types'
+
 import { Link } from 'react-router'
 
 import {
@@ -16,6 +18,10 @@ import {
   CardTitle
 } from '@repo/ui/components/ui/card'
 
+export function meta({}: Route.MetaArgs) {
+  return [{ title: 'Adicionar matrícula' }]
+}
+
 export default function Route() {
   return (
     <div className="space-y-2.5">
@@ -33,7 +39,7 @@ export default function Route() {
         </BreadcrumbList>
       </Breadcrumb>
 
-      <div className="lg:max-w-2xl mx-auto space-y-2.5">
+      <div className="lg:max-w-3xl mx-auto space-y-2.5">
         <Card>
           <CardHeader>
             <CardTitle className="text-2xl">Adicionar matrícula</CardTitle>
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/columns.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/columns.tsx
index 0c2c3ff..585d119 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/columns.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users._index/columns.tsx
@@ -154,7 +154,7 @@ function UnlinkItem({ id }: { id: string }) {
   const { orgid } = useParams()
   const { table } = useDataTable<User>()
 
-  const unlink = async (e: MouseEvent) => {
+  const unlink = async (e) => {
     e.preventDefault()
     set(true)
 
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
index fc0054f..38f0b65 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx
@@ -84,7 +84,12 @@ export default function Route({ loaderData }: Route.ComponentProps) {
           <main className="p-4">
             <div className="container mx-auto relative">
               <Outlet />
-              <Toaster position="top-center" richColors={true} />
+              <Toaster
+                position="top-center"
+                richColors={true}
+                duration={Infinity}
+                closeButton={true}
+              />
             </div>
           </main>
         </SidebarInset>