diff --git a/examples/demo/views/layouts/base.pug b/examples/demo/views/layouts/base.pug
index db156db..ff5a26b 100644
--- a/examples/demo/views/layouts/base.pug
+++ b/examples/demo/views/layouts/base.pug
@@ -7,17 +7,7 @@ html(lang="en")
     block title
       title Pugz Store
   body
-    header.header
-      .container
-        .header-content
-          a.logo(href="/") Pugz Store
-          nav.nav
-            a.nav-link(href="/") Home
-            a.nav-link(href="/products") Products
-            a.nav-link(href="/about") About
-          .header-actions
-            a.cart-link(href="/cart")
-              | Cart (#{cartCount})
+    include ../partials/navbar.pug
 
     main
       block content
diff --git a/examples/demo/views/pages/404.pug b/examples/demo/views/pages/404.pug
index c23a91f..3bafdb9 100644
--- a/examples/demo/views/pages/404.pug
+++ b/examples/demo/views/pages/404.pug
@@ -1,4 +1,4 @@
-extends layouts/base.pug
+extends ../layouts/base.pug
 
 block title
   title #{title} | Pugz Store
diff --git a/examples/demo/views/pages/about.pug b/examples/demo/views/pages/about.pug
index 9e5d836..cb82800 100644
--- a/examples/demo/views/pages/about.pug
+++ b/examples/demo/views/pages/about.pug
@@ -1,4 +1,4 @@
-extends layouts/base.pug
+extends ../layouts/base.pug
 
 block title
   title #{title} | Pugz Store
diff --git a/examples/demo/views/pages/cart.pug b/examples/demo/views/pages/cart.pug
index 64b7f09..08141a8 100644
--- a/examples/demo/views/pages/cart.pug
+++ b/examples/demo/views/pages/cart.pug
@@ -1,4 +1,4 @@
-extends layouts/base.pug
+extends ../layouts/base.pug
 
 block title
   title #{title} | Pugz Store
diff --git a/examples/demo/views/pages/checkout.pug b/examples/demo/views/pages/checkout.pug
index bd05e94..fa2b2cf 100644
--- a/examples/demo/views/pages/checkout.pug
+++ b/examples/demo/views/pages/checkout.pug
@@ -1,7 +1,7 @@
-extends layouts/base.pug
-include mixins/forms.pug
-include mixins/alerts.pug
-include mixins/buttons.pug
+extends ../layouts/base.pug
+include ../mixins/forms.pug
+include ../mixins/alerts.pug
+include ../mixins/buttons.pug
 
 block content
   h1 Checkout
diff --git a/examples/demo/views/pages/home.pug b/examples/demo/views/pages/home.pug
index fd2f506..8906e42 100644
--- a/examples/demo/views/pages/home.pug
+++ b/examples/demo/views/pages/home.pug
@@ -1,4 +1,4 @@
-extends layouts/base.pug
+extends ../layouts/base.pug
 
 block title
   title #{title} | Pugz Store
diff --git a/examples/demo/views/pages/include-demo.pug b/examples/demo/views/pages/include-demo.pug
index ac5626f..f649584 100644
--- a/examples/demo/views/pages/include-demo.pug
+++ b/examples/demo/views/pages/include-demo.pug
@@ -1,4 +1,4 @@
-extends layouts/base.pug
+extends ../layouts/base.pug
 
 block title
   title Include Demo | Pugz Store
diff --git a/examples/demo/views/pages/product-detail.pug b/examples/demo/views/pages/product-detail.pug
index f8f28ca..622bfd0 100644
--- a/examples/demo/views/pages/product-detail.pug
+++ b/examples/demo/views/pages/product-detail.pug
@@ -1,4 +1,4 @@
-extends layouts/base.pug
+extends ../layouts/base.pug
 
 block title
   title #{productName} | Pugz Store
diff --git a/examples/demo/views/pages/products.pug b/examples/demo/views/pages/products.pug
index 5c5d414..1000809 100644
--- a/examples/demo/views/pages/products.pug
+++ b/examples/demo/views/pages/products.pug
@@ -1,4 +1,4 @@
-extends layouts/base.pug
+extends ../layouts/base.pug
 
 block title
   title #{title} | Pugz Store
diff --git a/examples/demo/views/partials/navbar.pug b/examples/demo/views/partials/navbar.pug
new file mode 100644
index 0000000..5bd1f48
--- /dev/null
+++ b/examples/demo/views/partials/navbar.pug
@@ -0,0 +1,11 @@
+header.header
+  .container
+    .header-content
+      a.logo(href="/") Pugz Store
+      nav.nav
+        a.nav-link(href="/") Home
+        a.nav-link(href="/products") Products
+        a.nav-link(href="/about") About
+      .header-actions
+        a.cart-link(href="/cart")
+          | Cart (#{cartCount})