diff --git a/src/App.vue b/src/App.vue
index 2a7fe2b0..e558f00c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,12 @@
 <script setup lang="ts">
 import type { GlobalThemeOverrides } from "naive-ui";
 import { materialTheme, Notifications, Notivue } from "notivue";
+import { useRouter } from "vue-router";
 
+import { current_route, prev_route } from "@/stores/nav";
 import { theme } from "@/stores/settings";
 
+const router = useRouter();
 const themeOverrides: GlobalThemeOverrides = {
   Button: {},
   Form: {
@@ -11,6 +14,12 @@ const themeOverrides: GlobalThemeOverrides = {
     labelFontWeight: "600",
   },
 };
+
+router.beforeEach((to, from) => {
+  if (typeof from.name !== "string") return;
+  prev_route.value = !to.query?._clear ? from : null;
+  current_route.value = to;
+});
 </script>
 
 <template>
diff --git a/src/components/sidebar/AppSidebar.vue b/src/components/sidebar/AppSidebar.vue
index dbad4ec6..d0c0991e 100644
--- a/src/components/sidebar/AppSidebar.vue
+++ b/src/components/sidebar/AppSidebar.vue
@@ -305,12 +305,14 @@ const toggleSidebar = (collapsed: boolean) => {
 
 const navigateTo = (value: string) => {
   const routeName = value.split(":")[0];
-
   if (routeName === "studies") {
     sidebarStore.setAppSidebarCollapsed(false);
 
     router.push({
       name: value,
+      query: {
+        _clear: "true",
+      },
     });
 
     return;
@@ -318,12 +320,14 @@ const navigateTo = (value: string) => {
 
   if (routeName === "study") {
     sidebarStore.setAppSidebarCollapsed(false);
-
     router.push({
       name: value,
       params: {
         studyId: studyID.value,
       },
+      query: {
+        _clear: "true",
+      },
     });
 
     return;
@@ -337,6 +341,9 @@ const navigateTo = (value: string) => {
       params: {
         studyId: studyID.value,
       },
+      query: {
+        _clear: "true",
+      },
     });
 
     return;
@@ -373,8 +380,6 @@ const defaultExpandedKeys = computed(() => {
   if (currentRoute.name) {
     const name = currentRoute.name as string;
 
-    console.log("appsidebar-name", name, name.startsWith("study:metadata"));
-
     if (name.startsWith("study:metadata")) {
       return ["study:metadata"];
     }
@@ -390,7 +395,7 @@ const selectAndExpand = (key: string) => {
   menuInstRef.value?.showOption(key);
 };
 
-router.beforeEach((to, from) => {
+router.beforeEach((to) => {
   if (typeof to.name !== "string") return;
   const name: string = to.meta && to.meta.menuItem ? (to.meta.menuItem as string) : to.name;
   selectAndExpand(name);
diff --git a/src/components/sidebar/DatasetSidebar.vue b/src/components/sidebar/DatasetSidebar.vue
index a23b6669..794575ce 100644
--- a/src/components/sidebar/DatasetSidebar.vue
+++ b/src/components/sidebar/DatasetSidebar.vue
@@ -163,6 +163,9 @@ const navigateTo = (value: string) => {
         datasetId: datasetId.value,
         studyId: studyID.value,
       },
+      query: {
+        _clear: "true",
+      },
     });
 
     return;
@@ -206,7 +209,7 @@ const selectAndExpand = (key: string) => {
   menuInstRef.value?.showOption(key);
 };
 
-router.beforeEach((to, from) => {
+router.beforeEach((to) => {
   if (typeof to.name !== "string") return;
   const name: string = to.meta && to.meta.menuItem ? (to.meta.menuItem as string) : to.name;
   selectAndExpand(name);
diff --git a/src/stores/nav.ts b/src/stores/nav.ts
new file mode 100644
index 00000000..2dbdf31e
--- /dev/null
+++ b/src/stores/nav.ts
@@ -0,0 +1,52 @@
+import type { Ref } from "vue/dist/vue";
+import type { RouteLocationNormalized } from "vue-router";
+
+export const prev_route: Ref<RouteLocationNormalized | null | undefined> = ref(null);
+export const current_route: Ref<RouteLocationNormalized | null | undefined> = ref(null);
+
+export function getBackRoute(): string {
+  if (prev_route.value && typeof prev_route.value.name == "string") {
+    if (prev_route.value.name == "dataset:publish:version:study-metadata") {
+      return "dataset:publish:version:study-metadata";
+    }
+    if (prev_route.value.name == "dataset:publish:version:dataset-metadata") {
+      return "dataset:publish:version:dataset-metadata";
+    }
+    if (prev_route.value.name.startsWith("dataset:")) {
+      return "dataset:overview";
+    }
+    if (prev_route.value.name.startsWith("study:")) {
+      return "study:overview";
+    }
+  }
+  if (current_route.value && typeof current_route.value.name == "string") {
+    if (current_route.value.name.startsWith("dataset")) {
+      return "dataset:overview";
+    }
+    if (current_route.value.name.startsWith("study")) {
+      console.log("oh no were here");
+      return "study:overview";
+    }
+  }
+  return "study:overview";
+}
+
+export function getBackParams(): object {
+  if (prev_route.value && typeof prev_route.value.name == "string") {
+    if (prev_route.value.name == "dataset:publish:version:study-metadata") {
+      return prev_route.value?.params;
+    }
+    if (prev_route.value.name == "dataset:publish:version:dataset-metadata") {
+      return prev_route.value?.params;
+    }
+  }
+  if (current_route.value && typeof current_route.value.name == "string") {
+    if (current_route.value.name.startsWith("dataset")) {
+      return current_route.value?.params;
+    }
+    if (current_route.value.name.startsWith("study")) {
+      return current_route.value?.params;
+    }
+  }
+  return current_route.value ? current_route.value.params : {};
+}
diff --git a/src/types/Version.d.ts b/src/types/Version.d.ts
index f7f19ef4..021f97f2 100644
--- a/src/types/Version.d.ts
+++ b/src/types/Version.d.ts
@@ -41,6 +41,7 @@ export interface VersionStudyOverallOfficial {
   id: string;
   name: string;
   affiliation: string;
+  role: string;
 }
 
 export interface VersionDesign {
@@ -103,7 +104,8 @@ export interface VersionStudyStatusModule {
 }
 
 export interface VersionStudySponsor {
-  responsible_party_investigator_name: string;
+  lead_sponsor_name: string;
+  responsible_party_investigator_name: string | null;
   responsible_party_type: string;
 }
 
@@ -125,7 +127,6 @@ export interface VersionStudyArm {
 export interface VersionStudyEligibility {
   gender: string | null;
   gender_based: string | null;
-  maximum_age_value: number | null;
   minimum_age_value: number | null;
 }
 
@@ -233,7 +234,7 @@ export interface VersionDatasetSubjects {
 export interface VersionDatasetAccess {
   description: string;
   type: string | null;
-  url: string;
+  url: string | null;
   url_last_checked: number | null;
 }
 
@@ -246,7 +247,7 @@ export interface VersionDatasetRights {
 export interface VersionDatasetFunders {
   id: string;
   name: string;
-  award_number: string;
+  award_number: string | null;
   identifier: string;
 }
 
diff --git a/src/views/study/dataset/metadata/about/DatasetMetadataOther.vue b/src/views/study/dataset/metadata/about/DatasetMetadataOther.vue
index 5c1abb21..1c9c5301 100644
--- a/src/views/study/dataset/metadata/about/DatasetMetadataOther.vue
+++ b/src/views/study/dataset/metadata/about/DatasetMetadataOther.vue
@@ -2,6 +2,7 @@
 import type { FormInst } from "naive-ui";
 
 import LANGUAGES_JSON from "@/assets/data/languages.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetOther } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -119,10 +120,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Additional Metadata"
       description="Some metadata that didn't really fit in other sections."
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/access/DatasetMetadataAccess.vue b/src/views/study/dataset/metadata/access/DatasetMetadataAccess.vue
index 06e5ea54..23f95c5d 100644
--- a/src/views/study/dataset/metadata/access/DatasetMetadataAccess.vue
+++ b/src/views/study/dataset/metadata/access/DatasetMetadataAccess.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { FormInst } from "naive-ui";
+import type { FormInst, FormRules } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetAccess } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
-
 const route = useRoute();
 const push = usePush();
 
@@ -102,10 +102,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Access Details"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/consent/DatasetMetadataConsent.vue b/src/views/study/dataset/metadata/consent/DatasetMetadataConsent.vue
index 9d232039..07875fa9 100644
--- a/src/views/study/dataset/metadata/consent/DatasetMetadataConsent.vue
+++ b/src/views/study/dataset/metadata/consent/DatasetMetadataConsent.vue
@@ -2,9 +2,9 @@
 import type { FormInst } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetConsent } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
-
 const route = useRoute();
 const push = usePush();
 
@@ -113,10 +113,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Consent"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/contributors/DatasetMetadataContributors.vue b/src/views/study/dataset/metadata/contributors/DatasetMetadataContributors.vue
index e0280799..3a393d5e 100644
--- a/src/views/study/dataset/metadata/contributors/DatasetMetadataContributors.vue
+++ b/src/views/study/dataset/metadata/contributors/DatasetMetadataContributors.vue
@@ -3,6 +3,7 @@ import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetContributors } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -164,8 +165,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Contributors"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/creators/DatasetMetadataCreator.vue b/src/views/study/dataset/metadata/creators/DatasetMetadataCreator.vue
index 28eb38bd..da201cb5 100644
--- a/src/views/study/dataset/metadata/creators/DatasetMetadataCreator.vue
+++ b/src/views/study/dataset/metadata/creators/DatasetMetadataCreator.vue
@@ -3,6 +3,7 @@ import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetCreators } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -162,8 +163,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Creators"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/dates/DatasetMetadataDates.vue b/src/views/study/dataset/metadata/dates/DatasetMetadataDates.vue
index 40e9011b..fa3ba170 100644
--- a/src/views/study/dataset/metadata/dates/DatasetMetadataDates.vue
+++ b/src/views/study/dataset/metadata/dates/DatasetMetadataDates.vue
@@ -3,6 +3,7 @@ import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetDates } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -134,8 +135,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Dates"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/deidentification/DatasetMetadataDeIdentification.vue b/src/views/study/dataset/metadata/deidentification/DatasetMetadataDeIdentification.vue
index f5110bbe..58b4f64e 100644
--- a/src/views/study/dataset/metadata/deidentification/DatasetMetadataDeIdentification.vue
+++ b/src/views/study/dataset/metadata/deidentification/DatasetMetadataDeIdentification.vue
@@ -2,9 +2,9 @@
 import type { FormInst } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetDeIdentLevel } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
-
 const route = useRoute();
 const push = usePush();
 
@@ -113,10 +113,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="De-identification Levels"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/descriptions/DatasetMetadataDescriptions.vue b/src/views/study/dataset/metadata/descriptions/DatasetMetadataDescriptions.vue
index 18af3db7..6f41d1fc 100644
--- a/src/views/study/dataset/metadata/descriptions/DatasetMetadataDescriptions.vue
+++ b/src/views/study/dataset/metadata/descriptions/DatasetMetadataDescriptions.vue
@@ -2,6 +2,7 @@
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetDescriptions } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -148,8 +149,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Descriptions"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/funders/DatasetMetadataFunders.vue b/src/views/study/dataset/metadata/funders/DatasetMetadataFunders.vue
index d9226b70..2a20b593 100644
--- a/src/views/study/dataset/metadata/funders/DatasetMetadataFunders.vue
+++ b/src/views/study/dataset/metadata/funders/DatasetMetadataFunders.vue
@@ -3,6 +3,7 @@ import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetFunders } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -142,8 +143,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Funders"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue b/src/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue
index 21539be2..f62d433b 100644
--- a/src/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue
+++ b/src/views/study/dataset/metadata/identifiers/DatasetMetadataIdentifiers.vue
@@ -2,6 +2,7 @@
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetIdentifiers } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -150,8 +151,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Identifiers"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/keys/DatasetMetadataRecordKeys.vue b/src/views/study/dataset/metadata/keys/DatasetMetadataRecordKeys.vue
index 2b05374c..02672f9a 100644
--- a/src/views/study/dataset/metadata/keys/DatasetMetadataRecordKeys.vue
+++ b/src/views/study/dataset/metadata/keys/DatasetMetadataRecordKeys.vue
@@ -2,9 +2,9 @@
 import type { FormInst } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetRecordKeys } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
-
 const route = useRoute();
 const push = usePush();
 
@@ -98,10 +98,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Record Keys"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/publisher/DatasetMetadataPublisher.vue b/src/views/study/dataset/metadata/publisher/DatasetMetadataPublisher.vue
index 90c7a0cc..d52e8ff1 100644
--- a/src/views/study/dataset/metadata/publisher/DatasetMetadataPublisher.vue
+++ b/src/views/study/dataset/metadata/publisher/DatasetMetadataPublisher.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import type { FormInst } from "naive-ui";
 
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetPublisher } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
-
 const route = useRoute();
 const push = usePush();
 
@@ -102,10 +102,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Publisher"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/related/DatasetMetadataRelatedItems.vue b/src/views/study/dataset/metadata/related/DatasetMetadataRelatedItems.vue
index 4afab41a..ca3f65c8 100644
--- a/src/views/study/dataset/metadata/related/DatasetMetadataRelatedItems.vue
+++ b/src/views/study/dataset/metadata/related/DatasetMetadataRelatedItems.vue
@@ -2,6 +2,7 @@
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetRelatedItems } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -416,8 +417,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Related Items"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/rights/DatasetMetadataRights.vue b/src/views/study/dataset/metadata/rights/DatasetMetadataRights.vue
index 6f0e8f9e..d402da55 100644
--- a/src/views/study/dataset/metadata/rights/DatasetMetadataRights.vue
+++ b/src/views/study/dataset/metadata/rights/DatasetMetadataRights.vue
@@ -2,6 +2,7 @@
 import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetRights } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -135,8 +136,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Rights"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/subjects/DatasetMetadataSubjects.vue b/src/views/study/dataset/metadata/subjects/DatasetMetadataSubjects.vue
index d2cb9aab..e589539b 100644
--- a/src/views/study/dataset/metadata/subjects/DatasetMetadataSubjects.vue
+++ b/src/views/study/dataset/metadata/subjects/DatasetMetadataSubjects.vue
@@ -2,6 +2,7 @@
 import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetSubjects } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -140,8 +141,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Subjects"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/metadata/title/DatasetMetadataTitle.vue b/src/views/study/dataset/metadata/title/DatasetMetadataTitle.vue
index f575b975..311de4a1 100644
--- a/src/views/study/dataset/metadata/title/DatasetMetadataTitle.vue
+++ b/src/views/study/dataset/metadata/title/DatasetMetadataTitle.vue
@@ -4,6 +4,7 @@ import { nanoid } from "nanoid";
 import FORM_JSON from "@/assets/data/form.json";
 import LottieLoader from "@/components/loader/LottieLoader.vue";
 import FadeTransition from "@/components/transitions/FadeTransition.vue";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { DatasetTitles } from "@/types/Dataset";
 import { baseURL } from "@/utils/constants";
 
@@ -146,8 +147,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Titles"
       description="Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-      linkName="dataset:overview"
-      :linkParams="{ studyId: routeParams.studyId, datasetId: routeParams.datasetId }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/dataset/publish/metadata/PublishDatasetMetadata.vue b/src/views/study/dataset/publish/metadata/PublishDatasetMetadata.vue
index f3ea2a09..dac49afd 100644
--- a/src/views/study/dataset/publish/metadata/PublishDatasetMetadata.vue
+++ b/src/views/study/dataset/publish/metadata/PublishDatasetMetadata.vue
@@ -330,38 +330,42 @@ function handleNextButton() {
     </CollapsibleCard>
 
     <CollapsibleCard title="Publisher" bordered>
-      <n-table :bordered="true" striped :single-line="false">
-        <thead>
-          <tr>
-            <th>Publisher</th>
+      <!--      <n-table-->
+      <!--        :bordered="true"-->
+      <!--        striped-->
+      <!--        :single-line="false"-->
+      <!--        :v-if="dataset_metadata.publisher.publisher"-->
+      <!--      >-->
+      <!--        <tbody>-->
+      <!--          <tr>-->
+      <!--            <th>Publisher</th>-->
+
+      <!--            <td v-if="dataset_metadata.publisher.publisher">-->
+      <!--              {{ dataset_metadata.publisher.publisher }}-->
+      <!--            </td>-->
+      <!--          </tr>-->
+      <!--        </tbody>-->
+      <!--      </n-table>-->
+
+      <div
+        v-if="dataset_metadata.publisher && dataset_metadata.publisher.publisher"
+        class="border border-gray-100 p-3"
+      >
+        {{ dataset_metadata.publisher.publisher }}
+      </div>
 
-            <th>Organization name</th>
-          </tr>
-        </thead>
+      <div v-else class="italic text-gray-500">No publisher</div>
 
-        <tbody>
-          <tr>
-            <td v-if="dataset_metadata.publisher.publisher">
-              {{ dataset_metadata.publisher.managing_organization_name }}
-            </td>
+      <n-h5>Managing Organization Name</n-h5>
 
-            <td v-if="dataset_metadata.publisher.managing_organization_name">
-              {{ dataset_metadata.publisher.publisher }}
-            </td>
+      <div
+        v-if="dataset_metadata.publisher && dataset_metadata.publisher.managing_organization_name"
+        class="border border-gray-100 p-3"
+      >
+        {{ dataset_metadata.publisher.managing_organization_name }}
+      </div>
 
-            <td
-              v-if="
-                !dataset_metadata.publisher.publisher &&
-                !dataset_metadata.publisher.managing_organization_name
-              "
-              colspan="2"
-              class="text-center italic text-gray-500"
-            >
-              No Publisher
-            </td>
-          </tr>
-        </tbody>
-      </n-table>
+      <div v-else class="italic text-gray-500">No Managing Organization</div>
 
       <template #action>
         <RouterLink
@@ -420,12 +424,12 @@ function handleNextButton() {
               ? "Yes"
               : dataset_metadata.de_identification.direct === false
               ? "No"
-              : "-"
+              : ""
           }}
         </n-descriptions-item>
 
         <n-descriptions-item label="Type">
-          {{ dataset_metadata.de_identification.type || "-" }}
+          {{ dataset_metadata.de_identification.type }}
         </n-descriptions-item>
       </n-descriptions>
 
@@ -485,18 +489,27 @@ function handleNextButton() {
     </CollapsibleCard>
 
     <CollapsibleCard title="Subjects" bordered>
-      <n-table
-        :bordered="true"
-        striped
-        :single-line="false"
-        v-if="dataset_metadata.subjects && dataset_metadata.subjects.length"
-      >
-        <tbody>
-          <tr :key="item.id" v-for="item in dataset_metadata.subjects">
-            <td>{{ item.subject }}</td>
-          </tr>
-        </tbody>
-      </n-table>
+      <!--      <n-table-->
+      <!--        :bordered="true"-->
+      <!--        striped-->
+      <!--        :single-line="false"-->
+      <!--        v-if="dataset_metadata.subjects && dataset_metadata.subjects.length"-->
+      <!--      >-->
+      <!--        <tbody>-->
+      <!--          <tr :key="item.id" v-for="item in dataset_metadata.subjects">-->
+      <!--            <td>{{ item.subject }}</td>-->
+      <!--          </tr>-->
+      <!--        </tbody>-->
+      <!--      </n-table>-->
+      <div v-if="dataset_metadata.subjects && dataset_metadata.subjects.length">
+        <ul
+          :key="item.id"
+          class="list-none border border-gray-100 p-3 even:bg-gray-50"
+          v-for="item in dataset_metadata.subjects"
+        >
+          <li>{{ item.subject }}</li>
+        </ul>
+      </div>
 
       <div v-if="!dataset_metadata.subjects.length" class="italic text-gray-500">No Subjects</div>
 
diff --git a/src/views/study/dataset/publish/metadata/PublishStudyMetadata.vue b/src/views/study/dataset/publish/metadata/PublishStudyMetadata.vue
index de3dafcb..616b60db 100644
--- a/src/views/study/dataset/publish/metadata/PublishStudyMetadata.vue
+++ b/src/views/study/dataset/publish/metadata/PublishStudyMetadata.vue
@@ -180,6 +180,8 @@ function handleNextButton() {
             <th>Investigator Name</th>
 
             <th>Type</th>
+
+            <th>Sponsor Name</th>
           </tr>
         </thead>
 
@@ -187,16 +189,19 @@ function handleNextButton() {
           <tr
             v-if="
               study_metadata.sponsors.responsible_party_investigator_name &&
-              study_metadata.sponsors.responsible_party_type
+              study_metadata.sponsors.responsible_party_type &&
+              study_metadata.sponsors.lead_sponsor_name
             "
           >
             <td>{{ study_metadata.sponsors.responsible_party_investigator_name }}</td>
 
             <td>{{ study_metadata.sponsors.responsible_party_type }}</td>
+
+            <td>{{ study_metadata.sponsors.lead_sponsor_name }}</td>
           </tr>
 
           <tr v-else>
-            <td colspan="2" class="text-center italic text-gray-500">No Sponsors</td>
+            <td colspan="3" class="text-center italic text-gray-500">No Sponsors</td>
           </tr>
         </tbody>
       </n-table>
@@ -636,21 +641,29 @@ function handleNextButton() {
           <tr>
             <th>Gender</th>
 
+            <th>Gender Based</th>
+
             <th>Minimum Age</th>
           </tr>
         </thead>
 
         <tbody>
           <tr
-            v-if="study_metadata.eligibility.gender && study_metadata.eligibility.maximum_age_value"
+            v-if="
+              study_metadata.eligibility.gender &&
+              study_metadata.eligibility.minimum_age_value &&
+              study_metadata.eligibility.gender_based
+            "
           >
             <td>{{ study_metadata.eligibility.gender }}</td>
 
-            <td>{{ study_metadata.eligibility.maximum_age_value }}</td>
+            <td>{{ study_metadata.eligibility.gender_based }}</td>
+
+            <td>{{ study_metadata.eligibility.minimum_age_value }}</td>
           </tr>
 
           <tr v-else>
-            <td colspan="2" class="text-center italic text-gray-500">No Eligibility</td>
+            <td colspan="3" class="text-center italic text-gray-500">No Eligibility</td>
           </tr>
         </tbody>
       </n-table>
@@ -716,13 +729,15 @@ function handleNextButton() {
       </template>
     </CollapsibleCard>
 
-    <CollapsibleCard title="Overal Officials" bordered>
+    <CollapsibleCard title="Overall Officials" bordered>
       <n-table :bordered="true" :single-line="false" striped>
         <thead>
           <tr>
             <th>Affiliation</th>
 
             <th>Overall Official Name</th>
+
+            <th>Role</th>
           </tr>
         </thead>
 
@@ -731,10 +746,12 @@ function handleNextButton() {
             <td>{{ item.affiliation }}</td>
 
             <td>{{ item.name }}</td>
+
+            <td>{{ item.role }}</td>
           </tr>
 
           <tr v-if="!study_metadata.overall_officials.length">
-            <td colspan="2" class="text-center italic text-gray-500">No Overall Officials</td>
+            <td colspan="3" class="text-center italic text-gray-500">No Overall Officials</td>
           </tr>
         </tbody>
       </n-table>
diff --git a/src/views/study/metadata/collaborators/StudyCollaborators.vue b/src/views/study/metadata/collaborators/StudyCollaborators.vue
index 185caf66..09145865 100644
--- a/src/views/study/metadata/collaborators/StudyCollaborators.vue
+++ b/src/views/study/metadata/collaborators/StudyCollaborators.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { FormInst } from "naive-ui";
 
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import { baseURL } from "@/utils/constants";
 
 const route = useRoute();
@@ -21,9 +22,7 @@ onBeforeMount(async () => {
     throw new Error("Network response was not ok");
   }
 
-  const data = await response.json();
-
-  moduleData.value = data;
+  moduleData.value = await response.json();
 });
 
 const addCollaborator = () => {
@@ -73,10 +72,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Collaborators"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/conditions/StudyConditions.vue b/src/views/study/metadata/conditions/StudyConditions.vue
index c6d6c220..e53f23de 100644
--- a/src/views/study/metadata/conditions/StudyConditions.vue
+++ b/src/views/study/metadata/conditions/StudyConditions.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { FormInst } from "naive-ui";
 
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import { baseURL } from "@/utils/constants";
 
 const route = useRoute();
@@ -72,10 +73,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Conditions"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/description/StudyDescription.vue b/src/views/study/metadata/description/StudyDescription.vue
index d6b83277..51030e4c 100644
--- a/src/views/study/metadata/description/StudyDescription.vue
+++ b/src/views/study/metadata/description/StudyDescription.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { FormInst, FormRules } from "naive-ui";
 
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import { baseURL } from "@/utils/constants";
 
 const route = useRoute();
@@ -91,10 +92,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Description"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/design/StudyDesign.vue b/src/views/study/metadata/design/StudyDesign.vue
index 5a0b8f0b..2fc8e79c 100644
--- a/src/views/study/metadata/design/StudyDesign.vue
+++ b/src/views/study/metadata/design/StudyDesign.vue
@@ -2,6 +2,7 @@
 import type { FormInst, FormRules } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyDesignModule } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -249,10 +250,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Design"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/eligibility/StudyEligibility.vue b/src/views/study/metadata/eligibility/StudyEligibility.vue
index a814771e..dea44814 100644
--- a/src/views/study/metadata/eligibility/StudyEligibility.vue
+++ b/src/views/study/metadata/eligibility/StudyEligibility.vue
@@ -2,6 +2,7 @@
 import type { FormInst, FormRules } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyEligiblityModule } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -173,10 +174,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Eligibility"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/enrollment/contacts/StudyContacts.vue b/src/views/study/metadata/enrollment/contacts/StudyContacts.vue
index aa6a7774..d8755732 100644
--- a/src/views/study/metadata/enrollment/contacts/StudyContacts.vue
+++ b/src/views/study/metadata/enrollment/contacts/StudyContacts.vue
@@ -2,6 +2,7 @@
 import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyContacts } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -129,10 +130,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Contacts"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/enrollment/locations/StudyLocations.vue b/src/views/study/metadata/enrollment/locations/StudyLocations.vue
index f944752f..acc2fbce 100644
--- a/src/views/study/metadata/enrollment/locations/StudyLocations.vue
+++ b/src/views/study/metadata/enrollment/locations/StudyLocations.vue
@@ -4,6 +4,7 @@ import { nanoid } from "nanoid";
 
 import COUNTRIES_JSON from "@/assets/data/countries.json";
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyLocations } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -138,10 +139,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Locations"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/enrollment/officials/StudyOfficials.vue b/src/views/study/metadata/enrollment/officials/StudyOfficials.vue
index e1d8934d..ce239fb2 100644
--- a/src/views/study/metadata/enrollment/officials/StudyOfficials.vue
+++ b/src/views/study/metadata/enrollment/officials/StudyOfficials.vue
@@ -3,6 +3,7 @@ import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyOverallOfficials } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -125,10 +126,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Overall Officials"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/identification/StudyIdentification.vue b/src/views/study/metadata/identification/StudyIdentification.vue
index 465c2065..32a80102 100644
--- a/src/views/study/metadata/identification/StudyIdentification.vue
+++ b/src/views/study/metadata/identification/StudyIdentification.vue
@@ -3,6 +3,7 @@ import type { FormInst, FormRules } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyIdentificationModule } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -159,10 +160,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Identification"
       description="Identifiers for the study"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/ipdsharing/StudyIPDSharing.vue b/src/views/study/metadata/ipdsharing/StudyIPDSharing.vue
index 14a62be7..cc3668df 100644
--- a/src/views/study/metadata/ipdsharing/StudyIPDSharing.vue
+++ b/src/views/study/metadata/ipdsharing/StudyIPDSharing.vue
@@ -2,6 +2,7 @@
 import type { FormInst, FormRules } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyIPDSharing } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -94,10 +95,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="IPD Sharing"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/oversight/StudyOversight.vue b/src/views/study/metadata/oversight/StudyOversight.vue
index 86887a4c..787578d0 100644
--- a/src/views/study/metadata/oversight/StudyOversight.vue
+++ b/src/views/study/metadata/oversight/StudyOversight.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import { baseURL } from "@/utils/constants";
 
 const route = useRoute();
@@ -51,10 +52,8 @@ const saveMetadata = async (value: boolean) => {
     <PageBackNavigationHeader
       title="Oversight"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/references/availableipd/StudyAvailableIPD.vue b/src/views/study/metadata/references/availableipd/StudyAvailableIPD.vue
index 62263757..248d9d63 100644
--- a/src/views/study/metadata/references/availableipd/StudyAvailableIPD.vue
+++ b/src/views/study/metadata/references/availableipd/StudyAvailableIPD.vue
@@ -4,6 +4,7 @@ import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
 import CollapsibleCard from "@/components/cards/CollapsibleCard.vue";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyIPDs } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -127,10 +128,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Available IPD"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/references/links/StudyLinks.vue b/src/views/study/metadata/references/links/StudyLinks.vue
index 11cc9675..98d364c0 100644
--- a/src/views/study/metadata/references/links/StudyLinks.vue
+++ b/src/views/study/metadata/references/links/StudyLinks.vue
@@ -2,6 +2,7 @@
 import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyLinks } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -117,10 +118,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Links"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/references/publications/StudyReferences.vue b/src/views/study/metadata/references/publications/StudyReferences.vue
index f926d686..b26fa5b8 100644
--- a/src/views/study/metadata/references/publications/StudyReferences.vue
+++ b/src/views/study/metadata/references/publications/StudyReferences.vue
@@ -3,6 +3,7 @@ import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyReferences } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -121,10 +122,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Publications"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/sponsors/StudySponsors.vue b/src/views/study/metadata/sponsors/StudySponsors.vue
index 621de96d..0fd5d402 100644
--- a/src/views/study/metadata/sponsors/StudySponsors.vue
+++ b/src/views/study/metadata/sponsors/StudySponsors.vue
@@ -2,6 +2,7 @@
 import type { FormInst, FormRules } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudySponsorCollaboratorsModule } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -99,10 +100,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Sponsors"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/status/StudyStatus.vue b/src/views/study/metadata/status/StudyStatus.vue
index 40c93019..d128a80e 100644
--- a/src/views/study/metadata/status/StudyStatus.vue
+++ b/src/views/study/metadata/status/StudyStatus.vue
@@ -3,9 +3,9 @@ import dayjs from "dayjs";
 import type { FormInst, FormRules } from "naive-ui";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyStatusModule } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
-
 const route = useRoute();
 const push = usePush();
 
@@ -118,10 +118,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Status"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/treatment/arms/StudyArms.vue b/src/views/study/metadata/treatment/arms/StudyArms.vue
index f5c39e83..d35895b0 100644
--- a/src/views/study/metadata/treatment/arms/StudyArms.vue
+++ b/src/views/study/metadata/treatment/arms/StudyArms.vue
@@ -3,6 +3,7 @@ import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyArms } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -132,10 +133,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Arms"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />
diff --git a/src/views/study/metadata/treatment/interventions/StudyInterventions.vue b/src/views/study/metadata/treatment/interventions/StudyInterventions.vue
index 92af0e77..f51f4dab 100644
--- a/src/views/study/metadata/treatment/interventions/StudyInterventions.vue
+++ b/src/views/study/metadata/treatment/interventions/StudyInterventions.vue
@@ -3,6 +3,7 @@ import type { FormInst } from "naive-ui";
 import { nanoid } from "nanoid";
 
 import FORM_JSON from "@/assets/data/form.json";
+import { getBackParams, getBackRoute } from "@/stores/nav";
 import type { StudyInterventions } from "@/types/Study";
 import { baseURL } from "@/utils/constants";
 
@@ -148,10 +149,8 @@ const saveMetadata = (e: MouseEvent) => {
     <PageBackNavigationHeader
       title="Interventions"
       description="Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam quod quia voluptatibus, voluptatem, quibusdam, quos voluptas quae quas voluptatum"
-      linkName="study:overview"
-      :linkParams="{
-        studyId: route.params.studyId,
-      }"
+      :linkName="getBackRoute()"
+      :linkParams="getBackParams()"
     />
 
     <n-divider />