diff --git a/app/Filament/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Resources/ServerResource/Pages/EditServer.php
index def339148..00c0f8292 100644
--- a/app/Filament/Resources/ServerResource/Pages/EditServer.php
+++ b/app/Filament/Resources/ServerResource/Pages/EditServer.php
@@ -33,7 +33,6 @@ class EditServer extends EditRecord
             ->schema([
                 Forms\Components\ToggleButtons::make('docker')
                     ->label('Container Status')
-                    ->hiddenOn('create')
                     ->inlineLabel()
                     ->formatStateUsing(function ($state, Server $server) {
                         if ($server->node_id === null) {
@@ -66,7 +65,6 @@ class EditServer extends EditRecord
                 Forms\Components\ToggleButtons::make('status')
                     ->label('Server State')
                     ->helperText('')
-                    ->hiddenOn('create')
                     ->inlineLabel()
                     ->formatStateUsing(fn ($state) => $state ?? ServerState::Normal)
                     ->options(fn ($state) => collect(ServerState::cases())->filter(fn ($serverState) => $serverState->value === $state)->mapWithKeys(
@@ -228,7 +226,6 @@ class EditServer extends EditRecord
 
                 Forms\Components\Fieldset::make('Application Feature Limits')
                     ->inlineLabel()
-                    ->hiddenOn('create')
                     ->columnSpan([
                         'default' => 2,
                         'sm' => 4,
@@ -291,18 +288,12 @@ class EditServer extends EditRecord
                         'lg' => 6,
                     ]))
                     ->schema([
-                        Forms\Components\Placeholder::make('Select an egg first to show its variables!')
-                            ->hidden(fn (Forms\Get $get) => !empty($get('server_variables'))),
-
                         Forms\Components\Repeater::make('server_variables')
-                            ->relationship('serverVariables', fn ($query) => $query
-                                ->join('egg_variables', 'egg_variables.id', '=', 'server_variables.variable_id')
-                                ->orderBy('egg_variables.sort')
-                            )
+                            ->label('')
+                            ->relationship('serverVariables')
                             ->grid()
                             ->deletable(false)
                             ->addable(false)
-                            ->hidden(fn ($state) => empty($state))
                             ->schema([
                                 Forms\Components\TextInput::make('variable_value')
                                     ->rules([
@@ -325,13 +316,12 @@ class EditServer extends EditRecord
                                     ->helperText(fn (ServerVariable $variable) => $variable->variable->description ?: '—')
                                     ->maxLength(191),
 
-                                Forms\Components\Hidden::make('variable_id')->default(0),
+                                Forms\Components\Hidden::make('variable_id'),
                             ])
                             ->columnSpan(2),
                     ]),
 
                 Forms\Components\Section::make('Resource Management')
-                    // ->hiddenOn('create')
                     ->collapsed()
                     ->icon('tabler-server-cog')
                     ->iconColor('primary')
@@ -424,6 +414,8 @@ class EditServer extends EditRecord
     {
         unset($data['docker'], $data['status']);
 
+        // dd($data);
+
         return $data;
     }