diff --git a/src/components/FormContainer.vue b/src/components/FormContainer.vue
index 46becb1d..8917092c 100644
--- a/src/components/FormContainer.vue
+++ b/src/components/FormContainer.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col">
     <!-- Page Header (Title, Buttons, etc) -->
-    <PageHeader :backLink="backLink" :title="title">
+    <PageHeader :backLink="backLink" :title="title" :border="false">
       <slot name="header" />
     </PageHeader>
 
@@ -10,12 +10,12 @@
       class="
         border
         rounded-lg
-        shadow
+        shadow-lg
         flex flex-col
         self-center
         w-form
         h-full
-        my-4
+        mb-4
         bg-white
       "
     >
diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue
index e9c9b09f..478fee4e 100644
--- a/src/components/PageHeader.vue
+++ b/src/components/PageHeader.vue
@@ -1,9 +1,20 @@
 <template>
-  <div class="px-4 flex justify-between window-drag border-b items-center h-row-largest flex-shrink-0">
+  <div
+    class="
+      px-4
+      flex
+      justify-between
+      window-drag
+      items-center
+      h-row-largest
+      flex-shrink-0
+    "
+    :class="border ? 'border-b' : ''"
+  >
     <h1 class="text-xl font-semibold select-none" v-if="title && !backLink">
       {{ title }}
     </h1>
-    <BackLink v-if="backLink" class="window-no-drag"/>
+    <BackLink v-if="backLink" class="window-no-drag" />
     <div class="flex items-stretch window-no-drag gap-2">
       <slot />
       <SearchBar v-if="!hideSearch" />
@@ -19,6 +30,7 @@ export default {
     title: { type: String, default: '' },
     backLink: { type: Boolean, default: false },
     hideSearch: { type: Boolean, default: false },
+    border: { type: Boolean, default: true },
   },
   components: { SearchBar, BackLink },
 };
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index c5221ba2..bb568d6f 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -7,7 +7,7 @@
     }"
   >
     <div
-      class="w-full w-form shadow rounded-lg border relative"
+      class="w-full w-form shadow-lg rounded-lg border relative"
       style="height: 700px"
     >
       <!-- Welcome to Frappe Books -->
diff --git a/src/pages/SetupWizard/Slide.vue b/src/pages/SetupWizard/Slide.vue
index bdf004fd..6c33f316 100644
--- a/src/pages/SetupWizard/Slide.vue
+++ b/src/pages/SetupWizard/Slide.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-form shadow rounded-lg border relative" style="height: 700px">
+  <div class="w-form shadow-lg rounded-lg border relative" style="height: 700px">
     <!-- Slide Title -->
     <div class="p-4">
       <h1 class="text-2xl font-semibold select-none">