diff --git a/src/modals/objectAuditTrail/ViewObjectAuditTrail.vue b/src/modals/objectAuditTrail/ViewObjectAuditTrail.vue
index 229a393..6bc0814 100644
--- a/src/modals/objectAuditTrail/ViewObjectAuditTrail.vue
+++ b/src/modals/objectAuditTrail/ViewObjectAuditTrail.vue
@@ -19,22 +19,22 @@ import { objectStore, navigationStore } from '../../store/store.js'
 					<h4>Changes:</h4>
 					<ul>
 						<li v-for="(change, key) in auditTrail.changed" :key="key">
-							<strong>{{ key }}:</strong>
-							<span>Old: {{ change.old }}</span>
-							<span>New: {{ change.new }}</span>
+							<strong>{{ key }}:</strong><br>
+							<span>Old: {{ change.old ?? 'N/A' }}</span><br>
+							<span>New: {{ change.new ?? 'N/A' }}</span>
 						</li>
 					</ul>
 				</div>
 
 				<div class="navigation-buttons">
-					<NcButton @click="navigateTo('schema', auditTrail.schema)">
-						Go to Schema {{ auditTrail.schema }}
+					<NcButton>
+						Go to linked Schema
 					</NcButton>
-					<NcButton @click="navigateTo('register', auditTrail.register)">
-						Go to Register {{ auditTrail.register }}
+					<NcButton>
+						Go to linked Register
 					</NcButton>
-					<NcButton @click="navigateTo('object', auditTrail.object)">
-						Go to Object {{ auditTrail.object }}
+					<NcButton>
+						Go to linked Object
 					</NcButton>
 				</div>
 			</div>
@@ -89,10 +89,14 @@ export default {
 
 .audit-item {
 	border-bottom: 1px solid #ccc;
-	padding: 10px 0;
+	padding: 0 0 10px 0;
+	margin: 0 0 10px 0;
 }
 
 .navigation-buttons {
 	margin-top: 10px;
+	display: flex;
+	gap: 10px;
+	justify-content: center;
 }
 </style>
diff --git a/src/store/modules/object.js b/src/store/modules/object.js
index 20fbff0..8e969f8 100644
--- a/src/store/modules/object.js
+++ b/src/store/modules/object.js
@@ -62,6 +62,8 @@ export const useObjectStore = defineStore('object', {
 				})
 				const data = await response.json()
 				this.setObjectItem(data)
+				this.getAuditTrails(data.id)
+
 				return data
 			} catch (err) {
 				console.error(err)
@@ -138,6 +140,7 @@ export const useObjectStore = defineStore('object', {
 
 			this.refreshObjectList()
 			this.setObjectItem(data)
+			this.getAuditTrails(data.id)
 
 			return { response, data }
 		},
diff --git a/src/views/object/ObjectDetails.vue b/src/views/object/ObjectDetails.vue
index 98083f7..c072b79 100644
--- a/src/views/object/ObjectDetails.vue
+++ b/src/views/object/ObjectDetails.vue
@@ -62,8 +62,8 @@ import { objectStore, navigationStore } from '../../store/store.js'
 							</div>
 						</BTab>
 						<BTab title="Audit Trails">
-							<div v-if="auditTrails.length">
-								<NcListItem v-for="(auditTrail, key) in auditTrails"
+							<div v-if="objectStore.auditTrails.length">
+								<NcListItem v-for="(auditTrail, key) in objectStore.auditTrails"
 									:key="key"
 									:name="new Date(auditTrail.created).toLocaleString()"
 									:bold="false"
@@ -87,7 +87,7 @@ import { objectStore, navigationStore } from '../../store/store.js'
 									</template>
 								</NcListItem>
 							</div>
-							<div v-if="!auditTrails.length">
+							<div v-if="!objectStore.auditTrails.length">
 								No audit trails found
 							</div>
 						</BTab>