diff --git a/app/Filament/Resources/DepartmentResource.php b/app/Filament/Resources/DepartmentResource.php
index 8bc21f5..b75d702 100644
--- a/app/Filament/Resources/DepartmentResource.php
+++ b/app/Filament/Resources/DepartmentResource.php
@@ -19,7 +19,7 @@ class DepartmentResource extends Resource
 {
     protected static ?string $model = Department::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-building-storefront';
 
     public static function form(Form $form): Form
     {
@@ -44,15 +44,10 @@ public static function table(Table $table): Table
     {
         return $table
             ->columns([
-                TextColumn::make('guid')
-                    ->searchable(),
-                IconColumn::make('is_active')
-                    ->boolean(),
-                TextColumn::make('organization.name')
-                    ->numeric()
-                    ->sortable(),
-                TextColumn::make('name')
-                    ->searchable(),
+                IconColumn::make('is_active')->boolean(),
+                TextColumn::make('name')->searchable(),
+                TextColumn::make('organization.name')->sortable(),
+                TextColumn::make('guid')->searchable(),
                 TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable()
diff --git a/app/Filament/Resources/DicomRoutingRuleResource.php b/app/Filament/Resources/DicomRoutingRuleResource.php
index a8594f4..c8ec3fc 100644
--- a/app/Filament/Resources/DicomRoutingRuleResource.php
+++ b/app/Filament/Resources/DicomRoutingRuleResource.php
@@ -19,7 +19,7 @@
 class DicomRoutingRuleResource extends Resource
 {
     protected static ?string $model = DicomRoutingRule::class;
-
+    protected static ?string $modelLabel = 'Routing Rules';
     protected static ?string $navigationIcon = 'heroicon-o-academic-cap';
 
     public static function form(Form $form): Form
diff --git a/app/Filament/Resources/OrganizationResource.php b/app/Filament/Resources/OrganizationResource.php
index f7ca573..2efd33b 100644
--- a/app/Filament/Resources/OrganizationResource.php
+++ b/app/Filament/Resources/OrganizationResource.php
@@ -20,7 +20,7 @@ class OrganizationResource extends Resource
 {
     protected static ?string $model = Organization::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-building-office-2';
 
     public static function form(Form $form): Form
     {
@@ -46,16 +46,9 @@ public static function table(Table $table): Table
     {
         return $table
             ->columns([
-                TextColumn::make('guid')
-                    ->searchable(),
-                TextColumn::make('name')
-                    ->searchable(),
-                IconColumn::make('is_active')
-                    ->boolean(),
-                TextColumn::make('address')
-                    ->searchable(),
-                TextColumn::make('logo_path')
-                    ->searchable(),
+                IconColumn::make('is_active')->boolean(),
+                TextColumn::make('name')->searchable(),
+                TextColumn::make('guid')->searchable(),
                 TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable()