diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue
index 9f8e804b2..8b0c08731 100644
--- a/src/frontend/src/App.vue
+++ b/src/frontend/src/App.vue
@@ -15,6 +15,7 @@
         :style="{ 'margin-top': isMobile ? '10px' : '25px', height: '100' }"
       >
         <router-view />
+        <CreateButton v-if="addCreateButton" />
       </div>
     </q-page-container>
 
@@ -33,6 +34,7 @@
   import { computed, provide, watch } from 'vue'
   import { useLoginStore } from '@/stores/LoginStore'
   import SnapshotList from './components/SnapshotList.vue'
+  import CreateButton from './components/CreateButton.vue'
 
   const store = useLoginStore()
   
@@ -64,4 +66,24 @@
     }
   })
 
+  const includeCreateButton = [
+    'home',
+    'experiments',
+    'experimentJobs',
+    'entrypoints',
+    'plugins',
+    'pluginFiles',
+    'queues',
+    'jobs',
+    'pluginParams',
+    'tags',
+    'models',
+    'artifacts'
+  ]
+
+  const addCreateButton = computed(() => {
+    return typeof route.name === 'string' && includeCreateButton.includes(route.name)
+  })
+
+
 </script>
\ No newline at end of file
diff --git a/src/frontend/src/components/CreateButton.vue b/src/frontend/src/components/CreateButton.vue
index e04a357e5..fe235903c 100644
--- a/src/frontend/src/components/CreateButton.vue
+++ b/src/frontend/src/components/CreateButton.vue
@@ -15,8 +15,8 @@
         <q-item
           v-for="resource in resources"
           clickable 
-          :to="resource.url"
-          @click="store.triggerPopup = true"
+          :active="false"
+          @click="handleClick(resource)"
         >
           <q-item-section class="text-capitalize">
             Create {{ resource.name }}
@@ -29,23 +29,74 @@
 
 <script setup>
 import { useLoginStore } from '@/stores/LoginStore.ts'
+import { computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+const route = useRoute()
+const router = useRouter()
 
 const store = useLoginStore()
 
-const resources = [
-  {
-    name: 'experiment',
-    url: '/experiments/new'
-  },
-  {
-    name: 'entrypoint',
-    url: '/entrypoints/new'
-  },
-  {
-    name: 'plugin',
-    url: '/plugins',
-    popup: true
-  },
-]
+const defaultResources = [
+    {
+      name: 'experiment',
+      url: '/experiments/new'
+    },
+    {
+      name: 'entrypoint',
+      url: '/entrypoints/new'
+    },
+    {
+      name: 'plugin',
+      url: '/plugins',
+      popup: true
+    },
+    {
+      name: 'queue',
+      url: '/queues',
+      popup: true
+    },
+    {
+      name: 'job',
+      url: '/jobs/new'
+    },
+    {
+      name: 'plugin param',
+      url: '/pluginParams',
+      popup: true
+    },
+    {
+      name: 'tag',
+      url: '/tags',
+      popup: true
+    },
+    {
+      name: 'model',
+      url: '/models',
+      popup: true
+    },
+  ]
+
+const resources = computed(() => {
+  if(route.name === 'pluginFiles') {
+    const modifiedResources = [...defaultResources]
+    modifiedResources.splice(3, 0, {
+      name: 'plugin file',
+      url: `/plugins/${route.params.id}/files/new`,
+    })
+    return modifiedResources
+  }
+  return defaultResources
+})
+
+function handleClick(resource) {
+  if(resource.url) {
+    router.push(resource.url).then(() => {
+      if(resource.popup) {
+        store.triggerPopup = true
+      }
+    })
+  }
+}
 
 </script>
\ No newline at end of file
diff --git a/src/frontend/src/router/index.ts b/src/frontend/src/router/index.ts
index 7a3b15ff9..5333cb3cc 100644
--- a/src/frontend/src/router/index.ts
+++ b/src/frontend/src/router/index.ts
@@ -6,23 +6,27 @@ const router = createRouter({
   routes: [
     {
       path: '/',
-      component: HomeView
+      component: HomeView,
+      name: 'home'
     },
     {
       path: '/entrypoints',
-      component: () => import('../views/EntryPointsView.vue')
+      component: () => import('../views/EntryPointsView.vue'),
+      name: 'entrypoints'
     },
     {
       path: '/entrypoints/:id',
-      component: () => import('../views/CreateEntryPoint.vue')
+      component: () => import('../views/CreateEntryPoint.vue'),
     },
     {
       path: '/plugins',
-      component: () => import('../views/PluginsView.vue')
+      component: () => import('../views/PluginsView.vue'),
+      name: 'plugins'
     },
     {
       path: '/plugins/:id/files',
-      component: () => import('../views/PluginFiles.vue')
+      component: () => import('../views/PluginFiles.vue'),
+      name: 'pluginFiles'
     },
     {
       path: '/plugins/:id/files/:fileId',
@@ -30,19 +34,23 @@ const router = createRouter({
     },
     {
       path: '/queues',
-      component: () => import('../views/QueuesView.vue')
+      component: () => import('../views/QueuesView.vue'),
+      name: 'queues'
     },
     {
       path: '/experiments',
-      component: () => import('../views/ExperimentsView.vue')
+      component: () => import('../views/ExperimentsView.vue'),
+      name: 'experiments'
     },
     {
       path: '/jobs',
-      component: () => import('../views/AllJobsView.vue')
+      component: () => import('../views/AllJobsView.vue'),
+      name: 'jobs'
     },
     {
       path: '/experiments/:id/jobs',
-      component: () => import('../views/JobsView.vue')
+      component: () => import('../views/JobsView.vue'),
+      name: 'experimentJobs'
     },
     {
       path: '/experiments/:id/jobs/:jobId',
@@ -67,19 +75,23 @@ const router = createRouter({
     },
     {
       path: '/tags',
-      component: () => import('../views/TagsView.vue')
+      component: () => import('../views/TagsView.vue'),
+      name: 'tags'
     },
     {
       path: '/pluginParams',
-      component: () => import('../views/PluginParamsView.vue')
+      component: () => import('../views/PluginParamsView.vue'),
+      name: 'pluginParams'
     },
     {
       path: '/models',
-      component: () => import('../views/ModelsView.vue')
+      component: () => import('../views/ModelsView.vue'),
+      name: 'models'
     },
     {
       path: '/artifacts',
-      component: () => import('../views/ArtifactsView.vue')
+      component: () => import('../views/ArtifactsView.vue'),
+      name: 'artifacts'
     },
     {
       path: '/login',
diff --git a/src/frontend/src/views/ArtifactsView.vue b/src/frontend/src/views/ArtifactsView.vue
index 34fdcd42b..75a8a6934 100644
--- a/src/frontend/src/views/ArtifactsView.vue
+++ b/src/frontend/src/views/ArtifactsView.vue
@@ -26,19 +26,7 @@
       /> -->
     </template>
   </TableComponent>
-  <!-- <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    @click="showAddEditDialog = true"
-  >
-    <span class="sr-only">Register a new Artifact</span>
-    <q-tooltip>
-      Register a new Artifact
-    </q-tooltip>
-  </q-btn> -->
+
   <ArtifactsDialog 
     v-model="showAddEditDialog"
     @addArtifact="addArtifact"
diff --git a/src/frontend/src/views/CreateExperiment.vue b/src/frontend/src/views/CreateExperiment.vue
index 1bb1c231c..508316f59 100644
--- a/src/frontend/src/views/CreateExperiment.vue
+++ b/src/frontend/src/views/CreateExperiment.vue
@@ -120,11 +120,10 @@
 
   <div :class="`float-right`">
       <q-btn  
-        to="/experiments"
         color="negative" 
         label="Cancel"
         class="q-mr-lg"
-        @click="confirmLeave = true"
+        @click="confirmLeave = true; router.back()"
       />
       <q-btn  
         @click="submit()" 
diff --git a/src/frontend/src/views/CreateJob.vue b/src/frontend/src/views/CreateJob.vue
index a3070b45f..60552a999 100644
--- a/src/frontend/src/views/CreateJob.vue
+++ b/src/frontend/src/views/CreateJob.vue
@@ -195,11 +195,10 @@
 
   <div :class="`float-right q-mb-lg`">
       <q-btn  
-        :to="expJobOrAllJobs === 'allJobs' ? `/jobs` : `/experiments/${route.params.id}/jobs`"
         color="negative" 
         label="Cancel"
         class="q-mr-lg"
-        @click="confirmLeave = true"
+        @click="confirmLeave = true; router.back()"
       />
       <q-btn  
         @click="submit()" 
diff --git a/src/frontend/src/views/CreatePluginFile.vue b/src/frontend/src/views/CreatePluginFile.vue
index 2f1d6fc23..e765810f6 100644
--- a/src/frontend/src/views/CreatePluginFile.vue
+++ b/src/frontend/src/views/CreatePluginFile.vue
@@ -305,11 +305,10 @@
 
   <div :class="`${isMobile ? '' : ''} float-right q-mb-lg`">
     <q-btn  
-      :to="`/plugins/${route.params.id}/files`"
       color="negative" 
       label="Cancel"
       class="q-mr-lg"
-      @click="confirmLeave = true"
+      @click="confirmLeave = true; router.back()"
     />
     <q-btn  
       @click="submit()" 
diff --git a/src/frontend/src/views/EntryPointsView.vue b/src/frontend/src/views/EntryPointsView.vue
index 9d3d61d1c..39d17c843 100644
--- a/src/frontend/src/views/EntryPointsView.vue
+++ b/src/frontend/src/views/EntryPointsView.vue
@@ -65,20 +65,6 @@
     </template>
   </TableComponent>
 
-  <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    to="/entrypoints/new"
-  >
-    <span class="sr-only">Register new Entrypoint</span>
-    <q-tooltip>
-      Register new Entrypoint
-    </q-tooltip>
-  </q-btn>
-
   <InfoPopupDialog
     v-model="showTaskGraphDialog"
   >
diff --git a/src/frontend/src/views/ExperimentsView.vue b/src/frontend/src/views/ExperimentsView.vue
index 1b0695e6d..227b4e3db 100644
--- a/src/frontend/src/views/ExperimentsView.vue
+++ b/src/frontend/src/views/ExperimentsView.vue
@@ -32,8 +32,6 @@
     </template>
   </TableComponent>
 
-  <CreateButton />
-
   <DeleteDialog 
     v-model="showDeleteDialog"
     @submit="deleteExperiment"
@@ -58,7 +56,6 @@
   import DeleteDialog from '@/dialogs/DeleteDialog.vue'
   import PageTitle from '@/components/PageTitle.vue'
   import AssignTagsDialog from '@/dialogs/AssignTagsDialog.vue'
-  import CreateButton from '@/components/CreateButton.vue'
   
   const router = useRouter()
 
diff --git a/src/frontend/src/views/GroupsView.vue b/src/frontend/src/views/GroupsView.vue
index cffcf756e..a1d5f7bbd 100644
--- a/src/frontend/src/views/GroupsView.vue
+++ b/src/frontend/src/views/GroupsView.vue
@@ -19,19 +19,6 @@
       </q-td>
     </template>
   </TableComponent>
-  <!-- <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    to="/groups/admin"
-  >
-    <span class="sr-only">Create a new Group</span>
-    <q-tooltip>
-      Create a new Group
-    </q-tooltip>
-  </q-btn> -->
 </template>
 
 <script setup>
diff --git a/src/frontend/src/views/JobsView.vue b/src/frontend/src/views/JobsView.vue
index 6dc8413e7..d19c1c3f0 100644
--- a/src/frontend/src/views/JobsView.vue
+++ b/src/frontend/src/views/JobsView.vue
@@ -36,19 +36,6 @@
       />
     </template>
   </TableComponent>
-  <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    :to="`/experiments/${route.params.id}/jobs/new`"
-  >
-    <span class="sr-only">Create a new Job</span>
-    <q-tooltip>
-      Create a new Job
-    </q-tooltip>
-  </q-btn>
 
   <DeleteDialog 
     v-model="showDeleteDialog"
diff --git a/src/frontend/src/views/ModelsView.vue b/src/frontend/src/views/ModelsView.vue
index 2e70c6675..3430a3417 100644
--- a/src/frontend/src/views/ModelsView.vue
+++ b/src/frontend/src/views/ModelsView.vue
@@ -36,19 +36,7 @@
       </TableComponent>
     </template>
   </TableComponent>
-  <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    @click="showAddEditDialog = true"
-  >
-    <span class="sr-only">Register a new Model</span>
-    <q-tooltip>
-      Register a new Model
-    </q-tooltip>
-  </q-btn>
+
   <ModelsDialog 
     v-model="showAddEditDialog"
     @addModel="addModel"
@@ -78,6 +66,9 @@ import * as api from '@/services/dataApi'
 import * as notify from '../notify'
 import PageTitle from '@/components/PageTitle.vue'
 import AssignTagsDialog from '@/dialogs/AssignTagsDialog.vue'
+import { useLoginStore } from '@/stores/LoginStore'
+
+const store = useLoginStore()
 
 const selected = ref([])
 const editing = ref(false)
@@ -175,4 +166,11 @@ function formatDate(dateString) {
   return new Date(dateString).toLocaleString('en-US', options)
 }
 
+watch(() => store.triggerPopup, (newVal) => {
+  if(newVal) {
+    showAddEditDialog.value = true
+    store.triggerPopup = false
+  }
+})
+
 </script>
\ No newline at end of file
diff --git a/src/frontend/src/views/PluginFiles.vue b/src/frontend/src/views/PluginFiles.vue
index 7b1c1ba8f..48720af72 100644
--- a/src/frontend/src/views/PluginFiles.vue
+++ b/src/frontend/src/views/PluginFiles.vue
@@ -16,19 +16,6 @@
       {{ props.row.tasks.length }}
     </template>
   </TableComponent>
-  <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    :to="`/plugins/${route.params.id}/files/new`"
-  >
-    <span class="sr-only">Create New Plugin File</span>
-    <q-tooltip>
-      Create New Plugin File
-    </q-tooltip>
-  </q-btn>
 
   <DeleteDialog 
     v-model="showDeleteDialog"
diff --git a/src/frontend/src/views/PluginParamsView.vue b/src/frontend/src/views/PluginParamsView.vue
index 5f34f02c8..eb915a5be 100644
--- a/src/frontend/src/views/PluginParamsView.vue
+++ b/src/frontend/src/views/PluginParamsView.vue
@@ -17,19 +17,7 @@
       <div>{{ props.row.group.name }}</div>
     </template>
   </TableComponent>
-  <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    @click="showAddDialog = true"
-  >
-    <span class="sr-only">Register a new Plugin Param Type</span>
-    <q-tooltip>
-      Register a new Plugin Param Type
-    </q-tooltip>
-  </q-btn>
+
   <PluginParamsDialog 
     v-model="showAddDialog"
     @addPluginParamType="addPluginParamType"
@@ -59,6 +47,9 @@
   import * as notify from '../notify'
   import PageTitle from '@/components/PageTitle.vue'
   import AssignTagsDialog from '@/dialogs/AssignTagsDialog.vue'
+  import { useLoginStore } from '@/stores/LoginStore'
+
+  const store = useLoginStore()
 
   const editPluginParamType = ref({})
 
@@ -136,4 +127,11 @@
 
   const tableRef = ref(null)
 
+  watch(() => store.triggerPopup, (newVal) => {
+    if(newVal) {
+      showAddDialog.value = true
+      store.triggerPopup = false
+    }
+  })
+
 </script>
\ No newline at end of file
diff --git a/src/frontend/src/views/PluginsView.vue b/src/frontend/src/views/PluginsView.vue
index d12655b28..03b3c2331 100644
--- a/src/frontend/src/views/PluginsView.vue
+++ b/src/frontend/src/views/PluginsView.vue
@@ -38,19 +38,7 @@
       />
     </template>
   </TableComponent>
-  <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    @click="showPluginDialog = true"
-  >
-    <span class="sr-only">Register a new Plugin</span>
-    <q-tooltip>
-      Register a new Plugin
-    </q-tooltip>
-  </q-btn>
+
   <PluginDialog 
     v-model="showPluginDialog"
     @addPlugin="addPlugin"
@@ -94,10 +82,12 @@
   const showTagsDialog = ref(false)
   const editObjTags = ref({})
 
-  if(store.triggerPopup) {
-    showPluginDialog.value = true
-    store.triggerPopup = false
-  }
+  watch(() => store.triggerPopup, (newVal) => {
+    if(newVal) {
+      showPluginDialog.value = true
+      store.triggerPopup = false
+    }
+  })
 
   const plugins = ref([])
 
diff --git a/src/frontend/src/views/QueuesView.vue b/src/frontend/src/views/QueuesView.vue
index ea4fe8ab5..cdd0dd805 100644
--- a/src/frontend/src/views/QueuesView.vue
+++ b/src/frontend/src/views/QueuesView.vue
@@ -24,19 +24,7 @@
       />
     </template>
   </TableComponent>
-  <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    @click="showQueueDialog = true"
-  >
-    <span class="sr-only">Register a new Queue</span>
-    <q-tooltip>
-      Register a new Queue
-    </q-tooltip>
-  </q-btn>
+
   <QueueDialog 
     v-model="showQueueDialog"
     @addQueue="addQueue"
@@ -201,4 +189,11 @@
 
   const editObjTags = ref({})
 
+  watch(() => store.triggerPopup, (newVal) => {
+    if(newVal) {
+      showQueueDialog.value = true
+      store.triggerPopup = false
+    }
+  })
+
 </script>
diff --git a/src/frontend/src/views/TagsView.vue b/src/frontend/src/views/TagsView.vue
index 21125863f..f248cf542 100644
--- a/src/frontend/src/views/TagsView.vue
+++ b/src/frontend/src/views/TagsView.vue
@@ -17,19 +17,7 @@
       </q-chip>
     </template>
   </TableComponent>
-  <q-btn 
-    class="fixedButton"
-    round
-    color="primary"
-    icon="add"
-    size="lg"
-    @click="showAddDialog = true"
-  >
-    <span class="sr-only">Register a new Tag</span>
-    <q-tooltip>
-      Register a new Tag
-    </q-tooltip>
-  </q-btn>
+
   <AddTagsDialog 
     v-model="showAddDialog"
     @addTag="addTag"
@@ -52,6 +40,9 @@
   import AddTagsDialog from '@/dialogs/AddTagsDialog.vue'
   import DeleteDialog from '@/dialogs/DeleteDialog.vue'
   import PageTitle from '@/components/PageTitle.vue'
+  import { useLoginStore } from '@/stores/LoginStore'
+
+  const store = useLoginStore()
 
   const showAddDialog = ref(false)
   const showDeleteDialog = ref(false)
@@ -123,4 +114,11 @@
     }
   }
 
+  watch(() => store.triggerPopup, (newVal) => {
+    if(newVal) {
+      showAddDialog.value = true
+      store.triggerPopup = false
+    }
+  })
+
 </script>