diff --git a/app/Filament/Resources/EggResource.php b/app/Filament/Resources/EggResource.php
index 93778453a..05a0f3ddb 100644
--- a/app/Filament/Resources/EggResource.php
+++ b/app/Filament/Resources/EggResource.php
@@ -130,16 +130,13 @@ class EggResource extends Resource
             ->columns([
                 Tables\Columns\TextColumn::make('id')
                     ->label('Id')
-                    // ->hidden()
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('uuid')
-                    ->label('UUID')
-                    ->hidden()
+                    ->toggleable(isToggledHiddenByDefault: true)
                     ->searchable(),
                 Tables\Columns\TextColumn::make('name')
+                    ->icon('tabler-egg')
                     ->searchable(),
                 Tables\Columns\TextColumn::make('author')
-                    ->hidden()
+                    ->toggleable(isToggledHiddenByDefault: true)
                     ->searchable(),
                 Tables\Columns\TextColumn::make('description')
                     ->words(50)
diff --git a/app/Filament/Resources/NodeResource.php b/app/Filament/Resources/NodeResource.php
index 51dcbbbe7..d394674b1 100644
--- a/app/Filament/Resources/NodeResource.php
+++ b/app/Filament/Resources/NodeResource.php
@@ -100,10 +100,14 @@ class NodeResource extends Resource
                 Tables\Columns\TextColumn::make('memory')
                     ->icon('tabler-device-desktop-analytics')
                     ->numeric()
+                    ->suffix(' GB')
+                    ->formatStateUsing(fn ($state) => number_format($state / 1000, 2))
                     ->sortable(),
                 Tables\Columns\TextColumn::make('disk')
                     ->icon('tabler-file')
                     ->numeric()
+                    ->suffix(' GB')
+                    ->formatStateUsing(fn ($state) => number_format($state / 1000, 2))
                     ->sortable(),
                 Tables\Columns\IconColumn::make('scheme')
                     ->label('SSL')
diff --git a/app/Filament/Resources/ServerResource.php b/app/Filament/Resources/ServerResource.php
index 026ae6557..eaef1beed 100644
--- a/app/Filament/Resources/ServerResource.php
+++ b/app/Filament/Resources/ServerResource.php
@@ -25,32 +25,40 @@ class ServerResource extends Resource
     public static function form(Form $form): Form
     {
         return $form
+            ->columns(4)
             ->schema([
-                Forms\Components\TextInput::make('external_id')
+                Forms\Components\TextInput::make('external_id')->maxLength(191)->hidden(),
+                Forms\Components\TextInput::make('name')
+                    ->columnSpanFull()
+                    ->required()
                     ->maxLength(191),
-                Forms\Components\TextInput::make('uuid')
-                    ->label('UUID')
-                    ->required()
-                    ->maxLength(36),
-                Forms\Components\TextInput::make('uuidShort')
-                    ->required()
-                    ->maxLength(8),
                 Forms\Components\Select::make('node_id')
                     ->relationship('node', 'name')
+                    ->searchable()
+                    ->preload()
+                    ->required(),
+                Forms\Components\Select::make('egg_id')
+                    ->relationship('egg', 'name')
+                    ->searchable()
+                    ->preload()
+                    ->required(),
+                Forms\Components\Select::make('owner_id')
+                    ->relationship('user', 'username')
+                    ->searchable()
+                    ->preload()
+                    ->default(auth()->user()->id)
+                    ->required(),
+                Forms\Components\Select::make('allocation_id')
+                    ->relationship('allocation', 'address')
+                    ->searchable()
                     ->required(),
-                Forms\Components\TextInput::make('name')
-                    ->required()
-                    ->maxLength(191),
                 Forms\Components\Textarea::make('description')
+                    ->hidden()
+                    ->default('')
                     ->required()
                     ->columnSpanFull(),
-                Forms\Components\TextInput::make('status')
-                    ->maxLength(191),
                 Forms\Components\Toggle::make('skip_scripts')
                     ->required(),
-                Forms\Components\TextInput::make('owner_id')
-                    ->required()
-                    ->numeric(),
                 Forms\Components\TextInput::make('memory')
                     ->required()
                     ->numeric(),
@@ -72,17 +80,10 @@ class ServerResource extends Resource
                     ->required()
                     ->numeric()
                     ->default(0),
-                Forms\Components\Select::make('allocation_id')
-                    ->relationship('allocation', 'id')
-                    ->required(),
-                Forms\Components\TextInput::make('egg_id')
-                    ->required()
-                    ->numeric(),
                 Forms\Components\Textarea::make('startup')
                     ->required()
                     ->columnSpanFull(),
-                Forms\Components\FileUpload::make('image')
-                    ->image()
+                Forms\Components\TextInput::make('image')
                     ->required(),
                 Forms\Components\TextInput::make('allocation_limit')
                     ->numeric(),
@@ -93,7 +94,6 @@ class ServerResource extends Resource
                     ->required()
                     ->numeric()
                     ->default(0),
-                Forms\Components\DateTimePicker::make('installed_at'),
             ]);
     }
 
diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
index 20f08313d..e2d44b608 100644
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -45,6 +45,7 @@ class UserResource extends Resource
         return $table
             ->columns([
                 Tables\Columns\ImageColumn::make('picture')
+                    ->label('')
                     ->defaultImageUrl(fn (User $user) => 'https://gravatar.com/avatar/' . md5(strtolower($user->email))),
                 Tables\Columns\TextColumn::make('external_id')
                     ->searchable()
@@ -73,7 +74,7 @@ class UserResource extends Resource
                 Tables\Columns\TextColumn::make('servers_count')
                     ->counts('servers')
                     ->icon('tabler-server')
-                    ->label('Servers Owned'),
+                    ->label('Servers'),
                 Tables\Columns\TextColumn::make('subusers_count')
                     ->counts('subusers')
                     ->icon('tabler-users')