diff --git a/app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php b/app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php
index 384f9cda6..c5db9ea85 100644
--- a/app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php
+++ b/app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php
@@ -32,13 +32,16 @@ class ListDatabaseHosts extends ListRecords
                     ->sortable(),
                 TextColumn::make('username')
                     ->searchable(),
-                TextColumn::make('max_databases')
-                    ->numeric()
-                    ->sortable(),
+                TextColumn::make('databases_count')
+                    ->counts('databases')
+                    ->icon('tabler-database')
+                    ->label('Databases'),
                 TextColumn::make('node.name')
-                    ->numeric()
+                    ->icon('tabler-server-2')
+                    ->placeholder('No Nodes')
                     ->sortable(),
             ])
+            ->checkIfRecordIsSelectableUsing(fn (DatabaseHost $databaseHost) => !$databaseHost->databases_count)
             ->actions([
                 EditAction::make(),
             ])
diff --git a/app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php b/app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php
index 0e85e0a6a..71d57d361 100644
--- a/app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php
+++ b/app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php
@@ -21,9 +21,12 @@ class CreateDatabase extends CreateRecord
                     ->searchable()
                     ->preload()
                     ->required(),
-                TextInput::make('database_host_id')
-                    ->required()
-                    ->numeric(),
+                Select::make('database_host_id')
+                    ->relationship('host', 'name')
+                    ->searchable()
+                    ->selectablePlaceholder(false)
+                    ->preload()
+                    ->required(),
                 TextInput::make('database')
                     ->required()
                     ->maxLength(255),