diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/components/layouts/app.html.heex b/apps/ex_nvr_web/lib/ex_nvr_web/components/layouts/app.html.heex
index 03d46291..f7fd7e9d 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/components/layouts/app.html.heex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/components/layouts/app.html.heex
@@ -253,7 +253,7 @@
     </div>
   </aside>
 </header>
-<main class="px-4 py-20 sm:px-6 lg:px-8 bg-gray-300 dark:bg-gray-800">
+<main class="py-3 sm:px-6 lg:px-8 bg-gray-300 dark:bg-gray-800">
   <div class="flex justify-center mx-auto sm:ml-64 bg-gray-300 dark:bg-gray-800">
     <.flash_group flash={@flash} />
     <%= @inner_content %>
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/dashboard_live.ex b/apps/ex_nvr_web/lib/ex_nvr_web/live/dashboard_live.ex
index 859ca757..af2f121d 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/dashboard_live.ex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/dashboard_live.ex
@@ -19,7 +19,7 @@ defmodule ExNVRWeb.DashboardLive do
 
   def render(assigns) do
     ~H"""
-    <div class="bg-gray-300 sm:w-2/3 dark:bg-gray-800">
+    <div class="bg-gray-300 w-full h-svh dark:bg-gray-800 mb-12 overflow-hidden">
       <div :if={@devices == []} class="grid tracking-wide text-lg text-center dark:text-gray-200">
         You have no devices, you can create one
         <span><.link href={~p"/devices"} class="ml-2 dark:text-blue-600">here</.link></span>
@@ -78,11 +78,11 @@ defmodule ExNVRWeb.DashboardLive do
           </div>
         </div>
 
-        <div class="relative mt-4">
+        <div class="relative h-svh">
           <div :if={@live_view_enabled?} class="relative">
             <video
               id="live-video"
-              class="w-full h-auto dark:bg-gray-500 rounded-tr rounded-tl"
+              class="z-10 w-auto min-w-full min-h-full max-w-none dark:bg-gray-500 rounded-tr rounded-tl"
               autoplay
               controls
               muted
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/device_list_live.ex b/apps/ex_nvr_web/lib/ex_nvr_web/live/device_list_live.ex
index 02260773..ba54efa1 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/device_list_live.ex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/device_list_live.ex
@@ -10,7 +10,7 @@ defmodule ExNVRWeb.DeviceListLive do
 
   def render(assigns) do
     ~H"""
-    <div class="grow">
+    <div class="grow mt-20">
       <div :if={@current_user.role == :admin} class="ml-4 sm:ml-0">
         <.link href={~p"/devices/new"}>
           <.button>Add device</.button>
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/device_live.html.heex b/apps/ex_nvr_web/lib/ex_nvr_web/live/device_live.html.heex
index 1ae7a8ef..034ef24b 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/device_live.html.heex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/device_live.html.heex
@@ -1,4 +1,4 @@
-<div class="grow max-w-2xl">
+<div class="grow max-w-2xl mt-20">
   <div class="px-6 lg:px-8 bg-gray-300 dark:bg-gray-800">
     <h3
       :if={@device.id == nil}
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/onvif_discovery_live.html.heex b/apps/ex_nvr_web/lib/ex_nvr_web/live/onvif_discovery_live.html.heex
index cdc3bb6e..cbf2be49 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/onvif_discovery_live.html.heex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/onvif_discovery_live.html.heex
@@ -1,4 +1,4 @@
-<div class="container mx-auto p-4">
+<div class="container mt-20 mx-auto p-4">
   <div class="flex flex-wrap items-stretch justify-between content-between mb-4 gap-2">
     <!-- Discover devices -->
     <.card class="w-full md:w-1/3 bg-gray-300">
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/recordings_list_live.ex b/apps/ex_nvr_web/lib/ex_nvr_web/live/recordings_list_live.ex
index 4ee9143e..320d7c47 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/recordings_list_live.ex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/recordings_list_live.ex
@@ -9,7 +9,7 @@ defmodule ExNVRWeb.RecordingListLive do
   @impl true
   def render(assigns) do
     ~H"""
-    <div class="grow">
+    <div class="grow mt-20">
       <.filter_form meta={@meta} devices={@devices} id="recording-filter-form" />
 
       <Flop.Phoenix.table
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/remote_storage_list_live.ex b/apps/ex_nvr_web/lib/ex_nvr_web/live/remote_storage_list_live.ex
index 9b339e80..8aee8c61 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/remote_storage_list_live.ex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/remote_storage_list_live.ex
@@ -6,7 +6,7 @@ defmodule ExNVRWeb.RemoteStorageListLive do
 
   def render(assigns) do
     ~H"""
-    <div class="grow">
+    <div class="grow mt-20">
       <div class="ml-4 sm:ml-0">
         <.link href={~p"/remote-storages/new"}>
           <.button>Add remote storage</.button>
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/remote_storage_live.ex b/apps/ex_nvr_web/lib/ex_nvr_web/live/remote_storage_live.ex
index 9d6ca67f..220db6b5 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/remote_storage_live.ex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/remote_storage_live.ex
@@ -8,7 +8,7 @@ defmodule ExNVRWeb.RemoteStorageLive do
 
   def render(assigns) do
     ~H"""
-    <div class="grow max-w-2xl">
+    <div class="grow max-w-2xl mt-20">
       <div class="px-6 lg:px-8 bg-gray-300 dark:bg-gray-800">
         <h3
           :if={@remote_storage.id == nil}
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/user_list_live.ex b/apps/ex_nvr_web/lib/ex_nvr_web/live/user_list_live.ex
index 637390ab..abf224f3 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/user_list_live.ex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/user_list_live.ex
@@ -7,7 +7,7 @@ defmodule ExNVRWeb.UserListLive do
 
   def render(assigns) do
     ~H"""
-    <div class="grow">
+    <div class="grow mt-20">
       <div :if={@current_user.role == :admin} class="ml-4 sm:ml-0">
         <.link href={~p"/users/new"}>
           <.button>Add User</.button>
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/user_live.html.heex b/apps/ex_nvr_web/lib/ex_nvr_web/live/user_live.html.heex
index 37d9afd7..0a67be56 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/user_live.html.heex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/user_live.html.heex
@@ -1,4 +1,4 @@
-<div class="grow max-w-2xl">
+<div class="grow max-w-2xl mt-20">
   <div class="px-6 lg:px-8 bg-gray-300 dark:bg-gray-800">
     <h3
       :if={@user.id == nil}
diff --git a/apps/ex_nvr_web/lib/ex_nvr_web/live/user_settings_live.ex b/apps/ex_nvr_web/lib/ex_nvr_web/live/user_settings_live.ex
index 107c3e8f..c97c3014 100644
--- a/apps/ex_nvr_web/lib/ex_nvr_web/live/user_settings_live.ex
+++ b/apps/ex_nvr_web/lib/ex_nvr_web/live/user_settings_live.ex
@@ -5,7 +5,7 @@ defmodule ExNVRWeb.UserSettingsLive do
 
   def render(assigns) do
     ~H"""
-    <div class="grow max-w-3xl">
+    <div class="grow max-w-3xl mt-20">
       <.header class="text-center">
         Account Settings
         <:subtitle>Manage your account email address and password settings</:subtitle>