diff --git a/core/__pycache__/middleware.cpython-311.pyc b/core/__pycache__/middleware.cpython-311.pyc
index 6acfa1c..5a02852 100644
Binary files a/core/__pycache__/middleware.cpython-311.pyc and b/core/__pycache__/middleware.cpython-311.pyc differ
diff --git a/core/middleware.py b/core/middleware.py
index d5ee3ba..5cff17f 100644
--- a/core/middleware.py
+++ b/core/middleware.py
@@ -27,12 +27,19 @@ class SubscriptionMiddleware:
             reverse('logout'),
             reverse('login'),
             reverse('register'),
+            reverse('verify_otp_registration'),
+            reverse('verify_otp_login'),
             reverse('subscription_expired'),
+            reverse('renew_subscription'),
+            reverse('thawani_success'),
+            reverse('thawani_cancel'),
+            reverse('thawani_webhook'),
             reverse('home'),
             '/admin/',
             '/static/',
             '/media/',
             '/i18n/',
+            '/receipt/', # Whitelist receipts so they can be viewed/printed
         ]
         
         # Check if the current path starts with any whitelisted path
@@ -41,8 +48,7 @@ class SubscriptionMiddleware:
         if request.user.is_authenticated and not request.user.is_superuser:
             try:
                 profile = request.user.profile
-                # If they are an admin role (not superuser but ADMIN role in profile), maybe don't suspend?
-                # Usually admins are exempted.
+                # Admins are exempted
                 if profile.role == 'ADMIN':
                     return self.get_response(request)
 
diff --git a/core/templates/core/shipper_dashboard.html b/core/templates/core/shipper_dashboard.html
index e0ddd95..75738f9 100644
--- a/core/templates/core/shipper_dashboard.html
+++ b/core/templates/core/shipper_dashboard.html
@@ -16,74 +16,35 @@
 
 {% block content %}
 <div class="container py-5">
-    <div class="d-flex justify-content-between align-items-center mb-4">
     <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
+        <div class="col-md-8">
             <h2 class="mb-1">{% trans "Shipper Dashboard" %}</h2>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
             <p class="text-muted">{% trans "Manage your shipping offers and active shipments." %}</p>
-    <div class="row mb-4">
-        <div class="col-md-3">
+        </div>
+        <div class="col-md-4 d-flex justify-content-md-end align-items-center">
+            <div class="d-flex gap-2">
+                <a href="{% url 'post_shipment' %}" class="btn btn-success">
+                    <i class="fa-solid fa-plus me-2"></i> {% trans "Add A Bid" %}
+                </a>
+                <a href="{% url 'marketplace' %}" class="btn btn-primary">
+                    <i class="fa-solid fa-search me-2"></i> {% trans "Browse Trucks" %}
+                </a>
+            </div>
+        </div>
+    </div>
+
+    <!-- Stats and Quick Actions -->
+    <div class="row mb-5">
+        <div class="col-md-3 mb-3">
             <div class="card shadow-sm border-0 bg-primary text-white h-100">
                 <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
+                    <h6 class="text-uppercase small opacity-75">{% trans "Financials" %}</h6>
                     <h4 class="mb-3">{% trans "Payments" %}</h4>
                     <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
                 </div>
             </div>
         </div>
-    </div>
-        </div>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div class="d-flex gap-2">
-            <a href="{% url 'post_shipment' %}" class="btn btn-success btn-lg">
-                <i class="fa-solid fa-plus me-2"></i> {% trans "Add A Bid" %}
-            </a>
-            <a href="{% url 'marketplace' %}" class="btn btn-primary btn-lg">
-                <i class="fa-solid fa-search me-2"></i> {% trans "Browse Trucks" %}
-            </a>
-        </div>
+        <!-- Add more stats here if needed -->
     </div>
 
     <!-- Active Offers -->
diff --git a/core/templates/core/truck_owner_dashboard.html b/core/templates/core/truck_owner_dashboard.html
index fc33194..76f7ec5 100644
--- a/core/templates/core/truck_owner_dashboard.html
+++ b/core/templates/core/truck_owner_dashboard.html
@@ -17,73 +17,31 @@
 
 {% block content %}
 <div class="container py-5">
-    <div class="d-flex justify-content-between align-items-center mb-4">
     <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
+        <div class="col-md-8">
             <h2 class="mb-1">{% trans "Truck Owner Dashboard" %}</h2>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
             <p class="text-muted">{% trans "Manage your fleet and incoming shipping offers." %}</p>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
         </div>
-    </div>
-        </div>
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card shadow-sm border-0 bg-primary text-white h-100">
-                <div class="card-body">
-                    <h6 class="text-uppercase small">{% trans "Financials" %}</h6>
-                    <h4 class="mb-3">{% trans "Payments" %}</h4>
-                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div>
-            <a href="{% url 'truck_register' %}" class="btn btn-success btn-lg">
+        <div class="col-md-4 d-flex justify-content-md-end align-items-center">
+            <a href="{% url 'truck_register' %}" class="btn btn-success">
                 <i class="fa-solid fa-plus me-2"></i> {% trans "Add New Truck" %}
             </a>
         </div>
     </div>
 
+    <!-- Stats and Quick Actions -->
+    <div class="row mb-5">
+        <div class="col-md-3 mb-3">
+            <div class="card shadow-sm border-0 bg-primary text-white h-100">
+                <div class="card-body">
+                    <h6 class="text-uppercase small opacity-75">{% trans "Financials" %}</h6>
+                    <h4 class="mb-3">{% trans "Payments" %}</h4>
+                    <a href="{% url 'financial_history' %}" class="btn btn-light btn-sm">{% trans "View History" %}</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <!-- Incoming Offers Section -->
     <div class="card shadow-sm border-0 mb-5">
         <div class="card-header bg-white py-3">