diff --git a/src/layout/AppLayout.vue b/src/layout/AppLayout.vue
index 6c98b38..16b70ed 100644
--- a/src/layout/AppLayout.vue
+++ b/src/layout/AppLayout.vue
@@ -64,6 +64,7 @@ const isOutsideClicked = (event) => {
     <div v-if="userPrefStore.userLoaded" class="layout-wrapper" :class="containerClass">
         <app-topbar :page="page"></app-topbar>
        <div class="layout-sidebar">
+
             <app-sidebar></app-sidebar>
         </div>
         <div class="layout-main-container">
diff --git a/src/layout/AppMenu.vue b/src/layout/AppMenu.vue
index fad86de..a610122 100644
--- a/src/layout/AppMenu.vue
+++ b/src/layout/AppMenu.vue
@@ -1,8 +1,11 @@
 <script setup>
 import { ref } from 'vue';
 
+import { UserPrefStore } from '../stores/UserPrefStore.js';
 import AppMenuItem from './AppMenuItem.vue';
 
+const userPrefStore = UserPrefStore();
+
 const model = ref([
     {
         label: 'Scenarios',
diff --git a/src/layout/AppTopbar.vue b/src/layout/AppTopbar.vue
index 29f5609..d4bb6a9 100644
--- a/src/layout/AppTopbar.vue
+++ b/src/layout/AppTopbar.vue
@@ -4,6 +4,7 @@ import { useAuth } from '@websanova/vue-auth/src/v3.js';
 import { useRouter } from 'vue-router';
 
 
+import { LoadingStore } from '../stores/LoadingStore.js';
 import { ScenarioStore } from '../stores/ScenarioStore.js';
 import { UserPrefStore } from '../stores/UserPrefStore.js';
 
@@ -16,6 +17,7 @@ const  router = useRouter();
 const props = defineProps(['page']);
 const userPrefStore = UserPrefStore();
 const scenario_store = ScenarioStore();
+const loadingStore = LoadingStore()
 
 const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
 
@@ -54,6 +56,8 @@ const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
         <div class="layout-topbar-actions">
             <div class="layout-config-menu">
                 
+                <ProgressSpinner v-if="loadingStore.isLoading" style="width: 25px; height: 25px; margin-top: 6px" strokeWidth="2" fill="transparent"/>
+
                 <button  @click="router.push('/canvas')" class="layout-topbar-action" >
                     <i class="pi pi-file-edit"></i>
                 </button >
@@ -75,6 +79,7 @@ const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
                     <AppConfigurator />
                 </div>
             </div>
+
             <Dropdown 
                         v-model="userPrefStore.selectedApp"
                         :options="userPrefStore.availableApp"
diff --git a/src/stores/LoadingStore.js b/src/stores/LoadingStore.js
new file mode 100644
index 0000000..59d8a33
--- /dev/null
+++ b/src/stores/LoadingStore.js
@@ -0,0 +1,21 @@
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
+
+export const LoadingStore = defineStore('loading_store', () => {
+
+
+    const scenario_loading = ref(false)
+    const user_loading = ref(false)
+    const another_loading = ref(false)
+    
+    const  isLoading = computed(() => {
+        return scenario_loading.value || user_loading.value || another_loading.value
+    })
+
+    return {isLoading, 
+            user_loading, 
+            scenario_loading, 
+            another_loading
+        }
+})
\ No newline at end of file
diff --git a/src/stores/ScenarioStore.js b/src/stores/ScenarioStore.js
index 3fce4b8..2ac8d6d 100644
--- a/src/stores/ScenarioStore.js
+++ b/src/stores/ScenarioStore.js
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 import { ScenarioService } from '../service/ScenarioService'
+import { LoadingStore } from './LoadingStore'
 import { UserPrefStore } from './UserPrefStore'
 
 export const ScenarioStore = defineStore('scenario_store', () => {
@@ -11,24 +12,31 @@ export const ScenarioStore = defineStore('scenario_store', () => {
     const applicationScenarios = ref([])
     const filterString = ref('')
     const allScenarios = ref([])
+
     const userPrefStore  = UserPrefStore()
+    const loadingStore = LoadingStore()
 
 
     async function fetchScenarios() {
-
+        loadingStore.scenario_loading = true;
         await ScenarioService.getScenariosProject(userPrefStore.selectedProject).then(resp => {
             projectScenarios.value = resp.data;
             allScenarios.value = [...projectScenarios.value]
+            loadingStore.scenario_loading = false;
         });
+        
     }
 
 
     async function fetchApplicationScenarios() {
+        loadingStore.scenario_loading = true;
 
         await  ScenarioService.getScenariosApplication(userPrefStore.selectedApp).then(resp=>{
             console.log("response scenari", resp);
             applicationScenarios.value = resp.data
-            allScenarios.value = [...projectScenarios.value, ...applicationScenarios.value]
+            allScenarios.value = [...projectScenarios.value, ...applicationScenarios.value]            
+            loadingStore.scenario_loading = false;
+
         })
     }
 
@@ -47,5 +55,11 @@ export const ScenarioStore = defineStore('scenario_store', () => {
     })
 
 
-    return {filteredScenarios, projectScenarios, applicationScenarios, fetchScenarios,fetchApplicationScenarios,scenarios,filterString }
+    return {filteredScenarios, 
+            projectScenarios, 
+            applicationScenarios, 
+            fetchScenarios,
+            fetchApplicationScenarios,
+            scenarios,
+            filterString }
   })
\ No newline at end of file
diff --git a/src/stores/UserPrefStore.js b/src/stores/UserPrefStore.js
index 58a253a..953c49d 100644
--- a/src/stores/UserPrefStore.js
+++ b/src/stores/UserPrefStore.js
@@ -1,19 +1,24 @@
 import { useAuth } from '@websanova/vue-auth/src/v3.js';
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
+import { LoadingStore } from './LoadingStore';
+
 export const UserPrefStore = defineStore('userpref_store', () => {
 
     const user = ref(null)
     const userLoaded = ref(false)
     const selectedApp = ref(null)
+    const loadingStore = LoadingStore()
+
 
     async function fetchUserData(){
       
       const auth = useAuth();
-
+      loadingStore.user_loading = true;
       await auth.fetch().then((fetchedUser) => {
           user.value = fetchedUser.data.data;
           userLoaded.value = true;
+          loadingStore.user_loading = false;
       }).catch((error) => {
           reject(error);
       });
diff --git a/src/views/pages/ScenarioList.vue b/src/views/pages/ScenarioList.vue
index c68350f..4224bd4 100644
--- a/src/views/pages/ScenarioList.vue
+++ b/src/views/pages/ScenarioList.vue
@@ -2,10 +2,7 @@
     <div>
     <h1>Available Scenarios</h1>
     </div>
-    <div v-if="loading" class="flex justify-center">
-    <ProgressSpinner style="width: 50px; height: 50px; margin-top: 50px" strokeWidth="3" fill="transparent"/>
-    </div>
-    <div v-else>
+    <div >
         <DataView :value="scenario_store.filteredScenarios" :layout="layout" paginator :rows="8">
         <template #header>
             <div class="header-container">
@@ -74,22 +71,21 @@
 <script setup>
     import { ChevronRightIcon } from '@heroicons/vue/24/solid';
 import DataView from 'primevue/dataview';
-import ProgressSpinner from 'primevue/progressspinner';
 import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
+import { LoadingStore } from '../../stores/LoadingStore.js';
 import { ScenarioStore } from '../../stores/ScenarioStore.js';
 
     const router = useRouter()
     const layout = ref('grid');
     const options = ref(['list', 'grid']);
     const loading = ref(true)
+    const loadingStore = LoadingStore()
 
     const scenario_store = ScenarioStore();
 
     onMounted(() => {
-            loading.value = true;
             scenario_store.fetchScenarios();
-            loading.value = false; 
         });
 
     const executeScenario = (id) => {