diff --git a/src/components/MasonryGallery.tsx b/src/components/MasonryGallery.tsx
index b61a6af..bb43613 100644
--- a/src/components/MasonryGallery.tsx
+++ b/src/components/MasonryGallery.tsx
@@ -8,8 +8,8 @@ import useBreakpoint from "use-breakpoint";
 // @ts-ignore
 import themeBreakpoints from "../breakpoints";
 import classNames from "classnames";
-import useDimensions from "react-cool-dimensions";
-import { GalleryImage } from "../pages";
+// import useDimensions from "react-cool-dimensions";
+import { GalleryImage } from "../pages/photogallery";
 
 interface Row {
   aspect: number;
@@ -36,18 +36,25 @@ const MasonryGallery = ({
 }: MasonryGalleryProps) => {
   const [isClient, setIsClient] = React.useState(false);
   React.useEffect(() => {
-    setIsClient(true)
-  }, [])
+    setIsClient(true);
+  }, []);
   const breakpoints = React.useMemo(
     () => R.pick(R.keys(aspectTargetsByBreakpoint), themeBreakpoints),
     [aspectTargetsByBreakpoint]
   );
 
-  const { observe, currentBreakpoint } = useDimensions({
-    breakpoints,
-  });
+  // const { observe, currentBreakpoint } = useDimensions({
+  //   breakpoints,
+  // });
 
-  const breakpoint = currentBreakpoint.length ? currentBreakpoint : "xs";
+  const { breakpoint } = useBreakpoint(breakpoints, 'xs')
+
+  // const breakpoint = currentBreakpoint.length ? currentBreakpoint : "xs";
+  console.log("🚀 ~ file: MasonryGallery.tsx ~ line 51 ~ breakpoint", breakpoint)
+  const galleryWidth = `calc(100vw - ${
+    breakpoint === "xs" || breakpoint === "sm" ? "32" : "160"
+  }px)`;
+  console.log("🚀 ~ file: MasonryGallery.tsx ~ line 55 ~ galleryWidth", galleryWidth)
 
   const aspectRatios = React.useMemo(
     () => R.map(getAspectRatio, images).filter(Boolean),
@@ -102,10 +109,10 @@ const MasonryGallery = ({
   return (
     <div
       className={classNames(
-        "flex items-center flex-wrap mx-auto",
+        "flex items-center flex-wrap mx-auto px-4 md:px-8",
         isClient ? "" : "max-w-[320px]"
       )}
-      ref={observe}
+      // ref={observe}
       style={{
         position: "relative",
       }}
@@ -119,10 +126,10 @@ const MasonryGallery = ({
         const rowAspectRatioSum = currentRow.aspect;
         const ar = getAspectRatio(image);
         let width;
-        let height = `calc(100vw / ${rowAspectRatioSum} - 10px)`;
+        let height = `calc(${galleryWidth} / ${rowAspectRatioSum} - 10px)`;
         if (rowAspectRatioSum < targetAspect * 0.66) {
           // incomplete row, render stuff at "ideal" sizes instead of filling width
-          width = `calc(100vw / ${targetAspect / ar})`;
+          width = `calc(calc(100vw - 160px) / ${targetAspect / ar})`;
           height = "unset";
         } else {
           const widthNumber = ((ar / rowAspectRatioSum) * 100).toFixed(7);
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
index 2d14380..7522763 100644
--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -81,7 +81,7 @@ const Nav = ({ internalLinks, className }: NavProps) => {
   return (
     <nav
       className={classnames(
-        "my-4 flex flex-col-reverse md:flex-row items-center w-full font-sans px-8",
+        "my-4 flex flex-col-reverse md:flex-row items-center w-full font-sans px-4 md:px-8",
         className
       )}
       style={{ zIndex: 100 }}
diff --git a/src/pages/photogallery.tsx b/src/pages/photogallery.tsx
index adb6ec5..46fadf4 100644
--- a/src/pages/photogallery.tsx
+++ b/src/pages/photogallery.tsx
@@ -185,7 +185,7 @@ const GalleryPage = ({ data }: PageProps<Queries.GalleryPageQueryQuery>) => {
             ]}
           />
         </div>
-        <div className="flex flex-col md:flex-row md:items-end justify-between px-6 sm:mx-auto">
+        <div className="flex flex-col md:flex-row md:items-end justify-between px-4 md:px-8 sm:mx-auto">
           <KeywordsPicker
             keywords={[
               "night",