diff --git a/app/globals.css b/app/globals.css
index 63c3e0d..38cabd4 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -33,8 +33,8 @@
     --sidebar-foreground: 200 10% 30%;
     --sidebar-primary: 200 13% 80%;
     --sidebar-primary-foreground: 0 0% 98%;
-    --sidebar-accent: 200 13% 90%;
-    --sidebar-accent-foreground: 200 10% 30%;
+    --sidebar-accent: 240 5.9% 10%;
+    --sidebar-accent-foreground: 0 0% 98%;
     --sidebar-border: 200 13% 85%;
     --sidebar-ring: 200 13% 80%;
   }
@@ -68,8 +68,8 @@
     --sidebar-foreground: 200 10% 90%;
     --sidebar-primary: 200 13% 60%;
     --sidebar-primary-foreground: 0 0% 100%;
-    --sidebar-accent: 200 13% 25%;
-    --sidebar-accent-foreground: 200 10% 90%;
+    --sidebar-accent: 240 5.9% 10%;
+    --sidebar-accent-foreground: 0 0% 98%;
     --sidebar-border: 200 13% 25%;
     --sidebar-ring: 200 13% 60%;
   }
diff --git a/app/settings/loading.tsx b/app/settings/loading.tsx
new file mode 100644
index 0000000..14f648e
--- /dev/null
+++ b/app/settings/loading.tsx
@@ -0,0 +1,10 @@
+import { Skeleton } from "@/components/ui/skeleton"
+
+export default function Loading() {
+  return (
+    <div className="flex flex-col gap-4 w-full">
+      <Skeleton className="h-10 w-56" />
+      <Skeleton className="w-full h-[350px]" />
+    </div>
+  )
+}
diff --git a/app/transactions/[transactionId]/loading.tsx b/app/transactions/[transactionId]/loading.tsx
index 4011433..5f6add6 100644
--- a/app/transactions/[transactionId]/loading.tsx
+++ b/app/transactions/[transactionId]/loading.tsx
@@ -2,6 +2,9 @@ import { Skeleton } from "@/components/ui/skeleton"
 
 export default function Loading() {
   return (
-    <Skeleton className="flex flex-row flex-wrap md:flex-nowrap justify-center items-start gap-10 p-5 bg-accent max-w-[1200px] min-h-[800px]" />
+    <div className="flex flex-wrap flex-row items-start justify-center gap-4 max-w-6xl">
+      <Skeleton className="w-full h-[800px]" />
+      <Skeleton className="w-1/3 max-w-[380px]" />
+    </div>
   )
 }
diff --git a/app/transactions/loading.tsx b/app/transactions/loading.tsx
index 04ec005..302d0fb 100644
--- a/app/transactions/loading.tsx
+++ b/app/transactions/loading.tsx
@@ -6,7 +6,10 @@ export default function Loading() {
   return (
     <>
       <header className="flex items-center justify-between mb-12">
-        <h2 className="text-3xl font-bold tracking-tight">Transactions</h2>
+        <h2 className="flex flex-row gap-3 md:gap-5">
+          <span className="text-3xl font-bold tracking-tight">Transactions</span>
+          <Skeleton className="h-10 w-16" />
+        </h2>
         <div className="flex gap-2">
           <Button variant="outline">
             <Download />
@@ -18,9 +21,17 @@ export default function Loading() {
         </div>
       </header>
 
+      <div className="flex flex-row gap-2 w-full">
+        <Skeleton className="h-8 w-full" />
+        <Skeleton className="h-8 w-full" />
+        <Skeleton className="h-8 w-full" />
+        <Skeleton className="h-8 w-full" />
+        <Skeleton className="h-8 w-full" />
+      </div>
+
       <main>
         <div className="flex flex-col gap-3 w-full">
-          {[...Array(20)].map((_, i) => (
+          {[...Array(15)].map((_, i) => (
             <Skeleton key={i} className="h-8" />
           ))}
         </div>
diff --git a/app/unsorted/loading.tsx b/app/unsorted/loading.tsx
new file mode 100644
index 0000000..5366594
--- /dev/null
+++ b/app/unsorted/loading.tsx
@@ -0,0 +1,31 @@
+import { Skeleton } from "@/components/ui/skeleton"
+import { Loader2 } from "lucide-react"
+
+export default function Loading() {
+  return (
+    <div className="flex flex-col gap-4">
+      <header className="flex items-center justify-between">
+        <h2 className="text-3xl font-bold tracking-tight flex flex-row gap-2">
+          <Loader2 className="h-10 w-10 animate-spin" /> <span>Loading unsorted files...</span>
+        </h2>
+      </header>
+
+      <Skeleton className="w-full h-[800px] flex flex-row flex-wrap md:flex-nowrap justify-center items-start gap-5 p-6">
+        <Skeleton className="w-full h-full" />
+        <div className="w-full flex flex-col gap-5">
+          <Skeleton className="w-full h-12 mb-7" />
+          {[...Array(4)].map((_, i) => (
+            <div key={i} className="flex flex-col gap-2">
+              <Skeleton className="w-[120px] h-4" />
+              <Skeleton className="w-full h-9" />
+            </div>
+          ))}
+          <div className="flex flex-row justify-end gap-2 mt-2">
+            <Skeleton className="w-[80px] h-9" />
+            <Skeleton className="w-[130px] h-9" />
+          </div>
+        </div>
+      </Skeleton>
+    </div>
+  )
+}
diff --git a/components/forms/simple.tsx b/components/forms/simple.tsx
index 8a582cf..47ef3f3 100644
--- a/components/forms/simple.tsx
+++ b/components/forms/simple.tsx
@@ -1,9 +1,16 @@
+"use client"
+
+import { Button } from "@/components/ui/button"
+import { Calendar } from "@/components/ui/calendar"
 import { Input } from "@/components/ui/input"
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { Textarea } from "@/components/ui/textarea"
 import { cn } from "@/lib/utils"
 import { SelectProps } from "@radix-ui/react-select"
-import { InputHTMLAttributes, TextareaHTMLAttributes } from "react"
+import { format } from "date-fns"
+import { CalendarIcon } from "lucide-react"
+import { InputHTMLAttributes, TextareaHTMLAttributes, useState } from "react"
 
 type FormInputProps = InputHTMLAttributes<HTMLInputElement> & {
   title: string
@@ -75,3 +82,68 @@ export const FormSelect = ({
     </span>
   )
 }
+
+export const FormDate = ({
+  title,
+  name,
+  placeholder = "Select date",
+  defaultValue,
+  ...props
+}: {
+  title: string
+  name: string
+  placeholder?: string
+  defaultValue?: Date
+}) => {
+  const [date, setDate] = useState<Date | undefined>(defaultValue)
+  const [manualInput, setManualInput] = useState<string>(date ? format(date, "yyyy-MM-dd") : "")
+
+  const handleDateSelect = (newDate: Date | undefined) => {
+    setDate(newDate)
+    setManualInput(newDate ? format(newDate, "yyyy-MM-dd") : "")
+  }
+
+  const handleManualInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setManualInput(e.target.value)
+    setDate(undefined)
+    try {
+      const newDate = new Date(e.currentTarget.value)
+      if (!isNaN(newDate.getTime())) {
+        setDate(newDate)
+      }
+    } catch (error) {}
+  }
+
+  return (
+    <label className="flex flex-col gap-1">
+      <span className="text-sm font-medium">{title}</span>
+      <div className="relative">
+        <Popover>
+          <PopoverTrigger asChild>
+            <Button
+              type="button"
+              variant={"outline"}
+              className={cn(
+                "w-full justify-start text-left font-normal bg-background",
+                !date && "text-muted-foreground"
+              )}
+            >
+              {date ? format(date, "PPP") : placeholder}
+              <CalendarIcon className="ml-1 h-4 w-4 text-muted-foreground" />
+            </Button>
+          </PopoverTrigger>
+          <PopoverContent className="w-auto p-1 flex flex-col gap-2" align="start">
+            <Input
+              type="text"
+              name={name}
+              value={manualInput}
+              onChange={handleManualInputChange}
+              className="text-center"
+            />
+            <Calendar mode="single" selected={date} onSelect={handleDateSelect} initialFocus {...props} />
+          </PopoverContent>
+        </Popover>
+      </div>
+    </label>
+  )
+}
diff --git a/components/sidebar/sidebar-item.tsx b/components/sidebar/sidebar-item.tsx
index b3e9e21..4503857 100644
--- a/components/sidebar/sidebar-item.tsx
+++ b/components/sidebar/sidebar-item.tsx
@@ -21,7 +21,11 @@ export function SidebarMenuItemWithHighlight({
 
   return (
     <SidebarMenuItem
-      className={cn(isActive && "bg-sidebar-accent font-medium text-sidebar-accent-foreground", className)}
+      className={cn(
+        isActive && "bg-sidebar-accent text-sidebar-accent-foreground",
+        "font-medium rounded-md",
+        className
+      )}
       {...props}
     >
       {children}
diff --git a/components/transactions/list.tsx b/components/transactions/list.tsx
index bcbe72a..4755792 100644
--- a/components/transactions/list.tsx
+++ b/components/transactions/list.tsx
@@ -25,13 +25,13 @@ export const standardFieldRenderers: Record<string, FieldRenderer> = {
   name: {
     name: "Name",
     code: "name",
-    classes: "font-medium max-w-[300px] min-w-[120px] overflow-hidden",
+    classes: "font-medium min-w-[120px] max-w-[300px] overflow-hidden",
     sortable: true,
   },
   merchant: {
     name: "Merchant",
     code: "merchant",
-    classes: "max-w-[200px] max-h-[20px] min-w-[120px] overflow-hidden",
+    classes: "min-w-[120px] max-w-[250px] overflow-hidden",
     sortable: true,
   },
   issuedAt: {
@@ -221,7 +221,7 @@ export function TransactionList({ transactions, fields = [] }: { transactions: T
       <Table>
         <TableHeader>
           <TableRow>
-            <TableHead className="w-[50px] select-none">
+            <TableHead className="min-w-[30px] select-none">
               <Checkbox checked={selectedIds.length === transactions.length} onCheckedChange={toggleAllRows} />
             </TableHead>
             {visibleFields.map((field) => (