diff --git a/app/Filament/Admin/Pages/Health.php b/app/Filament/Admin/Pages/Health.php
index 7aa5e41de..47749ef91 100644
--- a/app/Filament/Admin/Pages/Health.php
+++ b/app/Filament/Admin/Pages/Health.php
@@ -17,6 +17,8 @@ class Health extends Page
 
     protected string $view = 'filament.pages.health';
 
+    protected array $extraAttributes = [];
+
     /** @var array<string, string> */
     protected $listeners = [
         'refresh-component' => '$refresh',
diff --git a/app/Filament/Admin/Pages/Settings.php b/app/Filament/Admin/Pages/Settings.php
index 371e4710b..e33824d23 100644
--- a/app/Filament/Admin/Pages/Settings.php
+++ b/app/Filament/Admin/Pages/Settings.php
@@ -379,6 +379,7 @@ class Settings extends Page implements HasSchemas
             Section::make(trans('admin/setting.mail.from_settings'))
                 ->description(trans('admin/setting.mail.from_settings_help'))
                 ->columns()
+                ->columnSpanFull()
                 ->schema([
                     TextInput::make('MAIL_FROM_ADDRESS')
                         ->label(trans('admin/setting.mail.from_address'))
@@ -392,6 +393,7 @@ class Settings extends Page implements HasSchemas
                 ]),
             Section::make(trans('admin/setting.mail.smtp.smtp_title'))
                 ->columns()
+                ->columnSpanFull()
                 ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'smtp')
                 ->schema([
                     TextInput::make('MAIL_HOST')
@@ -428,6 +430,7 @@ class Settings extends Page implements HasSchemas
                 ]),
             Section::make(trans('admin/setting.mail.mailgun.mailgun_title'))
                 ->columns()
+                ->columnSpanFull()
                 ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'mailgun')
                 ->schema([
                     TextInput::make('MAILGUN_DOMAIN')
@@ -467,6 +470,7 @@ class Settings extends Page implements HasSchemas
             Section::make(trans('admin/setting.backup.throttle'))
                 ->description(trans('admin/setting.backup.throttle_help'))
                 ->columns()
+                ->columnSpanFull()
                 ->schema([
                     TextInput::make('BACKUP_THROTTLE_LIMIT')
                         ->label(trans('admin/setting.backup.limit'))
diff --git a/app/Filament/Admin/Resources/RoleResource.php b/app/Filament/Admin/Resources/RoleResource.php
index b72b713a2..e0ae3cc29 100644
--- a/app/Filament/Admin/Resources/RoleResource.php
+++ b/app/Filament/Admin/Resources/RoleResource.php
@@ -17,7 +17,6 @@ use Filament\Infolists\Components\TextEntry;
 use Filament\Resources\Resource;
 use Filament\Schemas\Components\Component;
 use Filament\Schemas\Components\Fieldset;
-use Filament\Schemas\Components\Form;
 use Filament\Schemas\Components\Section;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Tables\Columns\TextColumn;
@@ -64,8 +63,7 @@ class RoleResource extends Resource
             ->columns([
                 TextColumn::make('name')
                     ->label(trans('admin/role.name'))
-                    ->sortable()
-                    ->searchable(),
+                    ->sortable(),
                 TextColumn::make('permissions_count')
                     ->label(trans('admin/role.permissions'))
                     ->badge()
@@ -96,7 +94,7 @@ class RoleResource extends Resource
     /**
      * @throws Exception
      */
-    public static function form(Form|Schema $schema): Schema
+    public static function form(Schema $schema): Schema
     {
         $permissionSections = [];
 
diff --git a/app/Filament/Admin/Resources/UserResource.php b/app/Filament/Admin/Resources/UserResource.php
index 94d67bb0a..6035bfa5b 100644
--- a/app/Filament/Admin/Resources/UserResource.php
+++ b/app/Filament/Admin/Resources/UserResource.php
@@ -9,7 +9,6 @@ use App\Models\User;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\TextInput;
-use Filament\Schemas\Components\Form;
 use Filament\Resources\Resource;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
@@ -65,10 +64,12 @@ class UserResource extends Resource
                     ->alignCenter()
                     ->defaultImageUrl(fn (User $user) => Filament::getUserAvatarUrl($user)),
                 TextColumn::make('username')
-                    ->label(trans('admin/user.username')),
+                    ->label(trans('admin/user.username'))
+                    ->searchable(),
                 TextColumn::make('email')
                     ->label(trans('admin/user.email'))
-                    ->icon('tabler-mail'),
+                    ->icon('tabler-mail')
+                    ->searchable(),
                 IconColumn::make('use_totp')
                     ->label('2FA')
                     ->visibleFrom('lg')
@@ -100,7 +101,7 @@ class UserResource extends Resource
             ]);
     }
 
-    public static function form(Form|Schema $schema): Schema
+    public static function form(Schema $schema): Schema
     {
         return $schema
             ->columns(['default' => 1, 'lg' => 3])
diff --git a/app/Filament/Server/Pages/ServerFormPage.php b/app/Filament/Server/Pages/ServerFormPage.php
index 7f7bacb0e..3a2fdf97f 100644
--- a/app/Filament/Server/Pages/ServerFormPage.php
+++ b/app/Filament/Server/Pages/ServerFormPage.php
@@ -39,10 +39,10 @@ abstract class ServerFormPage extends Page
     /**
      * @return array<int | string, string | Form>
      */
-    protected function getForms(): array
+    protected function getFormSchema(): array
     {
         return [
-            'form' => $this->form($this->makeForm()
+            'schema' => $this->form($this->makeSchema()
                 ->model($this->getRecord())
                 ->statePath($this->getFormStatePath())
                 ->columns($this->hasInlineLabels() ? 1 : 2)
diff --git a/app/Filament/Server/Pages/Settings.php b/app/Filament/Server/Pages/Settings.php
index c5e5e07de..1874ebf37 100644
--- a/app/Filament/Server/Pages/Settings.php
+++ b/app/Filament/Server/Pages/Settings.php
@@ -14,7 +14,6 @@ use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Section;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
-use Filament\Schemas\Components\Form;
 use Filament\Notifications\Notification;
 use Filament\Schemas\Schema;
 use Filament\Support\Enums\Alignment;
@@ -26,7 +25,10 @@ class Settings extends ServerFormPage
 
     protected static ?int $navigationSort = 10;
 
-    public function form(Form|Schema $schema): Schema
+    /**
+     * @throws Exception
+     */
+    public function form(Schema $schema): Schema
     {
         /** @var Server $server */
         $server = Filament::getTenant();
@@ -49,6 +51,7 @@ class Settings extends ServerFormPage
                     ->schema([
                         Fieldset::make('Server')
                             ->label('Information')
+                            ->columnSpanFull()
                             ->schema([
                                 TextInput::make('name')
                                     ->label('Server Name')
@@ -91,6 +94,7 @@ class Settings extends ServerFormPage
                             ]),
                         Fieldset::make('Limits')
                             ->label('Limits')
+                            ->columnSpanFull()
                             ->columns([
                                 'default' => 1,
                                 'sm' => 1,
@@ -149,6 +153,7 @@ class Settings extends ServerFormPage
                             ->formatStateUsing(fn (Server $server) => $server->node->name)
                             ->disabled(),
                         Fieldset::make('SFTP Information')
+                            ->columnSpanFull()
                             ->hidden(fn () => !auth()->user()->can(Permission::ACTION_FILE_SFTP, $server))
                             ->label('SFTP Information')
                             ->columns([
@@ -191,6 +196,7 @@ class Settings extends ServerFormPage
                             ]),
                     ]),
                 Section::make('Reinstall Server')
+                    ->columnSpanFull()
                     ->hidden(fn () => !auth()->user()->can(Permission::ACTION_SETTINGS_REINSTALL, $server))
                     ->collapsible()
                     ->footerActions([
diff --git a/app/Providers/Filament/AppPanelProvider.php b/app/Providers/Filament/AppPanelProvider.php
index e10912895..f1d08536a 100644
--- a/app/Providers/Filament/AppPanelProvider.php
+++ b/app/Providers/Filament/AppPanelProvider.php
@@ -27,7 +27,7 @@ class AppPanelProvider extends PanelProvider
     {
         return $panel
             ->id('app')
-            ->spa()
+            //->spa()
             ->databaseNotifications()
             ->breadcrumbs(false)
             ->brandName(config('app.name', 'Pelican'))
diff --git a/app/Providers/Filament/ServerPanelProvider.php b/app/Providers/Filament/ServerPanelProvider.php
index ecf12edf2..8ad139e44 100644
--- a/app/Providers/Filament/ServerPanelProvider.php
+++ b/app/Providers/Filament/ServerPanelProvider.php
@@ -34,7 +34,7 @@ class ServerPanelProvider extends PanelProvider
             ->id('server')
             ->path('server')
             ->homeUrl('/')
-            ->spa()
+            //->spa()
             ->databaseNotifications()
             ->tenant(Server::class)
             ->brandName(config('app.name', 'Pelican'))
diff --git a/resources/views/filament/pages/health.blade.php b/resources/views/filament/pages/health.blade.php
index 7503e242e..c86ac4730 100644
--- a/resources/views/filament/pages/health.blade.php
+++ b/resources/views/filament/pages/health.blade.php
@@ -1,10 +1,13 @@
-@php
-    use Illuminate\View\ComponentAttributeBag;
-@endphp
-
 <x-filament-panels::page>
+    @php
+        $getId = fn () => 'health-results-grid';
+    @endphp
     @if (count($checkResults?->storedCheckResults ?? []))
-        <div {{ $getExtraAttributeBag()->when(! $isInline, fn (ComponentAttributeBag $attributes) => $attributes->grid($getColumns(), $gridDirection)) }}>
+
+        <x-filament-schemas::grid
+            :getId="$getId"
+            :
+        >
             @foreach ($checkResults->storedCheckResults as $result)
                 <div
                     class="flex items-start px-4 py-5 space-x-2 md:space-x-3 overflow-hidden shadow-lg rounded-xl bg-white dark:bg-gray-900 ring-1 ring-gray-950/5 dark:ring-white/10 sm:p-6">
@@ -27,7 +30,7 @@
                     </div>
                 </div>
             @endforeach
-        </div>
+        </x-filament-schemas::grid>
     @endif
 
     @if ($lastRanAt)
diff --git a/resources/views/filament/pages/settings.blade.php b/resources/views/filament/pages/settings.blade.php
index ae8edc1a3..7c36460b0 100644
--- a/resources/views/filament/pages/settings.blade.php
+++ b/resources/views/filament/pages/settings.blade.php
@@ -2,12 +2,9 @@
     @class([
         'fi-page-settings'
     ])
+    id="form"
+    :wire:key="$this->getId() . '.forms.' . $this->getFormStatePath()"
+    wire:submit="save"
 >
-    <x-filament-panels::form
-        id="form"
-        :wire:key="$this->getId() . '.forms.' . $this->getFormStatePath()"
-        wire:submit="save"
-    >
-        {{ $this->form }}
-    </x-filament-panels::form>
+    {{ $this->form }}
 </x-filament-panels::page>
diff --git a/resources/views/filament/server/pages/server-form-page.blade.php b/resources/views/filament/server/pages/server-form-page.blade.php
index 47914b50c..aa7966319 100644
--- a/resources/views/filament/server/pages/server-form-page.blade.php
+++ b/resources/views/filament/server/pages/server-form-page.blade.php
@@ -1,9 +1,6 @@
-<x-filament-panels::page>
-    <x-filament-panels::form
-        id="form"
-        :wire:key="$this->getId() . '.forms.' . $this->getFormStatePath()"
-        wire:submit="save"
-    >
-        {{ $this->form }}
-    </x-filament-panels::form>
+<x-filament-panels::page
+    id="form"
+    :wire:key="$this->getId() . '.forms.' . $this->getFormStatePath()"
+    wire:submit="save">
+    {{ $this->form }}
 </x-filament-panels::page>