diff --git a/app/Filament/Resources/DatabaseHostResource.php b/app/Filament/Resources/DatabaseHostResource.php
index 3693f161f..85e349eb8 100644
--- a/app/Filament/Resources/DatabaseHostResource.php
+++ b/app/Filament/Resources/DatabaseHostResource.php
@@ -81,12 +81,6 @@ class DatabaseHostResource extends Resource
                 Tables\Columns\TextColumn::make('node.name')
                     ->numeric()
                     ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable(),
             ])
             ->filters([
                 //
diff --git a/app/Filament/Resources/MountResource.php b/app/Filament/Resources/MountResource.php
index 8056f4574..dcf1be8ca 100644
--- a/app/Filament/Resources/MountResource.php
+++ b/app/Filament/Resources/MountResource.php
@@ -3,15 +3,15 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\MountResource\Pages;
-use App\Filament\Resources\MountResource\RelationManagers;
 use App\Models\Mount;
 use Filament\Forms;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class MountResource extends Resource
 {
@@ -23,57 +23,78 @@ class MountResource extends Resource
     {
         return $form
             ->schema([
-                Forms\Components\TextInput::make('name')
-                    ->required()
-                    ->helperText('Unique name used to separate this mount from another.')
-                    ->maxLength(191),
-                Forms\Components\ToggleButtons::make('read_only')
-                    ->label('Read only?')
-                    ->helperText('Is the mount read only inside the container?')
-                    ->options([
-                        false => 'Writeable',
-                        true => 'Read only',
+                Section::make()->schema([
+                    Forms\Components\TextInput::make('name')
+                        ->required()
+                        ->helperText('Unique name used to separate this mount from another.')
+                        ->maxLength(64),
+                    Forms\Components\ToggleButtons::make('read_only')
+                        ->label('Read only?')
+                        ->helperText('Is the mount read only inside the container?')
+                        ->options([
+                            false => 'Writeable',
+                            true => 'Read only',
+                        ])
+                        ->icons([
+                            false => 'tabler-writing',
+                            true => 'tabler-writing-off',
+                        ])
+                        ->colors([
+                            false => 'warning',
+                            true => 'success',
+                        ])
+                        ->inline()
+                        ->default(false)
+                        ->required(),
+                    Forms\Components\TextInput::make('source')
+                        ->required()
+                        ->helperText('File path on the host system to mount to a container.')
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('target')
+                        ->required()
+                        ->helperText('Where the mount will be accessible inside a container.')
+                        ->maxLength(191),
+                    Forms\Components\ToggleButtons::make('user_mountable')
+                        ->hidden()
+                        ->label('User mountable?')
+                        ->options([
+                            false => 'No',
+                            true => 'Yes',
+                        ])
+                        ->icons([
+                            false => 'tabler-user-cancel',
+                            true => 'tabler-user-bolt',
+                        ])
+                        ->colors([
+                            false => 'success',
+                            true => 'warning',
+                        ])
+                        ->default(false)
+                        ->inline()
+                        ->required(),
+                    Forms\Components\Textarea::make('description')
+                        ->helperText('A longer description for this mount.')
+                        ->columnSpanFull(),
+                ])->columnSpan(2)->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
+                Group::make()->schema([
+                    Section::make()->schema([
+                        Select::make('eggs')->multiple()
+                            ->relationship('eggs', 'name')
+                            ->preload(),
+                        Select::make('nodes')->multiple()
+                            ->relationship('nodes', 'name')
+                            ->searchable(['name', 'fqdn'])
+                            ->preload(),
                     ])
-                    ->icons([
-                        false => 'tabler-writing',
-                        true => 'tabler-writing-off',
-                    ])
-                    ->colors([
-                        false => 'warning',
-                        true => 'success',
-                    ])
-                    ->inline()
-                    ->default(false)
-                    ->required(),
-                Forms\Components\TextInput::make('source')
-                    ->required()
-                    ->helperText('File path on the host system to mount to a container.')
-                    ->maxLength(191),
-                Forms\Components\TextInput::make('target')
-                    ->required()
-                    ->helperText('Where the mount will be accessible inside a container.')
-                    ->maxLength(191),
-                Forms\Components\ToggleButtons::make('user_mountable')
-                    ->hidden()
-                    ->label('User mountable?')
-                    ->options([
-                        false => 'No',
-                        true => 'Yes',
-                    ])
-                    ->icons([
-                        false => 'tabler-user-cancel',
-                        true => 'tabler-user-bolt',
-                    ])
-                    ->colors([
-                        false => 'success',
-                        true => 'warning',
-                    ])
-                    ->default(false)
-                    ->inline()
-                    ->required(),
-                Forms\Components\Textarea::make('description')
-                    ->helperText('A longer description for this mount.')
-                    ->columnSpanFull(),
+                ])->columns([
+                    'default' => 1,
+                ]),
+            ])->columns([
+                'default' => 1,
+                'lg' => 3,
             ]);
     }