diff --git a/app/Http/Livewire/Project/Application/EnvironmentVariable.php b/app/Http/Livewire/Project/Application/EnvironmentVariable.php
deleted file mode 100644
index aeb15c878..000000000
--- a/app/Http/Livewire/Project/Application/EnvironmentVariable.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-use App\Models\Application;
-use Illuminate\Support\Facades\Request;
-use Illuminate\Support\Facades\Route;
-use Livewire\Component;
-
-class EnvironmentVariable extends Component
-{
-    public $parameters;
-    public $env;
-    public string|null $keyName = null;
-    public string|null $value = null;
-    public bool $isBuildOnly = false;
-    public bool $isNewEnv = false;
-
-    public function mount()
-    {
-        $this->parameters = Route::current()->parameters();
-        if (data_get($this->env, 'value') !== null) {
-            $this->value = $this->env['value'];
-            $this->isBuildOnly = $this->env['isBuildOnly'];
-        } else {
-            $this->isNewEnv = true;
-        }
-    }
-    public function updateEnv()
-    {
-        $application = Application::where('uuid', $this->parameters['application_uuid'])->first();
-        $application->environment_variables->set("{$this->keyName}.value", $this->value);
-        $application->environment_variables->set("{$this->keyName}.isBuildOnly", $this->isBuildOnly);
-        $application->save();
-    }
-    public function submit()
-    {
-        $this->updateEnv();
-        $this->emit('reloadWindow');
-    }
-    public function delete()
-    {
-        $application = Application::where('uuid', $this->parameters['application_uuid'])->first();
-        $application->environment_variables->forget($this->keyName);
-        $application->save();
-        $this->emit('reloadWindow');
-    }
-}
diff --git a/app/Http/Livewire/Project/Application/EnvironmentVariable/Add.php b/app/Http/Livewire/Project/Application/EnvironmentVariable/Add.php
new file mode 100644
index 000000000..c6bd504f5
--- /dev/null
+++ b/app/Http/Livewire/Project/Application/EnvironmentVariable/Add.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Livewire\Project\Application\EnvironmentVariable;
+
+use App\Models\Application;
+use App\Models\EnvironmentVariable;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Route;
+use Livewire\Component;
+
+class Add extends Component
+{
+    public $parameters;
+    public string $key;
+    public string $value;
+    public bool $is_build_time = false;
+
+    public function mount()
+    {
+        $this->parameters = Route::current()->parameters();
+    }
+    public function submit()
+    {
+        try {
+            $application_id = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail()->id;
+            EnvironmentVariable::create([
+                'key' => $this->key,
+                'value' => $this->value,
+                'is_build_time' => $this->is_build_time,
+                'application_id' => $application_id,
+            ]);
+            $this->emit('reloadWindow');
+        } catch (mixed $e) {
+            dd('asdf');
+            if ($e instanceof QueryException) {
+                dd($e->errorInfo);
+                $this->emit('error', $e->errorInfo[2]);
+            } else {
+                $this->emit('error', $e);
+            }
+        }
+    }
+}
diff --git a/app/Http/Livewire/Project/Application/EnvironmentVariable/Show.php b/app/Http/Livewire/Project/Application/EnvironmentVariable/Show.php
new file mode 100644
index 000000000..f32260ca0
--- /dev/null
+++ b/app/Http/Livewire/Project/Application/EnvironmentVariable/Show.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Livewire\Project\Application\EnvironmentVariable;
+
+use App\Models\Application;
+use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Route;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public $parameters;
+    public ModelsEnvironmentVariable $env;
+
+    protected $rules = [
+        'env.key' => 'required|string',
+        'env.value' => 'required|string',
+        'env.is_build_time' => 'required|boolean',
+    ];
+    public function mount()
+    {
+        $this->parameters = Route::current()->parameters();
+    }
+    public function submit()
+    {
+        $this->validate();
+        $this->env->save();
+    }
+    public function delete()
+    {
+        $this->env->delete();
+        $this->emit('reloadWindow');
+    }
+}
diff --git a/app/Models/Application.php b/app/Models/Application.php
index c63e6d6d0..8e518c417 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -4,8 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Spatie\Activitylog\Models\Activity;
-use Illuminate\Database\Eloquent\Builder;
-use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Application extends BaseModel
 {
@@ -38,14 +37,6 @@ class Application extends BaseModel
         'ports_exposes',
         'publish_directory',
     ];
-    public $casts = [
-        'environment_variables' => SchemalessAttributes::class,
-    ];
-    public function scopeWithEnvironmentVariables(): Builder
-    {
-        return $this->environment_variables->modelScope();
-    }
-
     public function publishDirectory(): Attribute
     {
         return Attribute::make(
@@ -83,6 +74,10 @@ class Application extends BaseModel
                 : explode(',', $this->ports_exposes)
         );
     }
+    public function environment_variables(): HasMany
+    {
+        return $this->hasMany(EnvironmentVariable::class);
+    }
     public function environment()
     {
         return $this->belongsTo(Environment::class);
diff --git a/app/Models/EnvironmentVariable.php b/app/Models/EnvironmentVariable.php
new file mode 100644
index 000000000..5c61fca74
--- /dev/null
+++ b/app/Models/EnvironmentVariable.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
+
+class EnvironmentVariable extends Model
+{
+
+    protected $fillable = ['key', 'value', 'is_build_time', 'application_id'];
+    protected $casts = [
+        'value' => 'encrypted',
+        'is_build_time' => 'boolean',
+    ];
+    private function get_environment_variables(string $environment_variable): string|null
+    {
+        $team_id = session('currentTeam')->id;
+        if (str_contains(trim($environment_variable), '{{') && str_contains(trim($environment_variable), '}}')) {
+            $environment_variable = preg_replace('/\s+/', '', $environment_variable);
+            $environment_variable = str_replace('{{', '', $environment_variable);
+            $environment_variable = str_replace('}}', '', $environment_variable);
+            if (str_starts_with($environment_variable, 'global.')) {
+                $environment_variable = str_replace('global.', '', $environment_variable);
+                // $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
+                return $environment_variable;
+            }
+        }
+        return decrypt($environment_variable);
+    }
+    private function set_environment_variables(string $environment_variable): string|null
+    {
+        if (!str_contains(trim($environment_variable), '{{') && !str_contains(trim($environment_variable), '}}')) {
+            return encrypt($environment_variable);
+        }
+        return $environment_variable;
+    }
+    protected function value(): Attribute
+    {
+        return Attribute::make(
+            get: fn (string $value) => $this->get_environment_variables($value),
+            set: fn (string $value) => $this->set_environment_variables($value),
+        );
+    }
+}
diff --git a/database/migrations/2023_03_27_081716_create_applications_table.php b/database/migrations/2023_03_27_081716_create_applications_table.php
index 462b58e6f..b408589d2 100644
--- a/database/migrations/2023_03_27_081716_create_applications_table.php
+++ b/database/migrations/2023_03_27_081716_create_applications_table.php
@@ -39,8 +39,6 @@ return new class extends Migration
             $table->string('base_directory')->default('/');
             $table->string('publish_directory')->nullable();
 
-            $table->schemalessAttributes('environment_variables');
-
             $table->string('health_check_path')->default('/');
             $table->string('health_check_port')->nullable();
             $table->string('health_check_host')->default('localhost');
diff --git a/database/migrations/2023_05_04_194548_create_environment_variables_table.php b/database/migrations/2023_05_04_194548_create_environment_variables_table.php
new file mode 100644
index 000000000..758e74227
--- /dev/null
+++ b/database/migrations/2023_05_04_194548_create_environment_variables_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('environment_variables', function (Blueprint $table) {
+            $table->id();
+
+            $table->string('key');
+            $table->string('value')->nullable();
+            $table->boolean('is_build_time')->default(false);
+
+            $table->foreignId('application_id')->nullable();
+            $table->foreignId('service_id')->nullable();
+            $table->foreignId('database_id')->nullable();
+
+            $table->unique(['key', 'application_id', 'is_build_time']);
+            $table->unique(['key', 'service_id', 'is_build_time']);
+            $table->unique(['key', 'database_id', 'is_build_time']);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('environment_variables');
+    }
+};
diff --git a/database/seeders/ApplicationSeeder.php b/database/seeders/ApplicationSeeder.php
index 3f17d6ee6..2a03a7911 100644
--- a/database/seeders/ApplicationSeeder.php
+++ b/database/seeders/ApplicationSeeder.php
@@ -35,16 +35,6 @@ class ApplicationSeeder extends Seeder
             'destination_type' => StandaloneDocker::class,
             'source_id' => $github_public_source->id,
             'source_type' => GithubApp::class,
-            'environment_variables' => [
-                'NODE_ENV' => [
-                    'value' => 'production',
-                    'isBuildOnly' => true,
-                ],
-                'PORT' =>  [
-                    'value' => 3000,
-                    'isBuildOnly' => false,
-                ]
-            ]
         ]);
     }
 }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 9e1e78669..a45d8462e 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -2,6 +2,7 @@
 
 namespace Database\Seeders;
 
+use App\Models\Environment;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
@@ -27,6 +28,7 @@ class DatabaseSeeder extends Seeder
             ApplicationSettingsSeeder::class,
             DBSeeder::class,
             ServiceSeeder::class,
+            EnvironmentVariableSeeder::class,
             LocalPersistentVolumeSeeder::class,
         ]);
     }
diff --git a/database/seeders/EnvironmentVariableSeeder.php b/database/seeders/EnvironmentVariableSeeder.php
new file mode 100644
index 000000000..d49e97fc2
--- /dev/null
+++ b/database/seeders/EnvironmentVariableSeeder.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\EnvironmentVariable;
+use Illuminate\Database\Seeder;
+
+class EnvironmentVariableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        EnvironmentVariable::create([
+            'key' => 'NODE_ENV',
+            'value' => 'production',
+            'is_build_time' => true,
+            'application_id' => 1,
+        ]);
+    }
+}
diff --git a/resources/views/components/inputs/input.blade.php b/resources/views/components/inputs/input.blade.php
index 9f04097c4..975e59f8d 100644
--- a/resources/views/components/inputs/input.blade.php
+++ b/resources/views/components/inputs/input.blade.php
@@ -26,7 +26,8 @@
     @if ($type === 'textarea')
         <textarea {{ $attributes }} type={{ $type }} id={{ $id }} wire:model.defer={{ $id }}></textarea>
     @else
-        <input {{ $attributes }} type={{ $type }} id={{ $id }}
+        <input wire:dirty.class="text-black bg-amber-300" {{ $attributes }} type={{ $type }}
+            id={{ $id }}
             @if ($instantSave) wire:click='instantSave' wire:model.defer={{ $id }} @else wire:model.defer={{ $value ?? $id }} @endif />
     @endif
 
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php
index 258df343c..b9ba8c3a9 100644
--- a/resources/views/components/layout.blade.php
+++ b/resources/views/components/layout.blade.php
@@ -76,6 +76,9 @@
             Livewire.on('reloadWindow', () => {
                 window.location.reload();
             })
+            Livewire.on('error', (message) => {
+                alert(message);
+            })
         </script>
     @endauth
 </body>
diff --git a/resources/views/components/naked-modal.blade.php b/resources/views/components/naked-modal.blade.php
new file mode 100644
index 000000000..b78c09b3e
--- /dev/null
+++ b/resources/views/components/naked-modal.blade.php
@@ -0,0 +1,19 @@
+@props([
+    'show' => null,
+    'message' => 'Are you sure you want to delete this?',
+    'action' => 'delete',
+])
+<div x-cloak x-show="{{ $show }}" x-transition.opacity class="fixed inset-0 bg-slate-900/75"></div>
+<div x-cloak x-show="{{ $show }}" x-transition class="fixed inset-0 z-50 flex items-center justify-center">
+    <div @click.away="{{ $show }} = false" class="w-screen h-20 max-w-xl mx-auto bg-black rounded-lg">
+        <div class="flex flex-col items-center justify-center h-full">
+            <div class="pb-5 text-white">{{ $message }}</div>
+            <div>
+                <x-inputs.button isWarning wire:click='{{ $action }}'>
+                    Yes
+                </x-inputs.button>
+                <x-inputs.button x-on:click="{{ $show }} = false">No</x-inputs.button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php
new file mode 100644
index 000000000..5c586db96
--- /dev/null
+++ b/resources/views/errors/401.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Unauthorized'))
+@section('code', '401')
+@section('message', __('Unauthorized'))
diff --git a/resources/views/errors/402.blade.php b/resources/views/errors/402.blade.php
new file mode 100644
index 000000000..3bc23efd2
--- /dev/null
+++ b/resources/views/errors/402.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Payment Required'))
+@section('code', '402')
+@section('message', __('Payment Required'))
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
new file mode 100644
index 000000000..a5506f01f
--- /dev/null
+++ b/resources/views/errors/403.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Forbidden'))
+@section('code', '403')
+@section('message', __($exception->getMessage() ?: 'Forbidden'))
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
new file mode 100644
index 000000000..7549540d8
--- /dev/null
+++ b/resources/views/errors/404.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Not Found'))
+@section('code', '404')
+@section('message', __('Not Found'))
diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.php
new file mode 100644
index 000000000..c09216e21
--- /dev/null
+++ b/resources/views/errors/419.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Page Expired'))
+@section('code', '419')
+@section('message', __('Page Expired'))
diff --git a/resources/views/errors/429.blade.php b/resources/views/errors/429.blade.php
new file mode 100644
index 000000000..f01b07b8e
--- /dev/null
+++ b/resources/views/errors/429.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Too Many Requests'))
+@section('code', '429')
+@section('message', __('Too Many Requests'))
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
new file mode 100644
index 000000000..d9e95d9b9
--- /dev/null
+++ b/resources/views/errors/500.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Server Error'))
+@section('code', '500')
+@section('message', __('Server Error'))
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
new file mode 100644
index 000000000..c5a9dde14
--- /dev/null
+++ b/resources/views/errors/503.blade.php
@@ -0,0 +1,5 @@
+@extends('errors::minimal')
+
+@section('title', __('Service Unavailable'))
+@section('code', '503')
+@section('message', __('Service Unavailable'))
diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php
new file mode 100644
index 000000000..019c2cde1
--- /dev/null
+++ b/resources/views/errors/layout.blade.php
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>@yield('title')</title>
+
+        <!-- Styles -->
+        <style>
+            html, body {
+                background-color: #fff;
+                color: #636b6f;
+                font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+                font-weight: 100;
+                height: 100vh;
+                margin: 0;
+            }
+
+            .full-height {
+                height: 100vh;
+            }
+
+            .flex-center {
+                align-items: center;
+                display: flex;
+                justify-content: center;
+            }
+
+            .position-ref {
+                position: relative;
+            }
+
+            .content {
+                text-align: center;
+            }
+
+            .title {
+                font-size: 36px;
+                padding: 20px;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="flex-center position-ref full-height">
+            <div class="content">
+                <div class="title">
+                    @yield('message')
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php
new file mode 100644
index 000000000..db69f254f
--- /dev/null
+++ b/resources/views/errors/minimal.blade.php
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>@yield('title')</title>
+
+        <style>
+            /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}a{background-color:transparent}code{font-family:monospace,monospace;font-size:1em}[hidden]{display:none}html{font-family:system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}*,:after,:before{box-sizing:border-box;border:0 solid #e2e8f0}a{color:inherit;text-decoration:inherit}code{font-family:Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}svg,video{display:block;vertical-align:middle}video{max-width:100%;height:auto}.bg-white{--bg-opacity:1;background-color:#fff;background-color:rgba(255,255,255,var(--bg-opacity))}.bg-gray-100{--bg-opacity:1;background-color:#f7fafc;background-color:rgba(247,250,252,var(--bg-opacity))}.border-gray-200{--border-opacity:1;border-color:#edf2f7;border-color:rgba(237,242,247,var(--border-opacity))}.border-gray-400{--border-opacity:1;border-color:#cbd5e0;border-color:rgba(203,213,224,var(--border-opacity))}.border-t{border-top-width:1px}.border-r{border-right-width:1px}.flex{display:flex}.grid{display:grid}.hidden{display:none}.items-center{align-items:center}.justify-center{justify-content:center}.font-semibold{font-weight:600}.h-5{height:1.25rem}.h-8{height:2rem}.h-16{height:4rem}.text-sm{font-size:.875rem}.text-lg{font-size:1.125rem}.leading-7{line-height:1.75rem}.mx-auto{margin-left:auto;margin-right:auto}.ml-1{margin-left:.25rem}.mt-2{margin-top:.5rem}.mr-2{margin-right:.5rem}.ml-2{margin-left:.5rem}.mt-4{margin-top:1rem}.ml-4{margin-left:1rem}.mt-8{margin-top:2rem}.ml-12{margin-left:3rem}.-mt-px{margin-top:-1px}.max-w-xl{max-width:36rem}.max-w-6xl{max-width:72rem}.min-h-screen{min-height:100vh}.overflow-hidden{overflow:hidden}.p-6{padding:1.5rem}.py-4{padding-top:1rem;padding-bottom:1rem}.px-4{padding-left:1rem;padding-right:1rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.pt-8{padding-top:2rem}.fixed{position:fixed}.relative{position:relative}.top-0{top:0}.right-0{right:0}.shadow{box-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px 0 rgba(0,0,0,.06)}.text-center{text-align:center}.text-gray-200{--text-opacity:1;color:#edf2f7;color:rgba(237,242,247,var(--text-opacity))}.text-gray-300{--text-opacity:1;color:#e2e8f0;color:rgba(226,232,240,var(--text-opacity))}.text-gray-400{--text-opacity:1;color:#cbd5e0;color:rgba(203,213,224,var(--text-opacity))}.text-gray-500{--text-opacity:1;color:#a0aec0;color:rgba(160,174,192,var(--text-opacity))}.text-gray-600{--text-opacity:1;color:#718096;color:rgba(113,128,150,var(--text-opacity))}.text-gray-700{--text-opacity:1;color:#4a5568;color:rgba(74,85,104,var(--text-opacity))}.text-gray-900{--text-opacity:1;color:#1a202c;color:rgba(26,32,44,var(--text-opacity))}.uppercase{text-transform:uppercase}.underline{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.tracking-wider{letter-spacing:.05em}.w-5{width:1.25rem}.w-8{width:2rem}.w-auto{width:auto}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}@-webkit-keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@-webkit-keyframes ping{0%{transform:scale(1);opacity:1}75%,to{transform:scale(2);opacity:0}}@keyframes ping{0%{transform:scale(1);opacity:1}75%,to{transform:scale(2);opacity:0}}@-webkit-keyframes pulse{0%,to{opacity:1}50%{opacity:.5}}@keyframes pulse{0%,to{opacity:1}50%{opacity:.5}}@-webkit-keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:translateY(0);-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}@keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:translateY(0);-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}@media (min-width:640px){.sm\:rounded-lg{border-radius:.5rem}.sm\:block{display:block}.sm\:items-center{align-items:center}.sm\:justify-start{justify-content:flex-start}.sm\:justify-between{justify-content:space-between}.sm\:h-20{height:5rem}.sm\:ml-0{margin-left:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:pt-0{padding-top:0}.sm\:text-left{text-align:left}.sm\:text-right{text-align:right}}@media (min-width:768px){.md\:border-t-0{border-top-width:0}.md\:border-l{border-left-width:1px}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}}@media (min-width:1024px){.lg\:px-8{padding-left:2rem;padding-right:2rem}}@media (prefers-color-scheme:dark){.dark\:bg-gray-800{--bg-opacity:1;background-color:#2d3748;background-color:rgba(45,55,72,var(--bg-opacity))}.dark\:bg-gray-900{--bg-opacity:1;background-color:#1a202c;background-color:rgba(26,32,44,var(--bg-opacity))}.dark\:border-gray-700{--border-opacity:1;border-color:#4a5568;border-color:rgba(74,85,104,var(--border-opacity))}.dark\:text-white{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.dark\:text-gray-400{--text-opacity:1;color:#cbd5e0;color:rgba(203,213,224,var(--text-opacity))}}
+        </style>
+
+        <style>
+            body {
+                font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+            }
+        </style>
+    </head>
+    <body class="antialiased">
+        <div class="relative flex items-top justify-center min-h-screen bg-gray-100 dark:bg-gray-900 sm:items-center sm:pt-0">
+            <div class="max-w-xl mx-auto sm:px-6 lg:px-8">
+                <div class="flex items-center pt-8 sm:justify-start sm:pt-0">
+                    <div class="px-4 text-lg text-gray-500 border-r border-gray-400 tracking-wider">
+                        @yield('code')
+                    </div>
+
+                    <div class="ml-4 text-lg text-gray-500 uppercase tracking-wider">
+                        @yield('message')
+                    </div>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/resources/views/livewire/project/application/environment-variable.blade.php b/resources/views/livewire/project/application/environment-variable.blade.php
deleted file mode 100644
index 69c224c4e..000000000
--- a/resources/views/livewire/project/application/environment-variable.blade.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<div>
-    @if ($isNewEnv === true)
-        <form wire:submit.prevent='submit' class="flex gap-2 p-4">
-        @else
-            <form wire:submit.prevent='updateEnv' class="flex gap-2 p-4">
-    @endif
-    <input type="text" wire:model.defer="keyName" />
-    <input type="text" wire:model.defer="value" />
-    <div class="flex flex-col">
-        <div class="flex items-center gap-2">
-            <input type="checkbox" wire:model.defer="isBuildOnly" />
-            <label>Used during build?</label>
-        </div>
-    </div>
-    <x-inputs.button type="submit">
-        @if ($isNewEnv)
-            Add
-        @else
-            Update
-        @endif
-    </x-inputs.button>
-    @if ($isNewEnv === false)
-        <x-inputs.button isWarning wire:click.prevent='delete'>
-            Delete
-        </x-inputs.button>
-    @endif
-    </form>
-</div>
diff --git a/resources/views/livewire/project/application/environment-variable/add.blade.php b/resources/views/livewire/project/application/environment-variable/add.blade.php
new file mode 100644
index 000000000..d7dbeadff
--- /dev/null
+++ b/resources/views/livewire/project/application/environment-variable/add.blade.php
@@ -0,0 +1,13 @@
+<form wire:submit.prevent='submit' class="flex gap-2 p-4">
+    <input type="text" wire:model.defer="key" wire:dirty.class="text-black bg-amber-300" />
+    <input type="text" wire:model.defer="value" wire:dirty.class="text-black bg-amber-300" />
+    <div class="flex flex-col">
+        <div class="flex items-center gap-2">
+            <input type="checkbox" wire:model.defer="is_build_time" />
+            <label>Used during build?</label>
+        </div>
+    </div>
+    <x-inputs.button type="submit">
+        Add
+    </x-inputs.button>
+</form>
diff --git a/resources/views/livewire/project/application/environment-variable/show.blade.php b/resources/views/livewire/project/application/environment-variable/show.blade.php
new file mode 100644
index 000000000..e0d54759e
--- /dev/null
+++ b/resources/views/livewire/project/application/environment-variable/show.blade.php
@@ -0,0 +1,19 @@
+<div x-data="{ deleteEnvironment: false }">
+    <form wire:submit.prevent='submit' class="flex gap-2 p-4">
+        <input type="text" wire:model.defer="env.key" wire:dirty.class="text-black bg-amber-300" />
+        <input type="text" wire:model.defer="env.value" wire:dirty.class="text-black bg-amber-300" />
+        <div class="flex flex-col">
+            <div class="flex items-center gap-2">
+                <input type="checkbox" wire:model.defer="env.is_build_time" />
+                <label>Used during build?</label>
+            </div>
+        </div>
+        <x-inputs.button type="submit">
+            Update
+        </x-inputs.button>
+        <x-inputs.button x-on:click="deleteEnvironment = true" isWarning>
+            Delete
+        </x-inputs.button>
+    </form>
+    <x-naked-modal show="deleteEnvironment" message="Are you sure you want to delete {{ $env->key }}?" />
+</div>
diff --git a/resources/views/project/application/configuration.blade.php b/resources/views/project/application/configuration.blade.php
index 10c36a393..91775f5dc 100644
--- a/resources/views/project/application/configuration.blade.php
+++ b/resources/views/project/application/configuration.blade.php
@@ -25,12 +25,13 @@
         </div>
         <div x-cloak x-show="activeTab === 'environment-variables'" class="flex flex-col gap-2">
             <h3>Environment Variables</h3>
-            @forelse ($application->environment_variables->all() as $keyName => $env)
-                <livewire:project.application.environment-variable :keyName="$keyName" :env="$env" />
+            @forelse ($application->environment_variables as $env)
+                <livewire:project.application.environment-variable.show :env="$env" />
             @empty
                 <p>There are no environment variables for this application.</p>
             @endforelse
-            <livewire:project.application.environment-variable />
+            <h4>Add new environment variable</h4>
+            <livewire:project.application.environment-variable.add />
         </div>
         <div x-cloak x-show="activeTab === 'source'">
             <h3>Source</h3>