diff --git a/cp/app/Controllers/FinancialsController.php b/cp/app/Controllers/FinancialsController.php
index 89bdce3..31ba0ba 100644
--- a/cp/app/Controllers/FinancialsController.php
+++ b/cp/app/Controllers/FinancialsController.php
@@ -35,6 +35,8 @@ class FinancialsController extends Controller
         }
 
         $db = $this->container->get('db');
+        // Get the current URI
+        $uri = $request->getUri()->getPath();
         $invoice_details = $db->selectRow('SELECT * FROM invoices WHERE invoice_number = ?',
         [ $invoiceNumber ]
         );
@@ -51,7 +53,8 @@ class FinancialsController extends Controller
         return view($response,'admin/financials/viewInvoice.twig', [
             'invoice_details' => $invoice_details,
             'billing' => $billing,
-            'statement' => $statement
+            'statement' => $statement,
+            'currentUri' => $uri
         ]);
 
     }
diff --git a/cp/resources/views/layouts/app.twig b/cp/resources/views/layouts/app.twig
index 71a66d8..b5414d2 100644
--- a/cp/resources/views/layouts/app.twig
+++ b/cp/resources/views/layouts/app.twig
@@ -165,7 +165,7 @@
                     </a>
                   </div>
                 </li>
-                <li {{ is_current_url('deposit') or is_current_url('transactions') or is_current_url('overview') or is_current_url('invoices') or is_current_url('success') ? 'class="nav-item dropdown active"' : 'class="nav-item dropdown"' }}>
+                <li {{ is_current_url('deposit') or is_current_url('transactions') or is_current_url('overview') or is_current_url('invoices') or is_current_url('success') or 'invoice' in currentUri ? 'class="nav-item dropdown active"' : 'class="nav-item dropdown"' }}>
                   <a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" data-bs-auto-close="outside" role="button" aria-expanded="false">
                     <span class="nav-link-icon d-md-none d-lg-inline-block"><svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M7 9m0 2a2 2 0 0 1 2 -2h10a2 2 0 0 1 2 2v6a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2z"></path><path d="M14 14m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0"></path><path d="M17 9v-2a2 2 0 0 0 -2 -2h-10a2 2 0 0 0 -2 2v6a2 2 0 0 0 2 2h2"></path></svg>
                     </span>
diff --git a/database/registry.mariadb.sql b/database/registry.mariadb.sql
index d841219..02f5d6b 100644
--- a/database/registry.mariadb.sql
+++ b/database/registry.mariadb.sql
@@ -178,6 +178,7 @@ CREATE TABLE IF NOT EXISTS `registry`.`statement` (
 CREATE TABLE IF NOT EXISTS `registry`.`invoices` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY,
     `registrar_id` INT(10) UNSIGNED,
+    `invoice_number` varchar(25) default NULL,
     `billing_contact_id` INT(10) UNSIGNED,
     `issue_date` DATETIME(3),
     `due_date` DATETIME(3) default NULL,
diff --git a/database/registry.postgres.sql b/database/registry.postgres.sql
index 970cc05..4e8fb1d 100644
--- a/database/registry.postgres.sql
+++ b/database/registry.postgres.sql
@@ -172,7 +172,7 @@ CREATE TABLE registry.statement (
      "registrar_id" int CHECK ("registrar_id" >= 0) NOT NULL,
      "date"   timestamp(3) without time zone NOT NULL,
      "command" varchar CHECK ("command" IN ( 'create','renew','transfer','restore','autoRenew' )) NOT NULL default 'create',
-     "domain_name"   varchar(68) NOT NULL,
+     "domain_name" varchar(68) NOT NULL,
      "length_in_months"  smallint CHECK ("length_in_months" >= 0) NOT NULL,
      "from"   timestamp(3) without time zone NOT NULL,
      "to"   timestamp(3) without time zone NOT NULL,
@@ -183,6 +183,7 @@ CREATE TABLE registry.statement (
 CREATE TABLE registry.invoices (
      "id" SERIAL PRIMARY KEY,
      "registrar_id" INT,
+     "invoice_number" varchar(25) DEFAULT NULL,
      "billing_contact_id" INT,
      "issue_date" TIMESTAMP(3),
      "due_date" TIMESTAMP(3) DEFAULT NULL,