diff --git a/src/Core/src/Pages/Page.php b/src/Core/src/Pages/Page.php
index 21b3ca773..d2b45eb31 100644
--- a/src/Core/src/Pages/Page.php
+++ b/src/Core/src/Pages/Page.php
@@ -329,6 +329,6 @@ protected function systemViewData(): array
 
     public function getView(): string
     {
-        return 'moonshine::layouts.app';
+        return 'moonshine::page';
     }
 }
diff --git a/src/UI/resources/views/components/layout/body.blade.php b/src/UI/resources/views/components/layout/body.blade.php
index 06aa5417c..3fdebc7ce 100644
--- a/src/UI/resources/views/components/layout/body.blade.php
+++ b/src/UI/resources/views/components/layout/body.blade.php
@@ -11,8 +11,8 @@
 
     {{ $slot ?? '' }}
 
-    @include('moonshine::layouts.shared.img-popup')
-    @include('moonshine::layouts.shared.toasts')
+    @include('moonshine::shared.img-popup')
+    @include('moonshine::shared.toasts')
 
     @stack('scripts')
 </body>
diff --git a/src/UI/resources/views/components/metrics/value.blade.php b/src/UI/resources/views/components/metrics/value.blade.php
index 4a05a3fbf..df8207cd2 100644
--- a/src/UI/resources/views/components/metrics/value.blade.php
+++ b/src/UI/resources/views/components/metrics/value.blade.php
@@ -21,7 +21,7 @@
     @endif
 
     <div class="report-card-body">
-        <div class="report-card-value">{!! $simpleValue !!}</div>
+        <div class="report-card-value">{!! $simpleValue !== '' ? $simpleValue : $value !!}</div>
         <h5 class="report-card-title">{!! $title !!}</h5>
     </div>
 </div>
diff --git a/src/UI/resources/views/layouts/app.blade.php b/src/UI/resources/views/page.blade.php
similarity index 100%
rename from src/UI/resources/views/layouts/app.blade.php
rename to src/UI/resources/views/page.blade.php
diff --git a/src/UI/resources/views/layouts/shared/img-popup.blade.php b/src/UI/resources/views/shared/img-popup.blade.php
similarity index 100%
rename from src/UI/resources/views/layouts/shared/img-popup.blade.php
rename to src/UI/resources/views/shared/img-popup.blade.php
diff --git a/src/UI/resources/views/layouts/shared/toasts.blade.php b/src/UI/resources/views/shared/toasts.blade.php
similarity index 100%
rename from src/UI/resources/views/layouts/shared/toasts.blade.php
rename to src/UI/resources/views/shared/toasts.blade.php