diff --git a/src/app/Livewire/Checkout/Index.php b/src/app/Livewire/Checkout/Index.php
index 298644e..b1d999a 100644
--- a/src/app/Livewire/Checkout/Index.php
+++ b/src/app/Livewire/Checkout/Index.php
@@ -155,7 +155,7 @@ class Index extends Component
     public function render()
     {
         return view('livewire.checkout.index', [
-            'features' => $this->plan->features()->with('group')->orderBy('sort')->get(),
+            'features' => $this->plan->features()->with('group')->orderBy('sort')->orderBy('id')->get(),
         ])->layout('layouts.app');
     }
 }
diff --git a/src/resources/views/livewire/checkout/index.blade.php b/src/resources/views/livewire/checkout/index.blade.php
index 0fc0bd4..805b59c 100644
--- a/src/resources/views/livewire/checkout/index.blade.php
+++ b/src/resources/views/livewire/checkout/index.blade.php
@@ -268,7 +268,7 @@
                             <label class="flex items-start gap-3 cursor-pointer group">
                                 <input
                                     type="checkbox"
-                                    wire:model="rightAcknowledged"
+                                    wire:model.live="rightAcknowledged"
                                     class="mt-0.5 rounded border-amber-300 text-amber-500 focus:ring-amber-400 shrink-0"
                                 />
                                 <span class="text-[11px] text-amber-800 leading-relaxed">
@@ -278,7 +278,7 @@
                             <label class="flex items-start gap-3 cursor-pointer group">
                                 <input
                                     type="checkbox"
-                                    wire:model="waiverConfirmed"
+                                    wire:model.live="waiverConfirmed"
                                     class="mt-0.5 rounded border-amber-300 text-amber-500 focus:ring-amber-400 shrink-0"
                                 />
                                 <span class="text-[11px] text-amber-800 leading-relaxed">
@@ -310,7 +310,7 @@
                         <button
                             wire:click="startCheckout"
                             wire:loading.attr="disabled"
-                            @if(!$rightAcknowledged || !$waiverConfirmed) disabled @endif
+                            :disabled="!$wire.rightAcknowledged || !$wire.waiverConfirmed"
                             class="w-full flex items-center justify-center gap-2 px-5 py-3.5 rounded-xl bg-indigo-600 text-white font-semibold hover:bg-indigo-700 active:scale-95 transition-all shadow-sm shadow-indigo-200 disabled:opacity-60">
                             <span wire:loading.remove wire:target="startCheckout">
                                 <x-heroicon-o-arrow-path class="w-4 h-4 inline-block mr-1 opacity-70"/>
@@ -328,7 +328,7 @@
                         <button
                             wire:click="startCheckout"
                             wire:loading.attr="disabled"
-                            @if(!$rightAcknowledged || !$waiverConfirmed) disabled @endif
+                            :disabled="!$wire.rightAcknowledged || !$wire.waiverConfirmed"
                             class="w-full flex items-center justify-center gap-2 px-5 py-3.5 rounded-xl bg-indigo-600 text-white font-semibold hover:bg-indigo-700 active:scale-95 transition-all shadow-sm shadow-indigo-200 disabled:opacity-60">
                             <span wire:loading.remove wire:target="startCheckout">
                                 <x-heroicon-o-lock-closed class="w-4 h-4 inline-block mr-1 opacity-70"/>