diff --git a/app/Http/Controllers/Admin/MonsterCrudController.php b/app/Http/Controllers/Admin/MonsterCrudController.php
index c4610358..8243dfa4 100644
--- a/app/Http/Controllers/Admin/MonsterCrudController.php
+++ b/app/Http/Controllers/Admin/MonsterCrudController.php
@@ -132,10 +132,10 @@ public function setupListOperation()
                     'element' => 'span',
                     'class'   => function ($crud, $column, $entry, $related_key) {
                         if ($column['text'] == 'Yes') {
-                            return 'badge rounded-pill bg-success';
+                            return 'badge rounded-pill bg-success text-white';
                         }
 
-                        return 'badge rounded-pill bg-danger';
+                        return 'badge rounded-pill bg-danger text-white';
                     },
                 ],
             ],
diff --git a/app/helpers.php b/app/helpers.php
index 986f8c6d..04a7f581 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -10,7 +10,7 @@
      */
     function backpack_pro_badge(string $string = 'PRO')
     {
-        return '<a href="https://backpackforlaravel.com/pricing" target="_blank" class="badge badge-pill bg-primary mx-2" tabindex="-1">'.$string.'</a>';
+        return '<a href="https://backpackforlaravel.com/pricing" target="_blank" class="badge badge-pill badge-sm bg-primary bg-primary-lt mx-2" tabindex="-1">'.$string.'</a>';
     }
 }
 
@@ -24,7 +24,7 @@ function backpack_pro_badge(string $string = 'PRO')
      */
     function backpack_new_badge(string $string = 'NEW')
     {
-        return '<span class="badge badge-pill bg-warning mx-2">'.$string.'</span>';
+        return '<span class="badge badge-pill badge-sm bg-warning bg-warning-lt mx-2">'.$string.'</span>';
     }
 }
 
@@ -38,6 +38,6 @@ function backpack_new_badge(string $string = 'NEW')
      */
     function backpack_free_badge(string $string = 'FREE')
     {
-        return '<span class="badge badge-pill bg-success mx-2">'.$string.'</span>';
+        return '<span class="badge badge-pill badge-sm bg-success bg-success-lt mx-2">'.$string.'</span>';
     }
 }
diff --git a/resources/views/admin/new-in-v7.blade.php b/resources/views/admin/new-in-v7.blade.php
index 22495a82..c47221c6 100644
--- a/resources/views/admin/new-in-v7.blade.php
+++ b/resources/views/admin/new-in-v7.blade.php
@@ -12,7 +12,7 @@
                     'class' => 'col-md-12 mt-3',
                 ],
                 'controller' => \App\Http\Controllers\Admin\PetShop\SkillCrudController::class,
-                'operation' => 'update',
+                'formOperation' => 'update',
                 'entry' => \App\Models\PetShop\Skill::find(1),
                 'content' => [
                     'header' => 'Edit Skill', // optional
diff --git a/resources/views/admin/partials/dataform-examples.blade.php b/resources/views/admin/partials/dataform-examples.blade.php
index b812cbdd..1518f943 100644
--- a/resources/views/admin/partials/dataform-examples.blade.php
+++ b/resources/views/admin/partials/dataform-examples.blade.php
@@ -47,12 +47,12 @@ class="icon icon-1">
                     Quick Add Tag
                 </h3>
             </div>
-            <div class="card-body bg-light">
+            <div class="card-body">
 
                 <x-backpack::dataform
-                    id="quickAddTag"
+                    formId="quickAddTag"
                     :controller="\Backpack\NewsCRUD\app\Http\Controllers\Admin\TagCrudController::class"
-                    operation="create"
+                    formOperation="create"
                     :setup="function($crud, $entry)  {
                         $crud->field('custom_test_field')->type('text');
                     }"
@@ -68,12 +68,12 @@ class="icon icon-1">
                     Quick Edit Tag
                 </h3>
             </div>
-            <div class="card-body bg-light">
+            <div class="card-body">
 
                 <x-backpack::dataform
-                    id="quickEditTag"
+                    formId="quickEditTag"
                     :controller="\Backpack\NewsCRUD\app\Http\Controllers\Admin\TagCrudController::class"
-                    operation="update"
+                    formOperation="update"
                     :entry="\Backpack\NewsCRUD\app\Models\Tag::find(1)"
                 />
 
@@ -82,3 +82,58 @@ class="icon icon-1">
     </div>
 
 </div>
+
+<div class="row">
+    <div class="col-md-6">
+        <div class="card mt-3">
+            <div class="card-header">
+                <h3 class="card-title">
+                    Quick Add Invoice in a Modal
+                </h3>
+            </div>
+            <div class="card-body">
+
+                <button
+                    type="button"
+                    class="btn btn-primary"
+                    data-bs-toggle="modal"
+                    data-bs-target="#create_invoice"
+                    bp-button="create"
+                    data-style="zoom-in"
+                >
+                    <i class="la la-plus"></i> <span>Create Invoice</span>
+                </button>
+                <x-bp-dataform-modal formId="create_invoice" :controller='\App\Http\Controllers\Admin\PetShop\InvoiceCrudController::class' />
+
+            </div>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <div class="card mt-3">
+            <div class="card-header">
+                <h3 class="card-title">
+                    Quick Edit Invoice in a Modal
+                </h3>
+            </div>
+            <div class="card-body">
+                <button
+                    type="button"
+                    class="btn btn-primary"
+                    data-bs-toggle="modal"
+                    data-bs-target="#edit_invoice"
+                    bp-button="create"
+                    data-style="zoom-in"
+                >
+                    <i class="la la-plus"></i> <span>Edit Invoice</span>
+                </button>
+                <x-backpack::dataform-modal
+                    formId="edit_invoice"
+                    :controller="\App\Http\Controllers\Admin\PetShop\InvoiceCrudController::class"
+                    formOperation="update"
+                    :entry="\App\Models\PetShop\Invoice::find(1)"
+                />
+
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/admin/partials/datagrid-examples.blade.php b/resources/views/admin/partials/datagrid-examples.blade.php
index b14626e8..773dbce6 100644
--- a/resources/views/admin/partials/datagrid-examples.blade.php
+++ b/resources/views/admin/partials/datagrid-examples.blade.php
@@ -23,7 +23,7 @@
                                 <path d="M12 5m-1 0a1 1 0 1 0 2 0a1 1 0 1 0 -2 0"></path>
                             </svg>
                         </a>
-                        <div class="dropdown-menu dropdown-menu-end" style="">
+                        <div class="dropdown-menu dropdown-menu-end">
                             <a class="dropdown-item" href="#">See demo code</a> <!-- TODO: link to demo code -->
                             <a class="dropdown-item" href="#">See docs</a> <!-- TODO: link to final docs -->
                         </div>
diff --git a/resources/views/vendor/backpack/theme-tabler/dashboard.blade.php b/resources/views/vendor/backpack/theme-tabler/dashboard.blade.php
index fa831033..7f6eeb79 100644
--- a/resources/views/vendor/backpack/theme-tabler/dashboard.blade.php
+++ b/resources/views/vendor/backpack/theme-tabler/dashboard.blade.php
@@ -186,7 +186,7 @@
 
             [
                 'type' => 'chart',
-                'wrapperClass' => 'col-md-4 mb-3',
+                'wrapperClass' => 'col-md-4 mt-3 mb-3',
                 // 'class' => 'col-md-6',
                 'controller' => \App\Http\Controllers\Admin\Charts\Pies\ChartjsPieController::class,
                 'content' => [
@@ -196,7 +196,7 @@
             ],
             [
                 'type' => 'chart',
-                'wrapperClass' => 'col-md-4 mb-3',
+                'wrapperClass' => 'col-md-4 mt-3 mb-3',
                 // 'class' => 'col-md-6',
                 'controller' => \App\Http\Controllers\Admin\Charts\Pies\EchartsPieController::class,
                 'content' => [
@@ -206,7 +206,7 @@
             ],
             [
                 'type' => 'chart',
-                'wrapperClass' => 'col-md-4 mb-3',
+                'wrapperClass' => 'col-md-4 mt-3 mb-3',
                 // 'class' => 'col-md-6',
                 'controller' => \App\Http\Controllers\Admin\Charts\Pies\HighchartsPieController::class,
                 'content' => [