diff --git a/app/Http/Livewire/SubscriptionInvoicesTable.php b/app/Http/Livewire/SubscriptionInvoicesTable.php
index 787662596ddf..4c5a56355fca 100644
--- a/app/Http/Livewire/SubscriptionInvoicesTable.php
+++ b/app/Http/Livewire/SubscriptionInvoicesTable.php
@@ -30,6 +30,7 @@ class SubscriptionInvoicesTable extends Component
             ->where('client_id', auth('contact')->user()->client->id)
             ->whereNotNull('subscription_id')
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
+            ->where('balance', '=', 0)
             ->paginate($this->per_page);
 
         return render('components.livewire.subscriptions-invoices-table', [
diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php
index d78a530247c2..4178cbfba3f3 100644
--- a/app/Services/Subscription/SubscriptionService.php
+++ b/app/Services/Subscription/SubscriptionService.php
@@ -122,7 +122,8 @@ class SubscriptionService
             'context' => 'is_eligible',
             'subscription' => $this->subscription->hashed_id,
             'contact' => $contact->hashed_id,
-            'contact_email' => $contact->email
+            'contact_email' => $contact->email,
+            'client' => $contact->client->hashed_id,
         ];
 
         $response = $this->triggerWebhook($context);
@@ -277,4 +278,28 @@ class SubscriptionService
     {
         return Product::whereIn('id', $this->transformKeys(explode(",", $this->subscription->recurring_product_ids)))->get();
     }
+
+    /**
+     * Get available upgrades & downgrades for the plan.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     */
+    public function getPlans()
+    {
+        return Subscription::query()
+            ->where('company_id', $this->subscription->company_id)
+            ->where('group_id', $this->subscription->group_id)
+            ->where('id', '!=', $this->subscription->id)
+            ->get();
+    }
+
+    public function completePlanChange(PaymentHash $paymentHash)
+    {
+        // .. handle redirect, after upgrade redirects, etc..
+    }
+
+    public function handleCancellation()
+    {
+        // ..
+    }
 }
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 408d8a4add7b..f1668102b436 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4202,6 +4202,7 @@ $LANG = array(
      'invoice_task_datelog_help' => 'Add date details to the invoice line items',
      'promo_code' => 'Promo code',
      'recurring_invoice_issued_to' => 'Recurring invoice issued to',
+     'subscription' => 'Subscription',
 );
 
 return $LANG;
diff --git a/resources/views/portal/ninja2020/components/livewire/subscriptions-invoices-table.blade.php b/resources/views/portal/ninja2020/components/livewire/subscriptions-invoices-table.blade.php
index 086b4d0b6a52..5e821756fea7 100644
--- a/resources/views/portal/ninja2020/components/livewire/subscriptions-invoices-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/subscriptions-invoices-table.blade.php
@@ -19,6 +19,11 @@
             <table class="min-w-full shadow rounded border border-gray-200 mt-4 credits-table">
                 <thead>
                 <tr>
+                    <th class="px-6 py-3 text-xs font-medium leading-4 tracking-wider text-left text-white uppercase border-b border-gray-200 bg-primary">
+                        <p role="button" wire:click="sortBy('number')" class="cursor-pointer">
+                            {{ ctrans('texts.subscription') }}
+                        </p>
+                    </th>
                     <th class="px-6 py-3 text-xs font-medium leading-4 tracking-wider text-left text-white uppercase border-b border-gray-200 bg-primary">
                         <p role="button" wire:click="sortBy('number')" class="cursor-pointer">
                             {{ ctrans('texts.invoice') }}
@@ -26,7 +31,7 @@
                     </th>
                     <th class="px-6 py-3 border-b border-gray-200 bg-primary text-left text-xs leading-4 font-medium text-white uppercase tracking-wider">
                         <p role="button" wire:click="sortBy('amount')" class="cursor-pointer">
-                            {{ ctrans('texts.total') }}
+                            {{ ctrans('texts.amount') }}
                         </p>
                     </th>
                     <th class="px-6 py-3 border-b border-gray-200 bg-primary text-left text-xs leading-4 font-medium text-white uppercase tracking-wider">
@@ -39,6 +44,9 @@
                 <tbody>
                 @forelse($invoices as $invoice)
                     <tr class="bg-white group hover:bg-gray-100">
+                        <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
+                            {{ $invoice->subscription->name }}
+                        </td>
                         <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
                             <a href="{{ route('client.invoice.show', $invoice->hashed_id) }}"
                                class="button-link text-primary">
diff --git a/resources/views/portal/ninja2020/components/livewire/subscriptions-recurring-invoices-table.blade.php b/resources/views/portal/ninja2020/components/livewire/subscriptions-recurring-invoices-table.blade.php
index 69de922ef00f..a34534abd86e 100644
--- a/resources/views/portal/ninja2020/components/livewire/subscriptions-recurring-invoices-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/subscriptions-recurring-invoices-table.blade.php
@@ -19,6 +19,11 @@
             <table class="min-w-full shadow rounded border border-gray-200 mt-4 credits-table">
                 <thead>
                 <tr>
+                    <th class="px-6 py-3 text-xs font-medium leading-4 tracking-wider text-left text-white uppercase border-b border-gray-200 bg-primary">
+                        <p role="button" wire:click="sortBy('number')" class="cursor-pointer">
+                            {{ ctrans('texts.subscription') }}
+                        </p>
+                    </th>
                     <th class="px-6 py-3 text-xs font-medium leading-4 tracking-wider text-left text-white uppercase border-b border-gray-200 bg-primary">
                         <p role="button" wire:click="sortBy('number')" class="cursor-pointer">
                             {{ ctrans('texts.invoice') }}
@@ -26,7 +31,7 @@
                     </th>
                     <th class="px-6 py-3 border-b border-gray-200 bg-primary text-left text-xs leading-4 font-medium text-white uppercase tracking-wider">
                         <p role="button" wire:click="sortBy('amount')" class="cursor-pointer">
-                            {{ ctrans('texts.total') }}
+                            {{ ctrans('texts.amount') }}
                         </p>
                     </th>
                     <th class="px-6 py-3 border-b border-gray-200 bg-primary text-left text-xs leading-4 font-medium text-white uppercase tracking-wider">
@@ -39,6 +44,9 @@
                 <tbody>
                 @forelse($recurring_invoices as $recurring_invoice)
                     <tr class="bg-white group hover:bg-gray-100">
+                        <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
+                            {{ $recurring_invoice->subscription->name }}
+                        </td>
                         <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
                             <a href="{{ route('client.recurring_invoice.show', $recurring_invoice->hashed_id) }}"
                                class="button-link text-primary">
diff --git a/resources/views/portal/ninja2020/recurring_invoices/show.blade.php b/resources/views/portal/ninja2020/recurring_invoices/show.blade.php
index fb25f6beaed2..a64dbb2f8300 100644
--- a/resources/views/portal/ninja2020/recurring_invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/recurring_invoices/show.blade.php
@@ -85,5 +85,10 @@
             </div>
         @endif
 
+        @if($invoice->subscription->allow_plan_changes)
+            @foreach($invoice->subscription->service()->getPlans() as $subscription)
+                <a href="#">{{ $subscription->name }}</a>
+            @endforeach
+        @endif
     </div>
 @endsection