diff --git a/app/modules/cart.tsx b/app/modules/cart.tsx
index 951d8175..f7c0a7f9 100644
--- a/app/modules/cart.tsx
+++ b/app/modules/cart.tsx
@@ -36,13 +36,12 @@ export function Cart({
 }) {
   let optimisticCart = useOptimisticCart<CartApiQueryFragment>(cart);
   let linesCount = Boolean(optimisticCart?.lines?.nodes?.length || 0);
+  let cartHasItems = !!cart && cart.totalQuantity > 0;
 
-  return (
-    <>
-      <CartEmpty hidden={linesCount} onClose={onClose} layout={layout} />
-      <CartDetails cart={optimisticCart} layout={layout} />
-    </>
-  );
+  if (cartHasItems) {
+    return <CartDetails cart={optimisticCart} layout={layout} />;
+  }
+  return <CartEmpty hidden={linesCount} onClose={onClose} layout={layout} />;
 }
 
 export function CartDetails({
@@ -52,7 +51,6 @@ export function CartDetails({
   layout: Layouts;
   cart: OptimisticCart<CartApiQueryFragment>;
 }) {
-  let cartHasItems = !!cart && cart.totalQuantity > 0;
   return (
     <div
       className={clsx(
@@ -66,12 +64,10 @@ export function CartDetails({
       )}
     >
       <CartLines lines={cart?.lines?.nodes} layout={layout} />
-      {cartHasItems && (
-        <CartSummary cost={cart.cost} layout={layout}>
-          <CartDiscounts discountCodes={cart.discountCodes} />
-          <CartCheckoutActions checkoutUrl={cart.checkoutUrl} layout={layout} />
-        </CartSummary>
-      )}
+      <CartSummary cost={cart.cost} layout={layout}>
+        <CartDiscounts discountCodes={cart.discountCodes} />
+        <CartCheckoutActions checkoutUrl={cart.checkoutUrl} layout={layout} />
+      </CartSummary>
     </div>
   );
 }
@@ -486,17 +482,17 @@ export function CartEmpty({
       )}
       hidden={hidden}
     >
-      <div>
+      <div className={clsx(layout === "page" && "text-center")}>
         <p className="mb-4">
           Looks like you haven&rsquo;t added anything yet, let&rsquo;s get you
           started!
         </p>
         <Button
-          className={clsx(layout === "drawer" ? "w-full" : "")}
+          className={clsx(layout === "drawer" ? "w-full" : "min-w-48")}
           link={layout === "page" ? "/products" : ""}
           onClick={onClose}
         >
-          Continue shopping
+          Start Shopping
         </Button>
       </div>
       <div className="grid gap-4">
diff --git a/app/modules/header/mobile-header.tsx b/app/modules/header/mobile-header.tsx
index 5d3ca4e2..941d88be 100644
--- a/app/modules/header/mobile-header.tsx
+++ b/app/modules/header/mobile-header.tsx
@@ -26,7 +26,7 @@ export function MobileHeader({
 }) {
   // useHeaderStyleFix(containerStyle, setContainerStyle, isHome);
   let isHome = useIsHomePath();
-  let { enableTransparentHeader } = useThemeSettings();
+  let { enableTransparentHeader, topbarHeight } = useThemeSettings();
   let { y } = useWindowScroll();
   let params = useParams();
   let scrolled = y >= 50;
@@ -34,6 +34,11 @@ export function MobileHeader({
 
   return (
     <header
+      style={
+        {
+          "--initial-topbar-height": `${topbarHeight}px`,
+        } as React.CSSProperties
+      }
       className={cn(
         "transition-colors duration-300 ease-in-out",
         "h-nav z-40 top-[var(--topbar-height,var(--initial-topbar-height))] w-full leading-none",