diff --git a/app/Livewire/Filament/Filament.php b/app/Livewire/Filament/Filament.php
index 50758a9..7d17274 100644
--- a/app/Livewire/Filament/Filament.php
+++ b/app/Livewire/Filament/Filament.php
@@ -20,6 +20,7 @@ class Filament extends Component
 
     #[Validate('required')]
     public $name = '';
+
     public $description = '';
     public $diameter = '1.75';
     public $color_id = '';
@@ -44,9 +45,9 @@ class Filament extends Component
         $filament->name = $this->name;
         $filament->description = $this->description;
         $filament->diameter = $this->diameter;
-        $filament->color_id = Color::Find($this->color_id);
-        $filament->filament_type_id = Type::Find($this->type_id);
-        $filament->manufacturer_id = Manufacturer::Find($this->manufacturer_id);        
+        $filament->color_id = $this->color_id;
+        $filament->filament_type_id = $this->type_id;
+        $filament->manufacturer_id = $this->manufacturer_id;        
         $filament->weight = $this->weight;
         $filament->price = $this->price;
         $filament->stock = $this->stock;
@@ -58,6 +59,14 @@ class Filament extends Component
         // Close the modal
         Flux::modal('createModal')->close();
     }
+
+    public function cancel() {
+        $this->resetInputFields();
+        Flux::modals()->close();
+    }
+    public function resetInputFields() {
+        $this->reset(['name', 'description', 'diameter', 'color_id', 'type_id', 'manufacturer_id', 'weight', 'price', 'stock', 'deleteid', 'editid']);
+    }
     public function render()
     {
         return view('livewire.filament.filament', [
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index dcf69a5..574941d 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -23,11 +23,11 @@ class DatabaseSeeder extends Seeder
             'password' => bcrypt('password')
         ]);
 
-        $this ->call(
+        $this ->call([
             ColorSeeder::class,
-            ManufacturerSeeder::class
-        );
-
-
+            ManufacturerSeeder::class,
+            FilamentTypeSeeder::class
+        ]);
+        
     }
 }
diff --git a/database/seeders/FilamentTypeSeeder.php b/database/seeders/FilamentTypeSeeder.php
new file mode 100644
index 0000000..824182c
--- /dev/null
+++ b/database/seeders/FilamentTypeSeeder.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+use App\Models\FilamentType as Type;
+
+class FilamentTypeSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        // Create Predefined Filament Types
+        $filamentTypes = [
+            ['name' => 'PLA', 'description' => 'Standard filament type.'],
+            ['name' => 'PETG', 'description' => 'Premium filament type.'],
+        ];
+
+        foreach ($filamentTypes as $filamentType) {
+            Type::create($filamentType);
+        }
+    }
+}
diff --git a/database/seeders/ManufacturerSeeder.php b/database/seeders/ManufacturerSeeder.php
index 8773670..d1903ad 100644
--- a/database/seeders/ManufacturerSeeder.php
+++ b/database/seeders/ManufacturerSeeder.php
@@ -15,7 +15,8 @@ class ManufacturerSeeder extends Seeder
     {
         // Create predefined Manufacturers
         $manufacturers = [
-            ['name' => 'Bambulab', 'description' => 'Bambulab is a manufacturer of high quality products.', 'website' => 'https://bambulab.com', 'logo' => 'https://example.com/bambulab-logo.png']
+            ['name' => 'Bambulab', 'description' => 'Bambulab is a manufacturer of high quality products.', 'website' => 'https://bambulab.com', 'logo' => ''],
+            ['name' => 'Sunlu', 'description' => 'Sunlu is a manufacturer of high quality products.', 'website' => 'https://sunlu.com', 'logo' => '']
     
         ];
 
diff --git a/resources/views/livewire/filament/filament.blade.php b/resources/views/livewire/filament/filament.blade.php
index d3bc2fd..888866a 100644
--- a/resources/views/livewire/filament/filament.blade.php
+++ b/resources/views/livewire/filament/filament.blade.php
@@ -28,18 +28,28 @@
                 <x-table.header>Weight</x-table.header>
                 <x-table.header>Price</x-table.header>
                 <x-table.header>Rolls</x-table.header>
-                <x-table.header class="w-1/6"></x-table.header>
+                <x-table.header class="w-48"></x-table.header>
             </x-slot>
 
             @foreach ($filaments as $filament)
                 <tr wire:key="{{ $filament->id }}" class="border-b border-blackout-950">
                     <x-table.item><p class="p-4 px-3 pl-6 font-bold">{{ $filament->name }}</p></x-table.item>
                     <x-table.item><p class="p-4 px-3">{{ $filament->description }}</p></x-table.item>
-                    <x-table.item><p class="p-4 px-3"></p></x-table.item>
                     <x-table.item>
-                        <div class="flex flex-row gap-4 justify-end pr-8">
-                            <flux:button wire:click="edit({{ $filament->id }})" icon="pencil">Edit</flux:button>
-                            <flux:button wire:click="deleteModal({{ $filament->id }})" icon="x-mark">Delete</flux:button>
+                        <div class="flex flex-row gap-2 justify-start items-center">
+                            <div class="p-4 px-3 mx-3 h-8 rounded w-full" style="background-color: {{ App\Models\Color::find($filament->color_id)->hex}}"></div>
+                            <p>{{ App\Models\Color::find($filament->color_id)->name }}</p></x-table.item>
+                        </div>
+                    <x-table.item><p class="p-4 px-3">{{ App\Models\Manufacturer::find($filament->manufacturer_id)->name }}</p></x-table.item>
+                    <x-table.item><p class="p-4 px-3">{{ App\Models\FilamentType::find($filament->filament_type_id)->name }}</p></x-table.item>
+                    <x-table.item><p class="p-4 px-3">{{ $filament->diameter }} mm</p></x-table.item>
+                    <x-table.item><p class="p-4 px-3">{{ $filament->weight }} g/m</p></x-table.item>
+                    <x-table.item><p class="p-4 px-3">${{ $filament->price }}</p></x-table.item>
+                    <x-table.item><p class="p-4 px-3">${{ $filament->stock }}</p></x-table.item>
+                    <x-table.item>
+                        <div class="flex flex-row gap-2 justify-start pr-2">
+                            <flux:button wire:click="edit({{ $filament->id }})" variant="ghost" icon="pencil">Edit</flux:button>
+                            <flux:button wire:click="deleteModal({{ $filament->id }})" variant="ghost" icon="x-mark">Delete</flux:button>
                         </div>
                     </x-table.item>
                 </tr>
@@ -62,19 +72,22 @@
             </div>
                 <flux:input label="Name" wire:model="name" placeholder="Filament Name" required />
                 <flux:textarea label="Description" wire:model="description" placeholder="Description" />
-                <flux:select wire:model="manufacturer" label="Manufacturer">
+                <flux:select wire:model="manufacturer_id" label="Manufacturer">
+                    <flux:select.option disabled value="">Choose Manufacturer</flux:select.option>
                     @foreach ($manufacturers as $manufacturer)
-                        <option value="{{ $manufacturer->id }}">{{ $manufacturer->name }}</option>
+                        <flux:select.option wire:key="{{ $manufacturer->id }}" value="{{ $manufacturer->id }}">{{ $manufacturer->name }}</flux:select.option>
                     @endforeach
                 </flux:select>
-                <flux:select wire:model="type" label="Type">
+                <flux:select wire:model="type_id" label="Type">
+                    <flux:select.option disabled value="">Choose Type</flux:select.option>
                     @foreach ($types as $type)
-                        <option value="{{ $type->id }}">{{ $type->name }}</option>
+                        <flux:select.option wire:key="{{ $type->id }}" value="{{ $type->id }}">{{ $type->name }}</flux:select.option>
                     @endforeach
                 </flux:select>
-                <flux:select wire:model="color" label="Color" >
+                <flux:select wire:model="color_id" label="Color" >
+                    <flux:select.option disabled value="">Choose Color</flux:select.option>
                     @foreach ($colors as $color)
-                        <option value="{{ $color->id }}">{{ $color->name }}</option>
+                        <flux:select.option wire:key="{{ $color->id }}" value="{{ $color->id }}">{{ $color->name }}</flux:select.option>
                     @endforeach
                 </flux:select>
                 <flux:input label="Diameter" wire:model="diameter" placeholder="Diameter" required />