diff --git a/pages/avatar/index.vue b/pages/avatar/index.vue
index f1bae9e5f..bfc18a94d 100644
--- a/pages/avatar/index.vue
+++ b/pages/avatar/index.vue
@@ -111,12 +111,9 @@ import AvatarDoc from './AvatarDoc';
 export default {
     data() {
         return {
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
-    mounted() {
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
-    },
     components: {
         AvatarDoc: AvatarDoc
     }
diff --git a/pages/carousel/index.vue b/pages/carousel/index.vue
index 46d17fd8c..d8325fc45 100755
--- a/pages/carousel/index.vue
+++ b/pages/carousel/index.vue
@@ -125,7 +125,7 @@ export default {
                     numScroll: 1
                 }
             ],
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     productService: null,
@@ -134,8 +134,6 @@ export default {
     },
     mounted() {
         this.productService.getProductsSmall().then((data) => (this.products = data.slice(0, 9)));
-
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     components: {
         CarouselDoc: CarouselDoc
diff --git a/pages/chip/index.vue b/pages/chip/index.vue
index a85b5414a..f4cb1ad8e 100644
--- a/pages/chip/index.vue
+++ b/pages/chip/index.vue
@@ -59,12 +59,9 @@ import ChipDoc from './ChipDoc';
 export default {
     data() {
         return {
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
-    mounted() {
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
-    },
     components: {
         ChipDoc: ChipDoc
     }
diff --git a/pages/datatable/Crud.vue b/pages/datatable/Crud.vue
index 22f59c170..61da60550 100755
--- a/pages/datatable/Crud.vue
+++ b/pages/datatable/Crud.vue
@@ -1171,7 +1171,7 @@ export default {
 `
                 }
             },
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     productService: null,
@@ -1181,7 +1181,6 @@ export default {
     },
     mounted() {
         this.productService.getProducts().then((data) => (this.products = data));
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         formatCurrency(value) {
diff --git a/pages/datatable/Filter.vue b/pages/datatable/Filter.vue
index 6c7b8af25..101024ff6 100755
--- a/pages/datatable/Filter.vue
+++ b/pages/datatable/Filter.vue
@@ -1316,7 +1316,7 @@ export default {
 `
                 }
             },
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     created() {
@@ -1335,8 +1335,6 @@ export default {
             this.loading2 = false;
             this.customers2.forEach((customer) => (customer.date = new Date(customer.date)));
         });
-
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         formatDate(value) {
diff --git a/pages/datatable/RowExpand.vue b/pages/datatable/RowExpand.vue
index da47c465d..ced026f51 100755
--- a/pages/datatable/RowExpand.vue
+++ b/pages/datatable/RowExpand.vue
@@ -451,7 +451,7 @@ export default {
 `
                 }
             },
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     productService: null,
@@ -460,7 +460,6 @@ export default {
     },
     mounted() {
         this.productService.getProductsWithOrdersSmall().then((data) => (this.products = data));
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         onRowExpand(event) {
diff --git a/pages/datatable/RowGroup.vue b/pages/datatable/RowGroup.vue
index 1462b8283..3bb32d625 100755
--- a/pages/datatable/RowGroup.vue
+++ b/pages/datatable/RowGroup.vue
@@ -632,7 +632,7 @@ export default {
 `
                 }
             },
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     customerService: null,
@@ -641,7 +641,6 @@ export default {
     },
     mounted() {
         this.customerService.getCustomersMedium().then((data) => (this.customers = data));
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         onRowGroupExpand(event) {
diff --git a/pages/datatable/Scroll.vue b/pages/datatable/Scroll.vue
index 13944d2a3..63867724a 100755
--- a/pages/datatable/Scroll.vue
+++ b/pages/datatable/Scroll.vue
@@ -826,7 +826,7 @@ export default {
 `
                 }
             },
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     customerService: null,
@@ -862,8 +862,6 @@ export default {
                 }
             }
         ];
-
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         openDialog() {
diff --git a/pages/datatable/State.vue b/pages/datatable/State.vue
index d55821adb..35b7564b9 100755
--- a/pages/datatable/State.vue
+++ b/pages/datatable/State.vue
@@ -695,7 +695,7 @@ export default {
 `
                 }
             },
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     customerService: null,
@@ -706,7 +706,6 @@ export default {
     },
     mounted() {
         this.customerService.getCustomersMedium().then((data) => (this.customers = data));
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         initFilters1() {
diff --git a/pages/datatable/Templating.vue b/pages/datatable/Templating.vue
index c3e634177..2177daede 100755
--- a/pages/datatable/Templating.vue
+++ b/pages/datatable/Templating.vue
@@ -296,7 +296,7 @@ export default {
 `
                 }
             },
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     productService: null,
@@ -305,7 +305,6 @@ export default {
     },
     mounted() {
         this.productService.getProductsSmall().then((data) => (this.products = data));
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         formatCurrency(value) {
diff --git a/pages/datatable/index.vue b/pages/datatable/index.vue
index cc0afc270..b4dc4991d 100755
--- a/pages/datatable/index.vue
+++ b/pages/datatable/index.vue
@@ -169,7 +169,7 @@ export default {
                 { name: 'XuXue Feng', image: 'xuxuefeng.png' }
             ],
             statuses: ['unqualified', 'qualified', 'new', 'negotiation', 'renewal', 'proposal'],
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     created() {
@@ -181,8 +181,6 @@ export default {
             this.customers.forEach((customer) => (customer.date = new Date(customer.date)));
             this.loading = false;
         });
-
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     },
     methods: {
         formatDate(value) {
diff --git a/pages/galleria/Advanced.vue b/pages/galleria/Advanced.vue
index 628101cba..43d333334 100644
--- a/pages/galleria/Advanced.vue
+++ b/pages/galleria/Advanced.vue
@@ -244,7 +244,7 @@ export default {
             activeIndex: 0,
             showThumbnails: false,
             fullScreen: false,
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -254,7 +254,6 @@ export default {
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
         this.bindDocumentListeners();
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     },
     methods: {
         onThumbnailButtonClick() {
diff --git a/pages/galleria/AutoPlay.vue b/pages/galleria/AutoPlay.vue
index 1fa114512..207598693 100755
--- a/pages/galleria/AutoPlay.vue
+++ b/pages/galleria/AutoPlay.vue
@@ -96,7 +96,7 @@ export default {
                     numVisible: 1
                 }
             ],
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -105,7 +105,6 @@ export default {
     },
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     }
 };
 </script>
diff --git a/pages/galleria/Caption.vue b/pages/galleria/Caption.vue
index 19e7f2686..a882ab73c 100755
--- a/pages/galleria/Caption.vue
+++ b/pages/galleria/Caption.vue
@@ -107,7 +107,7 @@ export default {
                     numVisible: 1
                 }
             ],
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -116,7 +116,6 @@ export default {
     },
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     }
 };
 </script>
diff --git a/pages/galleria/FullScreen.vue b/pages/galleria/FullScreen.vue
index 92669fe47..6a61a9e84 100755
--- a/pages/galleria/FullScreen.vue
+++ b/pages/galleria/FullScreen.vue
@@ -225,7 +225,7 @@ export default {
             displayBasic: false,
             displayBasic2: false,
             displayCustom: false,
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -234,7 +234,6 @@ export default {
     },
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     },
     methods: {
         imageClick(index) {
diff --git a/pages/galleria/Indicator.vue b/pages/galleria/Indicator.vue
index 7bcd91cf8..ef0ae938a 100755
--- a/pages/galleria/Indicator.vue
+++ b/pages/galleria/Indicator.vue
@@ -266,7 +266,7 @@ export default {
                     numVisible: 1
                 }
             ],
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -278,8 +278,6 @@ export default {
             this.images = data;
             this.images2 = data.slice(0, 5);
         });
-
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     }
 };
 </script>
diff --git a/pages/galleria/Navigator.vue b/pages/galleria/Navigator.vue
index c5ae6cdbb..5b10a7d71 100755
--- a/pages/galleria/Navigator.vue
+++ b/pages/galleria/Navigator.vue
@@ -177,7 +177,7 @@ export default {
                     numVisible: 1
                 }
             ],
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -186,7 +186,6 @@ export default {
     },
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     }
 };
 </script>
diff --git a/pages/galleria/Programmatic.vue b/pages/galleria/Programmatic.vue
index 152269d8b..6687f06c6 100644
--- a/pages/galleria/Programmatic.vue
+++ b/pages/galleria/Programmatic.vue
@@ -115,7 +115,7 @@ export default {
                     numVisible: 1
                 }
             ],
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -124,7 +124,6 @@ export default {
     },
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     },
     methods: {
         next() {
diff --git a/pages/galleria/Responsive.vue b/pages/galleria/Responsive.vue
index 11dc0b57c..152c06766 100755
--- a/pages/galleria/Responsive.vue
+++ b/pages/galleria/Responsive.vue
@@ -103,7 +103,7 @@ export default {
                     numVisible: 1
                 }
             ],
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -112,7 +112,6 @@ export default {
     },
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     }
 };
 </script>
diff --git a/pages/galleria/Thumbnail.vue b/pages/galleria/Thumbnail.vue
index d955d2569..369fcc507 100755
--- a/pages/galleria/Thumbnail.vue
+++ b/pages/galleria/Thumbnail.vue
@@ -191,7 +191,7 @@ export default {
                     numVisible: 1
                 }
             ],
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -200,7 +200,6 @@ export default {
     },
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     }
 };
 </script>
diff --git a/pages/galleria/index.vue b/pages/galleria/index.vue
index 7ece9a9bf..67a18e289 100755
--- a/pages/galleria/index.vue
+++ b/pages/galleria/index.vue
@@ -53,7 +53,7 @@ export default {
                     numVisible: 1
                 }
             ],
-            baseUrl: ''
+            baseUrl: process.dev ? '' : '/primevue-nuxt'
         };
     },
     galleriaService: null,
@@ -62,7 +62,6 @@ export default {
     },
     mounted() {
         this.galleriaService.getImages().then((data) => (this.images = data));
-        this.baseUrl = process.dev ? '' : '/primevue-nuxt';
     },
     components: {
         GalleriaDoc: GalleriaDoc
diff --git a/pages/image/index.vue b/pages/image/index.vue
index b69a2eded..76a4442e4 100644
--- a/pages/image/index.vue
+++ b/pages/image/index.vue
@@ -33,12 +33,10 @@ import ImageDoc from './ImageDoc';
 export default {
     data() {
         return {
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
-    mounted() {
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
-    },
+
     components: {
         ImageDoc: ImageDoc
     }
diff --git a/pages/landing/FooterSection.vue b/pages/landing/FooterSection.vue
index e012dd9b3..eeb50ea19 100644
--- a/pages/landing/FooterSection.vue
+++ b/pages/landing/FooterSection.vue
@@ -90,11 +90,8 @@
 export default {
     data() {
         return {
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
-    },
-    mounted() {
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
     }
 };
 </script>
diff --git a/pages/landing/HeaderSection.vue b/pages/landing/HeaderSection.vue
index 454096198..8bb8addb6 100644
--- a/pages/landing/HeaderSection.vue
+++ b/pages/landing/HeaderSection.vue
@@ -55,15 +55,11 @@ export default {
     data() {
         return {
             menuActive: false,
-            baseUrl: '/'
+            baseUrl: process.dev ? '/' : '/primevue-nuxt/'
         };
     },
     scrollListener: null,
     container: null,
-    mounted() {
-        this.bindScrollListener();
-        this.baseUrl = process.dev ? '/' : '/primevue-nuxt/';
-    },
     beforeUnmount() {
         if (this.scrollListener) {
             this.unbindScrollListener();
diff --git a/pages/setup/index.vue b/pages/setup/index.vue
index 5907b152c..bbd62ecc7 100755
--- a/pages/setup/index.vue
+++ b/pages/setup/index.vue
@@ -332,7 +332,7 @@ app.use(PrimeVue, {
                         <tr>
                             <th>
                                 <div class="flex align-items-center">
-                                    <img src="@/assets/images//browsers/edge.svg" alt="edge" style="width: 1.5rem" class="mr-2" />
+                                    <img src="@/assets/images/browsers/edge.svg" alt="edge" style="width: 1.5rem" class="mr-2" />
                                     Edge
                                 </div>
                             </th>