diff --git a/postcss.config.cjs b/postcss.config.cjs
index 4669c08..c8d0770 100644
--- a/postcss.config.cjs
+++ b/postcss.config.cjs
@@ -4,6 +4,7 @@ const focusVisible = require('postcss-focus-visible')
 // const sortMediaQueries = require('postcss-sort-media-queries')
 const normalize = require('postcss-normalize')
 
+const dev = process.env.NODE_ENV !== 'development'
 
 module.exports = {
     plugins: [
@@ -24,7 +25,7 @@ module.exports = {
         normalize({}),
 
         // CSS Nano
-        !process.env.DEV && cssnano({
+        !dev && cssnano({
             preset: ['default', {
                 autoprefixer: true,
                 discardComments: { removeAll: true },
diff --git a/src/components/atoms/Button.svelte b/src/components/atoms/Button.svelte
index c879ce3..56ac503 100644
--- a/src/components/atoms/Button.svelte
+++ b/src/components/atoms/Button.svelte
@@ -45,7 +45,7 @@
         href={url} class={classes}
         {target} {rel}
         data-sveltekit-prefetch={url && (isExternal || isProtocol) ? null : true}
-        data-sveltekit-noscroll={isExternal || isProtocol ? null : true}
+        data-sveltekit-noscroll={isExternal || isProtocol ? 'off' : ''}
         {disabled}
         tabindex="0"
         on:click
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index e283652..b076f62 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -40,7 +40,7 @@
      */
     // Store previous page (for photo Viewer close button)
     beforeNavigate(({ from }) => {
-        $previousPage = from.pathname
+        $previousPage = from.url.pathname
     })
 
     // Define page loading from navigating store