diff --git a/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
index face9831216d..e6e85fb67b74 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/header.blade.php
@@ -4,7 +4,8 @@
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h7" />
         </svg>
     </button>
-    <div class="flex-1 px-4 flex justify-end">
+    <div class="flex-1 px-3 md:px-8 flex justify-between items-center">
+        <span class="text-xl text-gray-900">@yield('meta_title')</span>
         <div class="flex items-center md:ml-6 md:mr-2">
             @if($multiple_contacts->count() > 1)
             <div class="relative inline-block text-left" x-data="{ open: false }">
diff --git a/resources/views/portal/ninja2020/components/livewire/payment-methods-table.blade.php b/resources/views/portal/ninja2020/components/livewire/payment-methods-table.blade.php
index 104d8a384ea0..7aa58605bd40 100644
--- a/resources/views/portal/ninja2020/components/livewire/payment-methods-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/payment-methods-table.blade.php
@@ -9,6 +9,9 @@
                 <option>20</option>
             </select>
         </div>
+        @if($client->getCreditCardGateway())
+            <a href="{{ route('client.payment_methods.create') }}" class="button button-primary">{{ ctrans('texts.add_payment_method') }}</a>
+        @endif
     </div>
     <div class="-my-2 py-2 overflow-x-auto sm:-mx-6 sm:px-6 lg:-mx-8 lg:px-8">
         <div class="align-middle inline-block min-w-full overflow-hidden rounded">
diff --git a/resources/views/portal/ninja2020/credits/index.blade.php b/resources/views/portal/ninja2020/credits/index.blade.php
index 4fde0575f82b..d75caf6ab950 100644
--- a/resources/views/portal/ninja2020/credits/index.blade.php
+++ b/resources/views/portal/ninja2020/credits/index.blade.php
@@ -9,27 +9,10 @@
             @endforeach
         </div>
     @endif
-
-    <div class="bg-white shadow rounded mb-4" translate>
-        <div class="px-4 py-5 sm:p-6">
-            <div class="sm:flex sm:items-start sm:justify-between">
-                <div>
-                    <h3 class="text-lg leading-6 font-medium text-gray-900">
-                        {{ ctrans('texts.credits') }}
-                    </h3>
-                    <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
-                        <p translate>
-                            {{ ctrans('texts.list_of_credits') }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 @endsection
 
 @section('body')
-    <div class="flex flex-col mt-4">
+    <div class="flex flex-col">
         @livewire('credits-table')
     </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/dashboard/index.blade.php b/resources/views/portal/ninja2020/dashboard/index.blade.php
index 29de9bb9520a..9a765b271888 100644
--- a/resources/views/portal/ninja2020/dashboard/index.blade.php
+++ b/resources/views/portal/ninja2020/dashboard/index.blade.php
@@ -9,27 +9,8 @@
                 ->message($client->getSetting('custom_message_dashboard')) !!}
         @endcomponent
     @endif
-
-    <div class="bg-white shadow rounded mb-4">
-        <div class="px-4 py-5 sm:p-6">
-            <div class="sm:flex sm:items-start sm:justify-between">
-                <div>
-                    <h3 class="text-lg leading-6 font-medium text-gray-900">
-                        {{ ctrans('texts.dashboard') }}
-                    </h3>
-                    <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
-                        <p>
-                            {{ ctrans('texts.quick_overview_statistics') }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 @endsection
 
 @section('body')
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet esse magnam nam numquam omnis optio, pariatur
-    perferendis quae quaerat quam, quas quos repellat sapiente sit soluta, tenetur totam ut vel veritatis voluptatibus?
-    Aut, dolor illo? Asperiores eum eveniet quae sed?
+    This page is empty, sad and alone.
 @endsection
diff --git a/resources/views/portal/ninja2020/invoices/index.blade.php b/resources/views/portal/ninja2020/invoices/index.blade.php
index d6fe163dca39..494aa345ca7d 100644
--- a/resources/views/portal/ninja2020/invoices/index.blade.php
+++ b/resources/views/portal/ninja2020/invoices/index.blade.php
@@ -2,7 +2,6 @@
 @section('meta_title', ctrans('texts.invoices'))
 
 @section('header')
-
     @if($errors->any())
         <div class="alert alert-failure mb-4">
             @foreach($errors->all() as $error)
@@ -10,28 +9,10 @@
             @endforeach
         </div>
     @endif
-
-    <div class="bg-white shadow rounded mb-4">
-        <div class="px-4 py-5 sm:p-6">
-            <div class="sm:flex sm:items-start sm:justify-between">
-                <div>
-                    <h3 class="text-lg leading-6 font-medium text-gray-900">
-                        {{ ctrans('texts.invoices') }}
-                    </h3>
-                    <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
-                        <p>
-                            {{ ctrans('texts.list_of_invoices') }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 @endsection
 
 @section('body')
-    <div class="flex justify-end items-center">
-        <span class="text-sm mr-2">{{ ctrans('texts.with_selected') }}:</span>
+    <div class="flex items-center">
         <form action="{{ route('client.invoices.bulk') }}" method="post" id="bulkActions">
             @csrf
             <button type="submit" class="button button-primary" name="action" value="download">{{ ctrans('texts.download') }}</button>
diff --git a/resources/views/portal/ninja2020/payment_methods/index.blade.php b/resources/views/portal/ninja2020/payment_methods/index.blade.php
index 1eb880a48c50..4a988b9d5eee 100644
--- a/resources/views/portal/ninja2020/payment_methods/index.blade.php
+++ b/resources/views/portal/ninja2020/payment_methods/index.blade.php
@@ -2,29 +2,9 @@
 @section('meta_title', ctrans('texts.payment_methods'))
 
 @section('header')
-    <div class="bg-white shadow rounded mb-4" translate>
-        <div class="px-4 py-5 sm:p-6">
-            <div class="sm:flex sm:items-start sm:justify-between">
-                <div>
-                    <h3 class="text-lg leading-6 font-medium text-gray-900">
-                        {{ ctrans('texts.payment_methods') }}
-                    </h3>
-                    <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
-                        <p translate>
-                            {{ ctrans('texts.list_of_payment_methods') }}
-                        </p>
-                    </div>
-                </div>
-                <div class="mt-5 sm:mt-0 sm:ml-6 sm:flex-shrink-0 sm:flex sm:items-center">
-                    <div class="inline-flex rounded-md shadow-sm">
-                        <input type="hidden" name="hashed_ids">
-                        <input type="hidden" name="action" value="payment">
-                        @if($client->getCreditCardGateway())
-                            <a href="{{ route('client.payment_methods.create') }}" class="button button-primary">@lang('texts.add_payment_method')</a>
-                        @endif
-                    </div>
-                </div>
-            </div>
+    <div class="mt-5 sm:mt-0 sm:ml-6 sm:flex-shrink-0 sm:flex sm:items-center">
+        <div class="inline-flex rounded-md shadow-sm">
+            
         </div>
     </div>
 @endsection
diff --git a/resources/views/portal/ninja2020/payments/index.blade.php b/resources/views/portal/ninja2020/payments/index.blade.php
index 47b89d34a48e..3f54a73769b5 100644
--- a/resources/views/portal/ninja2020/payments/index.blade.php
+++ b/resources/views/portal/ninja2020/payments/index.blade.php
@@ -1,25 +1,6 @@
 @extends('portal.ninja2020.layout.app')
 @section('meta_title', ctrans('texts.payments'))
 
-@section('header')
-    <div class="bg-white shadow rounded mb-4" translate>
-        <div class="px-4 py-5 sm:p-6">
-            <div class="sm:flex sm:items-start sm:justify-between">
-                <div>
-                    <h3 class="text-lg leading-6 font-medium text-gray-900">
-                        {{ ctrans('texts.payments') }}
-                    </h3>
-                    <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
-                        <p translate>
-                            {{ ctrans('texts.list_of_payments') }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-@endsection
-
 @section('body')
     <div class="flex flex-col">
         @livewire('payments-table')
diff --git a/resources/views/portal/ninja2020/quotes/index.blade.php b/resources/views/portal/ninja2020/quotes/index.blade.php
index 05cb5ab05a0a..e2e452c0136b 100644
--- a/resources/views/portal/ninja2020/quotes/index.blade.php
+++ b/resources/views/portal/ninja2020/quotes/index.blade.php
@@ -9,23 +9,6 @@
             @endforeach
         </div>
     @endif
-
-    <div class="bg-white shadow rounded mb-4" translate>
-        <div class="px-4 py-5 sm:p-6">
-            <div class="sm:flex sm:items-start sm:justify-between">
-                <div>
-                    <h3 class="text-lg leading-6 font-medium text-gray-900">
-                        {{ ctrans('texts.quotes') }}
-                    </h3>
-                    <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
-                        <p translate>
-                            {{ ctrans('texts.list_of_quotes') }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 @endsection
 
 @section('body')
diff --git a/resources/views/portal/ninja2020/recurring_invoices/index.blade.php b/resources/views/portal/ninja2020/recurring_invoices/index.blade.php
index 9209813d7641..67273180932a 100644
--- a/resources/views/portal/ninja2020/recurring_invoices/index.blade.php
+++ b/resources/views/portal/ninja2020/recurring_invoices/index.blade.php
@@ -1,25 +1,6 @@
 @extends('portal.ninja2020.layout.app')
 @section('meta_title', ctrans('texts.recurring_invoices'))
 
-@section('header')
-    <div class="bg-white shadow rounded mb-4" translate>
-        <div class="px-4 py-5 sm:p-6">
-            <div class="sm:flex sm:items-start sm:justify-between">
-                <div>
-                    <h3 class="text-lg leading-6 font-medium text-gray-900">
-                        {{ ctrans('texts.recurring_invoices') }}
-                    </h3>
-                    <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
-                        <p>
-                            {{ ctrans('texts.list_of_recurring_invoices') }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-@endsection
-
 @section('body')
     <div class="flex flex-col">
         @livewire('recurring-invoices-table')