diff --git a/app/Http/Controllers/ManufacturerController.php b/app/Http/Controllers/ManufacturerController.php
index 5d8cbbc..eb575b7 100644
--- a/app/Http/Controllers/ManufacturerController.php
+++ b/app/Http/Controllers/ManufacturerController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\Models\Manufacturer;
+use App\Models\Filament;
 
 class ManufacturerController extends Controller
 {
@@ -13,8 +14,9 @@ class ManufacturerController extends Controller
     public function index()
     {
         // show all manufacturers
-        $manufacturers = Manufacturer::all();
-        return view('manufacturers.index', compact('manufacturers'));
+        $manufacturers = Manufacturer::all()->sortBy('name');
+        $filamentcount = Filament::all()->count();
+        return view('manufacturers.index', compact('manufacturers', 'filamentcount'));
     }
 
     /**
diff --git a/app/Livewire/Dashboard.php b/app/Livewire/Dashboard.php
new file mode 100644
index 0000000..54af745
--- /dev/null
+++ b/app/Livewire/Dashboard.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire;
+
+use Livewire\Component;
+
+class Dashboard extends Component
+{
+    public function render()
+    {
+        return view('livewire.dashboard');
+    }
+}
diff --git a/resources/views/components/card.blade.php b/resources/views/components/card.blade.php
new file mode 100644
index 0000000..67296f4
--- /dev/null
+++ b/resources/views/components/card.blade.php
@@ -0,0 +1,3 @@
+<div class="bg-white dark:bg-zinc-700 overflow-hidden shadow-xl sm:rounded-lg p-6">
+  {{ $slot }}
+</div>
\ No newline at end of file
diff --git a/resources/views/components/dashboard.blade.php b/resources/views/components/dashboard.blade.php
new file mode 100644
index 0000000..0a5ce93
--- /dev/null
+++ b/resources/views/components/dashboard.blade.php
@@ -0,0 +1,30 @@
+<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+  <div class="col-span-2">
+    <x-card>
+      <h3>
+        Manufacturers
+      </h3>
+    </x-card>
+  </div>
+  <div class="col-span-1">
+    <x-card>
+      <h3>
+        Filaments
+      </h3>
+    </x-card>
+  </div>
+  <div class="col-span-1">
+    <x-card>
+      <h3>
+        Types
+      </h3>
+    </x-card>
+  </div>
+  <div class="col-span-2">
+    <x-card>
+      <h3>
+        Colors
+      </h3>
+    </x-card>
+  </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
new file mode 100644
index 0000000..2ba282d
--- /dev/null
+++ b/resources/views/livewire/dashboard.blade.php
@@ -0,0 +1,16 @@
+<div>
+    <x-app-layout>
+        <x-slot name="header">
+                {{ __('Dashboard') }}
+        </x-slot>
+    
+    
+        <div class="py-12">
+            <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
+
+                <x-dashboard />
+
+            </div>
+        </div>
+    </x-app-layout>
+</div>
\ No newline at end of file
diff --git a/resources/views/manufacturers/index.blade.php b/resources/views/manufacturers/index.blade.php
index 3f8cb3e..db93a2e 100644
--- a/resources/views/manufacturers/index.blade.php
+++ b/resources/views/manufacturers/index.blade.php
@@ -13,11 +13,11 @@
       <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
           <div class="bg-white dark:bg-zinc-700 overflow-hidden shadow-xl sm:rounded-lg">
             <ul class="">
-              <li class="flex gap-6  bg-zinc-50 dark:bg-zinc-900 p-2 px-4"><div class="">ID</div><div class="">Name</div><div class="">Options</div></li>
+              <li class="flex gap-6  bg-zinc-50 dark:bg-zinc-900 p-2 px-4"><div class="">Name</div><div class="">Options</div></li>
               @foreach ($manufacturers as $manufacturer)
                 <li class="flex gap-6 py-3 px-4 items-center">  
-                  <div class="p-2">{{ $manufacturer->id }}</div>
                   <div class="p-2"><a href="/manufacturers/{{ $manufacturer->id }}">{{ $manufacturer->name }}</a></div>
+                  <div class="p-2"><a href="/manufacturers/{{ $manufacturer->id }}" class="bg-accent px-2 py-1 rounded">{{ $filamentcount }}</a></div>
                   <div class="p-2"><a class="flex gap-2" target="_blank" href="{{ $manufacturer->website }}">{{ $manufacturer->website }}<flux:icon.arrow-top-right-on-square /></a></div>
                   <div class="px-2"><a href="{{ route('manufacturers.edit', $manufacturer->id) }}"><flux:icon.ellipsis class="hover:text-zinc-50 hover:bg-zinc-500 stroke-3 rounded "/></a></div>
                 </li>
diff --git a/routes/web.php b/routes/web.php
index c33d659..aeaf85a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,6 +6,8 @@ use App\Http\Controllers\ColorController;
 use App\Http\Controllers\FilamentController;
 use App\Http\Controllers\ManufacturerController;
 
+use App\Livewire\Dashboard;
+
 Route::get('/', function () {
     return view('welcome');
 });
@@ -17,10 +19,7 @@ Route::middleware([
 ])->group(function () {
 
     // Dashboard
-    Route::get('/dashboard', function () {
-        return view('dashboard');
-    })->name('dashboard');
-
+    Route::get('/', Dashboard::class)->name('dashboard');
     // Filament Types
     Route::resource('types', FilamentTypeController::class);
     // Colors