diff --git a/admin/components/instance/instance-failure-view.tsx b/admin/components/instance/instance-failure-view.tsx
index b86750031..8722929b5 100644
--- a/admin/components/instance/instance-failure-view.tsx
+++ b/admin/components/instance/instance-failure-view.tsx
@@ -21,7 +21,7 @@ export const InstanceFailureView: FC<InstanceFailureViewProps> = () => {
   };
 
   return (
-    <div className="h-full w-full relative container px-5 mx-auto flex justify-center items-center mt-10">
+    <div className="h-full w-full relative container px-5 mx-auto flex justify-center items-center">
       <div className="w-auto max-w-2xl relative space-y-8 py-10">
         <div className="relative flex flex-col justify-center items-center space-y-4">
           <Image src={instanceImage} alt="Plane Logo" />
diff --git a/admin/components/instance/setup-form.tsx b/admin/components/instance/setup-form.tsx
index 2d18ea283..fb0811f2d 100644
--- a/admin/components/instance/setup-form.tsx
+++ b/admin/components/instance/setup-form.tsx
@@ -129,7 +129,7 @@ export const InstanceSetupForm: FC = (props) => {
   );
 
   return (
-    <div className="max-w-lg px-10 lg:max-w-md lg:px-5">
+    <div className="max-w-lg lg:max-w-md w-full">
       <div className="relative flex flex-col space-y-6">
         <div className="text-center space-y-1">
           <h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">
@@ -155,7 +155,7 @@ export const InstanceSetupForm: FC = (props) => {
         >
           <input type="hidden" name="csrfmiddlewaretoken" value={csrfToken} />
 
-          <div className="flex items-center gap-4">
+          <div className="flex flex-col sm:flex-row items-center gap-4">
             <div className="w-full space-y-1">
               <label className="text-sm text-onboarding-text-300 font-medium" htmlFor="first_name">
                 First name <span className="text-red-500">*</span>
diff --git a/admin/layouts/default-layout.tsx b/admin/layouts/default-layout.tsx
index 26bab1221..1621fc0f8 100644
--- a/admin/layouts/default-layout.tsx
+++ b/admin/layouts/default-layout.tsx
@@ -33,7 +33,7 @@ export const DefaultLayout: FC<TDefaultLayout> = (props) => {
             <Image src={patternBackground} className="w-screen h-full object-cover" alt="Plane background pattern" />
           </div>
         )}
-        <div className="relative z-10 mb-[110px] flex-grow">{children}</div>
+        <div className="relative z-10 flex-grow">{children}</div>
       </div>
     </div>
   );
diff --git a/admin/lib/instance-provider.tsx b/admin/lib/instance-provider.tsx
index 194fea4dc..fbcf27d82 100644
--- a/admin/lib/instance-provider.tsx
+++ b/admin/lib/instance-provider.tsx
@@ -34,7 +34,7 @@ export const InstanceProvider: FC<InstanceProviderProps> = observer((props) => {
   if (error) {
     return (
       <DefaultLayout>
-        <div className="relative w-screen min-h-[500px] overflow-y-auto px-5 mx-auto flex justify-center items-center">
+        <div className="relative h-full w-full overflow-y-auto px-6 py-10 mx-auto flex justify-center items-center">
           <InstanceFailureView />
         </div>
       </DefaultLayout>
@@ -44,7 +44,7 @@ export const InstanceProvider: FC<InstanceProviderProps> = observer((props) => {
   if (!instance?.is_setup_done) {
     return (
       <DefaultLayout>
-        <div className="relative w-screen min-h-screen overflow-y-auto px-5 py-10 mx-auto flex justify-center items-center">
+        <div className="relative h-full w-full overflow-y-auto px-6 py-10 mx-auto flex justify-center items-center">
           <InstanceSetupForm />
         </div>
       </DefaultLayout>