diff --git a/www/backend/core/com/invoices.cfc b/www/backend/core/com/invoices.cfc
index bc9469f..e6745d0 100644
--- a/www/backend/core/com/invoices.cfc
+++ b/www/backend/core/com/invoices.cfc
@@ -212,8 +212,7 @@ component displayname="invoices" output="false" {
             local.total_text = "Total";
         }
 
-        /* try { */
-
+        try {
 
 
              queryExecute(
@@ -246,12 +245,12 @@ component displayname="invoices" output="false" {
             )
 
 
-        /* } catch (any e) {
+        } catch (any e) {
 
             local.argsReturnValue['message'] = e.message;
             return argsReturnValue;
 
-        } */
+        }
 
         // Recalculating
         local.recalc = recalculateInvoice(local.invoiceID);
diff --git a/www/backend/core/views/navigation.cfm b/www/backend/core/views/navigation.cfm
index d2368f5..ab8af1d 100644
--- a/www/backend/core/views/navigation.cfm
+++ b/www/backend/core/views/navigation.cfm
@@ -71,8 +71,8 @@
                                         </span>
                                     </a>
                                     <div class="dropdown-menu">
-                                        <cfif fileExists(expandPath('/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
-                                            <cfinclude template="/modules/#i.moduleData.table_prefix#/navigation.cfm">
+                                        <cfif fileExists(expandPath('backend/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
+                                            <cfinclude template="/backend/modules/#i.moduleData.table_prefix#/navigation.cfm">
                                             <div class="dropdown-divider"></div>
                                         </cfif>
                                         <cfif len(trim(i.moduleData.settingPath))>
diff --git a/www/backend/core/views/navigationCombined.cfm b/www/backend/core/views/navigationCombined.cfm
index 01e66df..502a4b2 100644
--- a/www/backend/core/views/navigationCombined.cfm
+++ b/www/backend/core/views/navigationCombined.cfm
@@ -144,8 +144,8 @@
                                                 </span>
                                             </a>
                                             <div class="dropdown-menu">
-                                                <cfif fileExists(expandPath('/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
-                                                    <cfinclude template="/modules/#i.moduleData.table_prefix#/navigation.cfm">
+                                                <cfif fileExists(expandPath('backend/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
+                                                    <cfinclude template="/backend/modules/#i.moduleData.table_prefix#/navigation.cfm">
                                                     <div class="dropdown-divider"></div>
                                                 </cfif>
                                                 <cfif len(trim(i.moduleData.settingPath))>
diff --git a/www/backend/core/views/navigationCondensed.cfm b/www/backend/core/views/navigationCondensed.cfm
index e97e41e..7321f56 100644
--- a/www/backend/core/views/navigationCondensed.cfm
+++ b/www/backend/core/views/navigationCondensed.cfm
@@ -67,8 +67,8 @@
                                 </span>
                             </a>
                             <div class="dropdown-menu">
-                                <cfif fileExists(expandPath('/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
-                                    <cfinclude template="/modules/#i.moduleData.table_prefix#/navigation.cfm">
+                                <cfif fileExists(expandPath('backend/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
+                                    <cfinclude template="/backend/modules/#i.moduleData.table_prefix#/navigation.cfm">
                                     <div class="dropdown-divider"></div>
                                 </cfif>
                                 <cfif len(trim(i.moduleData.settingPath))>
diff --git a/www/backend/core/views/navigationVertical.cfm b/www/backend/core/views/navigationVertical.cfm
index 88d3581..505b003 100644
--- a/www/backend/core/views/navigationVertical.cfm
+++ b/www/backend/core/views/navigationVertical.cfm
@@ -74,8 +74,8 @@
                                 </span>
                             </a>
                             <div class="dropdown-menu">
-                                <cfif fileExists(expandPath('/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
-                                    <cfinclude template="/modules/#i.moduleData.table_prefix#/navigation.cfm">
+                                <cfif fileExists(expandPath('backend/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
+                                    <cfinclude template="/backend/modules/#i.moduleData.table_prefix#/navigation.cfm">
                                     <div class="dropdown-divider"></div>
                                 </cfif>
                                 <cfif len(trim(i.moduleData.settingPath))>
diff --git a/www/frontend/default_theme/templates/forms/login.cfm b/www/frontend/default_theme/templates/forms/login.cfm
index f99ba54..ed774ca 100644
--- a/www/frontend/default_theme/templates/forms/login.cfm
+++ b/www/frontend/default_theme/templates/forms/login.cfm
@@ -1,8 +1,8 @@
 <cfoutput>
 
-<div class="container py-4 px-3 mx-auto w-25">
+<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">
 
-    <div class="card wd-50">
+    <div class="card">
 
         <div class="card-header">
             #getTrans('formSignIn')#
diff --git a/www/frontend/default_theme/templates/forms/mfa.cfm b/www/frontend/default_theme/templates/forms/mfa.cfm
index 142096c..85dc344 100644
--- a/www/frontend/default_theme/templates/forms/mfa.cfm
+++ b/www/frontend/default_theme/templates/forms/mfa.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 
-<div class="container-sm py-4 px-3 mx-auto w-25">
+<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">
 
     <div class="card">
 
diff --git a/www/frontend/default_theme/templates/forms/password_1.cfm b/www/frontend/default_theme/templates/forms/password_1.cfm
index 1aa2093..35458d8 100644
--- a/www/frontend/default_theme/templates/forms/password_1.cfm
+++ b/www/frontend/default_theme/templates/forms/password_1.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 
-<div class="container py-4 px-3 mx-auto w-25">
+<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">
 
     <div class="card">
 
diff --git a/www/frontend/default_theme/templates/forms/password_2.cfm b/www/frontend/default_theme/templates/forms/password_2.cfm
index e5f5812..344b78f 100644
--- a/www/frontend/default_theme/templates/forms/password_2.cfm
+++ b/www/frontend/default_theme/templates/forms/password_2.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 
-<div class="container py-4 px-3 mx-auto w-25">
+<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">
 
     <div class="card">
 
diff --git a/www/frontend/default_theme/templates/forms/register_1.cfm b/www/frontend/default_theme/templates/forms/register_1.cfm
index 058e9bd..5b81f05 100644
--- a/www/frontend/default_theme/templates/forms/register_1.cfm
+++ b/www/frontend/default_theme/templates/forms/register_1.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 
-<div class="container py-4 px-3 mx-auto w-25">
+<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">
 
     <div class="card">
 
diff --git a/www/frontend/default_theme/templates/forms/register_2.cfm b/www/frontend/default_theme/templates/forms/register_2.cfm
index 4c63049..bb53d96 100644
--- a/www/frontend/default_theme/templates/forms/register_2.cfm
+++ b/www/frontend/default_theme/templates/forms/register_2.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 
-<div class="container py-4 px-3 mx-auto w-25">
+<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">
 
     <div class="card">
 
diff --git a/www/frontend/default_theme/templates/forms/register_3.cfm b/www/frontend/default_theme/templates/forms/register_3.cfm
index ad2a31d..5e67da6 100644
--- a/www/frontend/default_theme/templates/forms/register_3.cfm
+++ b/www/frontend/default_theme/templates/forms/register_3.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 
-<div class="container py-4 px-3 mx-auto w-25">
+<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">
 
     <div class="card">
 
diff --git a/www/frontend/default_theme/templates/plans/box.cfm b/www/frontend/default_theme/templates/plans/box.cfm
index d3f20d3..e640e4c 100644
--- a/www/frontend/default_theme/templates/plans/box.cfm
+++ b/www/frontend/default_theme/templates/plans/box.cfm
@@ -1,4 +1,3 @@
-
 <!--- Set the css class for recommended plan, if there is one --->
 <cfset recommClass1 = "">
 <cfset recommClass2 = "">
@@ -7,19 +6,18 @@
     <cfset recommClass2 = "text-bg-primary border-primary">
 </cfif>
 
-
 <cfoutput>
-<div class="col">
+<div class="col d-flex align-items-stretch">
 
-    <div class="card mb-4 rounded-3 shadow-sm #recommClass1#">
+    <div class="card mb-4 rounded-3 shadow-sm #recommClass1# d-flex flex-column">
 
         <div class="card-header py-3 #recommClass2#">
             <h4 class="my-0 fw-normal">#i.planName#</h4>
         </div>
 
-        <div class="card-body">
+        <div class="card-body d-flex flex-column">
 
-            <div class="row align-items-center mb-3">
+            <div class="row align-items-center mb-3 flex-grow-1">
 
                 <!--- Price on request --->
                 <cfif i.onRequest>
@@ -59,7 +57,7 @@
             </div>
 
             <!--- Longer description with optional check signs --->
-            <div class="planDescription text-start mb-4">
+            <div class="planDescription text-start mb-4 flex-grow-1">
                 #i.description#
             </div>
 
@@ -67,7 +65,7 @@
             <a type="button"
                 data-monthly="#i.bookingLinkM#"
                 data-yearly="#i.bookingLinkY#"
-                class="bookingButton w-100 btn btn-lg btn-outline-primary mb-3">
+                class="bookingButton w-100 btn btn-lg btn-outline-primary mt-auto mb-3">
                 #i.dynBookingButtonText#
             </a>
 
diff --git a/www/frontend/default_theme/templates/plans/plan_boxes.cfm b/www/frontend/default_theme/templates/plans/plan_boxes.cfm
index 0b44679..7baf377 100644
--- a/www/frontend/default_theme/templates/plans/plan_boxes.cfm
+++ b/www/frontend/default_theme/templates/plans/plan_boxes.cfm
@@ -1,7 +1,7 @@
 <cfoutput>
 <div class="container py-3">
     <main>
-        <div class="row row-cols-1 row-cols-md-4 mb-3 text-center">
+        <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 mb-3 text-center">
 
             <!--- Include of the boxes --->
             <cfloop array="#planData#" index="i">
diff --git a/www/frontend/default_theme/templates/plans/toggle.cfm b/www/frontend/default_theme/templates/plans/toggle.cfm
index 242cfb2..f632249 100644
--- a/www/frontend/default_theme/templates/plans/toggle.cfm
+++ b/www/frontend/default_theme/templates/plans/toggle.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 
-<div class="container-sm py-4 px-3 mx-auto w-25">
+<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">
 
     <div class="mb-5">
         <div class="btn-group w-100 mt-3" role="group">