diff --git a/Modules/Company/Http/Controllers/CompanyController.php b/Modules/Company/Http/Controllers/CompanyController.php
index 9a27f2e0..5bd16514 100644
--- a/Modules/Company/Http/Controllers/CompanyController.php
+++ b/Modules/Company/Http/Controllers/CompanyController.php
@@ -46,7 +46,7 @@ class CompanyController extends Controller
         $company = Company::create($this->validated($request));
 
         return redirect()
-            ->route('platform.companies.show', $company)
+            ->route('platform.companies.index')
             ->with('status', 'Company created.');
     }
 
diff --git a/Modules/Company/Resources/views/index.blade.php b/Modules/Company/Resources/views/index.blade.php
index e6754a13..8433fee2 100644
--- a/Modules/Company/Resources/views/index.blade.php
+++ b/Modules/Company/Resources/views/index.blade.php
@@ -7,15 +7,66 @@
             icon="fa-solid fa-building"
         />
 
-        <div class="flex justify-end">
-            <a
-                href="{{ route('platform.companies.create') }}"
-                class="rounded-xl bg-zinc-900 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-zinc-700 dark:bg-white dark:text-zinc-900"
-            >
-                Create company
-            </a>
-        </div>
 
+
+        @if (session('status'))
+            <div class="rounded-2xl bg-green-50 p-4 text-sm font-semibold text-green-700 ring-1 ring-green-200 dark:bg-green-950 dark:text-green-300 dark:ring-green-900">
+                {{ session('status') }}
+            </div>
+        @endif
+
+        <div class="rounded-3xl bg-white p-6 shadow-sm ring-1 ring-zinc-200 dark:bg-zinc-900 dark:ring-zinc-800">
+            <div class="flex flex-wrap items-start justify-between gap-4">
+                <div>
+                    <h2 class="text-lg font-bold text-zinc-900 dark:text-white">Create company</h2>
+                    <p class="mt-1 text-sm text-zinc-500 dark:text-zinc-400">Add a new tenant without leaving the administration index.</p>
+                </div>
+
+                <a
+                    href="{{ route('platform.companies.create') }}"
+                    class="rounded-xl border border-zinc-300 px-4 py-2 text-sm font-semibold text-zinc-700 hover:bg-zinc-50 dark:border-zinc-700 dark:text-zinc-200 dark:hover:bg-zinc-800"
+                >
+                    Open full form
+                </a>
+            </div>
+
+            <form method="POST" action="{{ route('platform.companies.store') }}" class="mt-5 grid gap-4 md:grid-cols-5">
+                @csrf
+
+                <input
+                    name="name"
+                    value="{{ old('name') }}"
+                    placeholder="Company name"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white"
+                    required
+                >
+
+                <input
+                    name="billing_email"
+                    value="{{ old('billing_email') }}"
+                    placeholder="billing@example.com"
+                    type="email"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white"
+                >
+
+                <select name="status" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white" required>
+                    <option value="active" @selected(old('status', 'active') === 'active')>Active</option>
+                    <option value="suspended" @selected(old('status') === 'suspended')>Suspended</option>
+                    <option value="inactive" @selected(old('status') === 'inactive')>Inactive</option>
+                </select>
+
+                <input
+                    name="timezone"
+                    value="{{ old('timezone', 'Europe/London') }}"
+                    placeholder="Europe/London"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white"
+                >
+
+                <button class="rounded-xl bg-zinc-900 px-4 py-2 font-semibold text-white dark:bg-white dark:text-zinc-900">
+                    Create
+                </button>
+            </form>
+        </div>
         <div class="overflow-x-auto rounded-2xl bg-white shadow-sm ring-1 ring-zinc-200 dark:bg-zinc-900 dark:ring-zinc-800">
             <table class="min-w-full text-sm">
                 <thead>