diff --git a/appinfo/routes.php b/appinfo/routes.php
index c88b7450..b04f450d 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -116,5 +116,8 @@
         // User Groups focused endpoints
         ['name' => 'settings#getUserGroupsConfig', 'url' => '/api/user-groups/config', 'verb' => 'GET'],
         ['name' => 'settings#updateUserGroupsConfig', 'url' => '/api/user-groups/config', 'verb' => 'POST'],
+        
+        // Catalog location endpoint
+        ['name' => 'settings#updateCatalogLocation', 'url' => '/api/settings/catalog-location', 'verb' => 'POST'],
     ],
 ];
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index a1e03d2c..9168d35f 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -2129,6 +2129,39 @@ public function updateUserGroupsConfig(): JSONResponse
         }
     }
 
+    /**
+     * Update catalog location
+     *
+     * @NoCSRFRequired
+     * 
+     * @return JSONResponse Update result
+     */
+    public function updateCatalogLocation(): JSONResponse
+    {
+        try {
+            $data = $this->request->getParams();
+            $catalogLocation = $data['catalogLocation'] ?? '';
+            
+            $this->settingsService->setCatalogLocation($catalogLocation);
+            
+            return new JSONResponse([
+                'success' => true,
+                'message' => 'Catalog location updated successfully',
+                'catalogLocation' => $catalogLocation
+            ]);
+            
+        } catch (\Exception $e) {
+            $this->logger->error('Failed to update catalog location', [
+                'exception' => $e->getMessage(),
+                'requestData' => $this->request->getParams()
+            ]);
+            return new JSONResponse([
+                'success' => false,
+                'message' => 'Failed to update catalog location: ' . $e->getMessage()
+            ], 500);
+        }
+    }
+
 }//end class
 
 
diff --git a/lib/Service/ArchiMateService.php b/lib/Service/ArchiMateService.php
index 871b79bd..a9f099ad 100644
--- a/lib/Service/ArchiMateService.php
+++ b/lib/Service/ArchiMateService.php
@@ -66,6 +66,12 @@ class ArchiMateService
         'property_definition' => 105
     ];
 
+    /**
+     * Storage for the last save operation results
+     * Contains the structured return from ObjectService::saveObjects
+     */
+    private ?array $lastSaveResult = null;
+
     /**
      * Constructor for ArchiMateService
      * 
@@ -510,15 +516,38 @@ private function createOrUpdateModelObject(array $modelMetadata): array
             ];
 
             // Save the model object using ObjectService::saveObjects
-            $savedObjects = $objectService->saveObjects([$modelData]);
+            $saveResult = $objectService->saveObjects([$modelData]);
+            
+            // Extract the saved/updated objects from the new structured return format
+            $savedObjects = array_merge(
+                $saveResult['saved'] ?? [],
+                $saveResult['updated'] ?? []
+            );
             
             if (empty($savedObjects)) {
+                // Check if there are validation errors
+                if (!empty($saveResult['invalid'])) {
+                    $errorMsg = $saveResult['invalid'][0]['error'] ?? 'Model object failed validation';
+                    $this->logger->error('ArchiMateService: Model object failed validation', [
+                        'error' => $errorMsg,
+                        'model_id' => $modelIdentifier
+                    ]);
+                    return ['success' => false, 'error' => "Validation failed: $errorMsg"];
+                }
+                
                 $this->logger->error('ArchiMateService: Failed to save model object');
                 return ['success' => false, 'error' => 'Failed to save model object'];
             }
 
             $savedModelObject = $savedObjects[0];
-            $modelAction = $this->determineObjectAction($savedModelObject);
+            
+            // Determine if this was a create or update operation
+            $modelAction = 'unknown';
+            if (!empty($saveResult['saved'])) {
+                $modelAction = 'created';
+            } elseif (!empty($saveResult['updated'])) {
+                $modelAction = 'updated';
+            }
             
             $this->logger->info('ArchiMateService: Saved model object', [
                 'model_id' => $modelIdentifier,
@@ -536,24 +565,7 @@ private function createOrUpdateModelObject(array $modelMetadata): array
         }
     }
 
-    /**
-     * Determine the action taken on an object during save operation
-     * 
-     * @param array $savedObject The saved object returned from ObjectService::saveObjects
-     * @return string The action taken: 'created', 'updated', or 'unknown'
-     */
-    private function determineObjectAction(array $savedObject): string
-    {
-        // Check if the object was created or updated based on the response
-        if (isset($savedObject['@self']['id'])) {
-            // If we have an ID, the object was saved successfully
-            // We can't easily determine if it was created or updated from the response
-            // For now, assume it was updated if it has an ID
-            return 'updated';
-        }
-        
-        return 'unknown';
-    }
+    // Method removed - action is now determined directly from ObjectService::saveObjects structured return
 
     /**
      * Normalize ArchiMate data structure for storage as JSON blob
@@ -1288,15 +1300,42 @@ private function saveObjectsToDatabase(array $objects): array
         }
 
         // Save objects using ObjectService::saveObjects with proper @self structure
-        $savedObjects = $objectService->saveObjects(
+        $saveResult = $objectService->saveObjects(
             objects: $objects,
             register: $registerId
         );
 
+        // Store the save result for later access to statistics
+        $this->lastSaveResult = $saveResult;
+
+        // Extract saved objects from the new structured return format
+        $savedObjects = array_merge(
+            $saveResult['saved'] ?? [],
+            $saveResult['updated'] ?? []
+        );
+
+        // Log detailed results including validation errors
         $this->logger->info('Objects saved successfully', [
-            'saved_count' => count($savedObjects)
+            'saved_count' => count($saveResult['saved'] ?? []),
+            'updated_count' => count($saveResult['updated'] ?? []),
+            'skipped_count' => count($saveResult['skipped'] ?? []),
+            'invalid_count' => count($saveResult['invalid'] ?? []),
+            'error_count' => count($saveResult['errors'] ?? []),
+            'total_processed' => $saveResult['statistics']['totalProcessed'] ?? 0
         ]);
 
+        // Log any validation errors for debugging
+        if (!empty($saveResult['invalid'])) {
+            foreach ($saveResult['invalid'] as $invalidItem) {
+                $this->logger->warning('Object failed validation during import', [
+                    'object_id' => $invalidItem['object']['@self']['id'] ?? 'unknown',
+                    'error' => $invalidItem['error'] ?? 'Unknown validation error',
+                    'type' => $invalidItem['type'] ?? 'ValidationException'
+                ]);
+            }
+        }
+
+        // Return the combined saved and updated objects (maintaining backward compatibility)
         return $savedObjects;
     }
 
@@ -1914,17 +1953,80 @@ private function calculateObjectStatistics(array $normalizedData, array $savedOb
             'property_definitions' => ['created' => 0, 'updated' => 0, 'skipped' => 0, 'errors' => []]
         ];
 
-        // Count objects by type from normalized data
-        $sections = ['elements', 'relationships', 'organizations', 'views', 'property_definitions'];
-        foreach ($sections as $section) {
-            if (isset($normalizedData[$section])) {
-                $count = count($normalizedData[$section]);
-                // Assume all objects were created (we can refine this later with actual save results)
-                $statistics[$section]['created'] = $count;
+        // If we have access to the actual save results from ObjectService, use those
+        if ($this->lastSaveResult !== null) {
+            $saveResult = $this->lastSaveResult;
+            
+            // Count objects by section type from the actual saved objects
+            $allProcessedObjects = array_merge(
+                $saveResult['saved'] ?? [],
+                $saveResult['updated'] ?? [],
+                $saveResult['skipped'] ?? [],
+                // For invalid objects, extract the original object from the error structure
+                array_map(fn($item) => $item['object'] ?? [], $saveResult['invalid'] ?? [])
+            );
+            
+            foreach ($allProcessedObjects as $object) {
+                $sectionType = $object['section'] ?? 'elements'; // Default to elements if section not found
+                
+                // Map section types to statistics keys
+                $sectionKey = match($sectionType) {
+                    'elements' => 'elements',
+                    'relationships' => 'relationships', 
+                    'organizations' => 'organizations',
+                    'views' => 'views',
+                    'property_definitions' => 'property_definitions',
+                    default => 'elements' // Default fallback
+                };
+                
+                if (!isset($statistics[$sectionKey])) {
+                    continue; // Skip unknown section types
+                }
+                
+                // Determine if this object was created, updated, or had errors
+                $objectId = $object['@self']['id'] ?? $object['identifier'] ?? null;
+                
+                // Check if this object is in the saved (created) list
+                $wasCreated = !empty(array_filter($saveResult['saved'] ?? [], 
+                    fn($saved) => ($saved->getUuid() === $objectId)));
+                
+                // Check if this object is in the updated list
+                $wasUpdated = !empty(array_filter($saveResult['updated'] ?? [], 
+                    fn($updated) => ($updated->getUuid() === $objectId)));
+                
+                // Check if this object had validation errors
+                $hasErrors = !empty(array_filter($saveResult['invalid'] ?? [],
+                    fn($invalid) => (($invalid['object']['@self']['id'] ?? null) === $objectId)));
+                
+                if ($wasCreated) {
+                    $statistics[$sectionKey]['created']++;
+                } elseif ($wasUpdated) {
+                    $statistics[$sectionKey]['updated']++;
+                } elseif ($hasErrors) {
+                    // Add to errors array for this section
+                    $errorInfo = array_filter($saveResult['invalid'] ?? [],
+                        fn($invalid) => (($invalid['object']['@self']['id'] ?? null) === $objectId));
+                    
+                    if (!empty($errorInfo)) {
+                        $statistics[$sectionKey]['errors'][] = array_values($errorInfo)[0]['error'] ?? 'Unknown validation error';
+                    }
+                } else {
+                    $statistics[$sectionKey]['skipped']++;
+                }
+            }
+        } else {
+            // Fallback to old method if no save result is available
+            $sections = ['elements', 'relationships', 'organizations', 'views', 'property_definitions'];
+            foreach ($sections as $section) {
+                if (isset($normalizedData[$section])) {
+                    $count = count($normalizedData[$section]);
+                    // Assume all objects were created (legacy behavior)
+                    $statistics[$section]['created'] = $count;
+                }
             }
         }
 
-        // Calculate summary totals
+        // Calculate summary totals from actual statistics
         $summary = [
             'total_objects_created' => 0,
             'total_objects_updated' => 0,
@@ -1934,10 +2036,12 @@ private function calculateObjectStatistics(array $normalizedData, array $savedOb
         ];
 
         foreach ($statistics as $section => $sectionStats) {
-            $summary['total_objects_created'] += $sectionStats['created'];
-            $summary['total_objects_updated'] += $sectionStats['updated'];
-            $summary['total_objects_skipped'] += $sectionStats['skipped'];
-            $summary['total_errors'] += count($sectionStats['errors']);
+            if ($section !== 'summary') { // Skip summary section itself
+                $summary['total_objects_created'] += $sectionStats['created'];
+                $summary['total_objects_updated'] += $sectionStats['updated'];
+                $summary['total_objects_skipped'] += $sectionStats['skipped'];
+                $summary['total_errors'] += count($sectionStats['errors']);
+            }
         }
 
         $statistics['summary'] = $summary;
diff --git a/lib/Service/ArchiMateService_backup.php b/lib/Service/ArchiMateService_backup.php
index 2d00a764..528a8e40 100644
--- a/lib/Service/ArchiMateService_backup.php
+++ b/lib/Service/ArchiMateService_backup.php
@@ -1824,14 +1824,23 @@ private function processSchemaTypeSynchronous(array $items, string $schemaType,
                         'schema_id' => $schemaId
                     ]);
                     
-                    $savedObjects = $objectService->saveObjects(
+                    $saveResult = $objectService->saveObjects(
                         objects: $allProcessedObjects,
                         register: $registerId,
                         schema: $schemaId
                     );
                     
-                    // Analyze the saved objects to determine created vs updated counts
-                    $actionCounts = $this->analyzeBatchObjectActions($savedObjects);
+                    // Extract saved objects from the new structured return format
+                    $savedObjects = array_merge(
+                        $saveResult['saved'] ?? [],
+                        $saveResult['updated'] ?? []
+                    );
+                    
+                    // Use actual counts from the structured return instead of analyzing objects
+                    $actionCounts = [
+                        'created' => count($saveResult['saved'] ?? []),
+                        'updated' => count($saveResult['updated'] ?? [])
+                    ];
                     $totalSaved = count($savedObjects);
                     
                     // Store the action counts for return value
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index c2eb8bf3..c70a21cd 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -237,6 +237,9 @@ public function getSettings(): array
                 $data['configuration'][$key] = $this->config->getValueString($this->_appName, $key, $defaultValue);
             }
 
+            // Add catalog location
+            $data['catalogLocation'] = $this->getCatalogLocation();
+
             return $data;
         } catch (\Exception $e) {
             throw new \RuntimeException('Failed to retrieve settings: ' . $e->getMessage());
@@ -4393,4 +4396,25 @@ public function updateUserGroupsConfig(array $config): array
         }
     }
 
+    /**
+     * Get catalog location
+     *
+     * @return string The catalog location URL
+     */
+    public function getCatalogLocation(): string
+    {
+        return $this->config->getValueString($this->_appName, 'catalog_location', '');
+    }
+
+    /**
+     * Set catalog location
+     *
+     * @param string $location The catalog location URL
+     * @return void
+     */
+    public function setCatalogLocation(string $location): void
+    {
+        $this->config->setValueString($this->_appName, 'catalog_location', $location);
+    }
+
 } 
\ No newline at end of file
diff --git a/src/components/GenericObjectTable.vue b/src/components/GenericObjectTable.vue
index cc1e4b4d..1ea397f8 100644
--- a/src/components/GenericObjectTable.vue
+++ b/src/components/GenericObjectTable.vue
@@ -196,9 +196,9 @@ import { objectStore, navigationStore } from '../store/store.js'
 										</template>
 										<NcActionButton
 											v-for="action in objectActions"
+											v-if="!action.condition || action.condition(item)"
 											:key="action.id"
 											close-after-click
-											:disabled="action.condition && !action.condition(item)"
 											@click="executeObjectAction(action, item)">
 											<template #icon>
 												<component :is="action.icon" :size="20" />
@@ -328,9 +328,9 @@ import { objectStore, navigationStore } from '../store/store.js'
 											<NcActions class="actionsButton">
 												<NcActionButton
 													v-for="action in objectActions"
+													v-if="!action.condition || action.condition(item)"
 													:key="action.id"
 													close-after-click
-													:disabled="action.condition && !action.condition(item)"
 													@click="executeObjectAction(action, item)">
 													<template #icon>
 														<component :is="action.icon" :size="20" />
@@ -389,9 +389,9 @@ import { objectStore, navigationStore } from '../store/store.js'
 										<NcActions class="actionsButton">
 											<NcActionButton
 												v-for="action in objectActions"
+												v-if="!action.condition || action.condition(item)"
 												:key="action.id"
 												close-after-click
-												:disabled="action.condition && !action.condition(item)"
 												@click="executeObjectAction(action, item)">
 												<template #icon>
 													<component :is="action.icon" :size="20" />
diff --git a/src/components/cards/OrganisatieCard.vue b/src/components/cards/OrganisatieCard.vue
index 26902347..f61bca3e 100644
--- a/src/components/cards/OrganisatieCard.vue
+++ b/src/components/cards/OrganisatieCard.vue
@@ -285,6 +285,11 @@ export default {
 	color: #f57c00;
 }
 
+.statusBadge.status-deactief {
+	background: #ffebee;
+	color: #c62828;
+}
+
 .organisatieDescription {
 	line-height: 1.4;
 }
@@ -335,3 +340,4 @@ export default {
 	border-top: 1px solid var(--color-border-dark);
 }
 </style>
+
diff --git a/src/dialogs/Dialogs.vue b/src/dialogs/Dialogs.vue
index 9a1f187c..320f43d0 100644
--- a/src/dialogs/Dialogs.vue
+++ b/src/dialogs/Dialogs.vue
@@ -3,6 +3,7 @@
 		<!-- Object Dialogs -->
 		<DeleteObject v-if="navigationStore.dialog === 'deleteObject'" />
 		<DownloadObject v-if="navigationStore.dialog === 'downloadObject'" />
+		<ChangeOrganisatieStatusDialog v-if="navigationStore.dialog === 'changeOrganisatieStatus'" />
 		<MassDeleteObject v-if="navigationStore.dialog === 'massDeleteObjects'" />
 		<MassPublishObjects v-if="navigationStore.dialog === 'massPublishObjects'" />
 		<MassDepublishObjects v-if="navigationStore.dialog === 'massDepublishObjects'" />
@@ -16,6 +17,7 @@
 import { navigationStore } from '../store/store.js'
 import DeleteObject from '../modals/object/DeleteObject.vue'
 import DownloadObject from '../modals/object/DownloadObject.vue'
+import ChangeOrganisatieStatusDialog from '../modals/object/ChangeOrganisatieStatusDialog.vue'
 import MassDeleteObject from '../modals/object/MassDeleteObject.vue'
 import MassPublishObjects from '../modals/object/MassPublishObjects.vue'
 import MassDepublishObjects from '../modals/object/MassDepublishObjects.vue'
@@ -28,6 +30,7 @@ export default {
 	components: {
 		DeleteObject,
 		DownloadObject,
+		ChangeOrganisatieStatusDialog,
 		MassDeleteObject,
 		MassPublishObjects,
 		MassDepublishObjects,
diff --git a/src/modals/object/ChangeOrganisatieStatusDialog.vue b/src/modals/object/ChangeOrganisatieStatusDialog.vue
new file mode 100644
index 00000000..9c4705a5
--- /dev/null
+++ b/src/modals/object/ChangeOrganisatieStatusDialog.vue
@@ -0,0 +1,164 @@
+/**
+ * ChangeOrganisatieStatusDialog.vue
+ * Dialog for changing organisatie status with confirmation
+ * @category Components
+ * @package softwarecatalog
+ * @author Ruben Linde
+ * @copyright 2024
+ * @license AGPL-3.0-or-later
+ * @version 1.0.0
+ * @link https://github.com/opencatalogi/softwarecatalog
+ */
+
+<script setup>
+import { objectStore, navigationStore } from '../../store/store.js'
+</script>
+
+<template>
+	<NcDialog v-if="navigationStore.dialog === 'changeOrganisatieStatus'"
+		:name="navigationStore.dialogProperties?.dialogTitle || 'Status Wijzigen'"
+		size="normal"
+		:can-close="false">
+		<p v-if="success === null">
+			Weet je zeker dat je de status van <b>{{ getOrganisatieName() }}</b> wilt wijzigen naar <b>{{ navigationStore.dialogProperties?.newStatus }}</b>?
+			<br>
+			<span v-if="navigationStore.dialogProperties?.action === 'activeren'" class="status-change-info">
+				Deze organisatie wordt geactiveerd en zal zichtbaar zijn voor gebruikers.
+			</span>
+			<span v-else-if="navigationStore.dialogProperties?.action === 'deactiveren'" class="status-change-info">
+				Deze organisatie wordt gedeactiveerd en zal niet meer zichtbaar zijn voor gebruikers.
+			</span>
+		</p>
+
+		<NcNoteCard v-if="success" type="success">
+			<p>Status succesvol gewijzigd naar {{ navigationStore.dialogProperties?.newStatus }}</p>
+		</NcNoteCard>
+		<NcNoteCard v-if="error" type="error">
+			<p>{{ error }}</p>
+		</NcNoteCard>
+
+		<template #actions>
+			<NcButton @click="closeDialog">
+				<template #icon>
+					<Cancel :size="20" />
+				</template>
+				{{ success === null ? 'Annuleren' : 'Sluiten' }}
+			</NcButton>
+			<NcButton
+				v-if="success === null"
+				:disabled="loading"
+				type="primary"
+				@click="changeStatus()">
+				<template #icon>
+					<NcLoadingIcon v-if="loading" :size="20" />
+					<CheckCircle v-if="!loading && navigationStore.dialogProperties?.action === 'activeren'" :size="20" />
+					<CloseCircle v-if="!loading && navigationStore.dialogProperties?.action === 'deactiveren'" :size="20" />
+				</template>
+				{{ navigationStore.dialogProperties?.action === 'activeren' ? 'Activeren' : 'Deactiveren' }}
+			</NcButton>
+		</template>
+	</NcDialog>
+</template>
+
+<script>
+import {
+	NcButton,
+	NcDialog,
+	NcLoadingIcon,
+	NcNoteCard,
+} from '@nextcloud/vue'
+
+import Cancel from 'vue-material-design-icons/Cancel.vue'
+import CheckCircle from 'vue-material-design-icons/CheckCircle.vue'
+import CloseCircle from 'vue-material-design-icons/CloseCircle.vue'
+
+export default {
+	name: 'ChangeOrganisatieStatusDialog',
+	components: {
+		NcButton,
+		NcDialog,
+		NcLoadingIcon,
+		NcNoteCard,
+		Cancel,
+		CheckCircle,
+		CloseCircle,
+	},
+	data() {
+		return {
+			loading: false,
+			success: null,
+			error: null,
+		}
+	},
+	methods: {
+		/**
+		 * Get the organisation name for display
+		 * @return {string} The organisation name
+		 */
+		getOrganisatieName() {
+			const organisatie = objectStore.getActiveObject('organisatie')
+			return organisatie?.naam || organisatie?.name || organisatie?.['@self']?.name || 'Onbekende organisatie'
+		},
+
+		/**
+		 * Close the dialog
+		 * @return {void}
+		 */
+		closeDialog() {
+			this.success = null
+			this.error = null
+			this.loading = false
+			navigationStore.setDialog(false)
+		},
+
+		/**
+		 * Change the organisation status
+		 * @return {Promise<void>}
+		 */
+		async changeStatus() {
+			this.loading = true
+			this.error = null
+
+			try {
+				const organisatie = objectStore.getActiveObject('organisatie')
+				const newStatus = navigationStore.dialogProperties?.newStatus
+
+				if (!organisatie || !organisatie.id || !newStatus) {
+					throw new Error('Organisatie of nieuwe status ontbreekt')
+				}
+
+				// Update the organisation status using the object store
+				const updatedOrganisatie = await objectStore.updateObject('organisatie', organisatie.id, {
+					...organisatie,
+					status: newStatus,
+				})
+
+				this.success = true
+
+				// Refresh the collection to show the updated status
+				objectStore.fetchCollection('organisatie')
+
+				// Auto-close after 2 seconds on success
+				setTimeout(() => {
+					this.closeDialog()
+				}, 2000)
+
+			} catch (error) {
+				console.error('Error changing organisation status:', error)
+				this.error = error.message || 'Er is een fout opgetreden bij het wijzigen van de status'
+			} finally {
+				this.loading = false
+			}
+		},
+	},
+}
+</script>
+
+<style scoped>
+.status-change-info {
+	font-size: 14px;
+	color: var(--color-text-lighter);
+	margin-top: 8px;
+	display: block;
+}
+</style>
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 048dff4f..2015f40e 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -12,32 +12,79 @@
 		</div>
 
 		<div v-if="!loading" class="dashboardContent">
-			<!-- Object Statistics Table -->
+			<!-- Object Statistics Tables -->
 			<div class="objectStatistics">
 				<h2 class="sectionTitle">{{ t('softwarecatalog', 'Object Statistics') }}</h2>
 				<p class="sectionDescription">{{ t('softwarecatalog', 'Overview of objects stored in configured registers') }}</p>
 				
-				<div class="statisticsTableContainer">
-					<div class="statisticsTableHeader">
-						<span class="lastUpdated">{{ t('softwarecatalog', 'Last updated: {date}', { date: formatDate(new Date()) }) }}</span>
+				<div class="statisticsTablesRow">
+					<!-- First Table -->
+					<div class="statisticsTableContainer">
+						<div class="statisticsTableHeader">
+							<span class="lastUpdated">{{ t('softwarecatalog', 'Last updated: {date}', { date: formatDate(new Date()) }) }}</span>
+						</div>
+						
+						<table class="objectStatisticsTable">
+							<thead>
+								<tr>
+									<th>{{ t('softwarecatalog', 'Object Type') }}</th>
+									<th class="countHeader">{{ t('softwarecatalog', 'Count') }}</th>
+									<th class="manageHeader">{{ t('softwarecatalog', 'Manage') }}</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr v-for="stat in firstTableStats" :key="stat.objectType">
+									<td>{{ stat.objectType }}</td>
+									<td class="countCell">{{ stat.count.toLocaleString() }}</td>
+									<td class="manageCell">
+										<NcButton
+											size="small"
+											type="tertiary"
+											@click="navigateToObjectType(stat.slug)">
+											<template #icon>
+												<component :is="getIconForObjectType(stat.slug)" :size="16" />
+											</template>
+											Manage
+										</NcButton>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+
+					<!-- Second Table -->
+					<div class="statisticsTableContainer">
+						<div class="statisticsTableHeader">
+							<span class="lastUpdated">{{ t('softwarecatalog', 'Last updated: {date}', { date: formatDate(new Date()) }) }}</span>
+						</div>
+						
+						<table class="objectStatisticsTable">
+							<thead>
+								<tr>
+									<th>{{ t('softwarecatalog', 'Object Type') }}</th>
+									<th class="countHeader">{{ t('softwarecatalog', 'Count') }}</th>
+									<th class="manageHeader">{{ t('softwarecatalog', 'Manage') }}</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr v-for="stat in secondTableStats" :key="stat.objectType">
+									<td>{{ stat.objectType }}</td>
+									<td class="countCell">{{ stat.count.toLocaleString() }}</td>
+									<td class="manageCell">
+										<NcButton
+											size="small"
+											type="tertiary"
+											@click="navigateToObjectType(stat.slug)">
+											<template #icon>
+												<component :is="getIconForObjectType(stat.slug)" :size="16" />
+											</template>
+											Manage
+										</NcButton>
+									</td>
+								</tr>
+							</tbody>
+						</table>
 					</div>
-					
-					<table class="objectStatisticsTable">
-						<thead>
-							<tr>
-								<th>{{ t('softwarecatalog', 'Register') }}</th>
-								<th>{{ t('softwarecatalog', 'Object Type') }}</th>
-								<th>{{ t('softwarecatalog', 'Count') }}</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="stat in objectStatistics" :key="`${stat.register}-${stat.objectType}`">
-								<td>{{ stat.register }}</td>
-								<td>{{ stat.objectType }}</td>
-								<td class="countCell">{{ stat.count.toLocaleString() }}</td>
-							</tr>
-						</tbody>
-					</table>
 				</div>
 			</div>
 
@@ -151,6 +198,7 @@ export default {
 					register: voorzieningenRegister.title,
 					objectType: schema.title,
 					count: total,
+					slug: schema.slug,
 				})
 			})
 
@@ -158,6 +206,26 @@ export default {
 			return stats.sort((a, b) => a.objectType.localeCompare(b.objectType))
 		},
 
+		/**
+		 * Get first half of statistics for first table
+		 * @return {Array} First half of statistics
+		 */
+		firstTableStats() {
+			const stats = this.objectStatistics
+			const midPoint = Math.ceil(stats.length / 2)
+			return stats.slice(0, midPoint)
+		},
+
+		/**
+		 * Get second half of statistics for second table
+		 * @return {Array} Second half of statistics
+		 */
+		secondTableStats() {
+			const stats = this.objectStatistics
+			const midPoint = Math.ceil(stats.length / 2)
+			return stats.slice(midPoint)
+		},
+
 
 
 		/**
@@ -267,6 +335,47 @@ export default {
 			return iconMap[iconName] || OfficeBuildingOutline
 		},
 
+		/**
+		 * Get icon component for specific object type
+		 * @param {string} objectType - Object type slug
+		 * @return {object} Vue icon component
+		 */
+		getIconForObjectType(objectType) {
+			const iconMap = {
+				organisatie: OfficeBuildingOutline,
+				contactpersoon: AccountMultiple,
+				voorziening: ApplicationCog,
+				contract: FileDocumentEdit,
+				product: ApplicationCog,
+				module: ApplicationCog,
+				koppeling: ApplicationCog,
+				dienst: ApplicationCog,
+				standaard: FileDocumentEdit,
+				compliancy: FileDocumentEdit,
+				kwetsbaarheid: FileDocumentEdit,
+				beoordeling: FileDocumentEdit,
+			}
+			return iconMap[objectType] || DatabaseOutline
+		},
+
+		/**
+		 * Navigate to object type management page
+		 * @param {string} objectType - Object type slug to navigate to
+		 * @return {void}
+		 */
+		navigateToObjectType(objectType) {
+			// Handle special cases for plural routing
+			const routeMap = {
+				organisatie: 'organisaties',
+				contactpersoon: 'contactpersonen',
+				voorziening: 'voorzieningen',
+				contract: 'contracten',
+			}
+			
+			const route = routeMap[objectType] || `${objectType}s`
+			navigationStore.setSelected(route)
+		},
+
 		/**
 		 * Navigate to configuration page - opens admin settings in new tab
 		 * @param {string} route - Route to navigate to (legacy parameter)
@@ -443,7 +552,7 @@ export default {
 
 
 
-/* Object Statistics Table */
+/* Object Statistics Tables */
 .objectStatistics {
 	margin-bottom: 32px;
 }
@@ -453,6 +562,12 @@ export default {
 	color: var(--color-text-lighter);
 }
 
+.statisticsTablesRow {
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	gap: 24px;
+}
+
 .statisticsTableContainer {
 	background: var(--color-main-background);
 	border: 1px solid var(--color-border);
@@ -487,6 +602,11 @@ export default {
 	border-bottom: 1px solid var(--color-border);
 }
 
+.countHeader,
+.manageHeader {
+	text-align: right;
+}
+
 .objectStatisticsTable td {
 	padding: 16px;
 	border-bottom: 1px solid var(--color-border-dark);
@@ -505,5 +625,15 @@ export default {
 	text-align: right;
 }
 
+.manageCell {
+	text-align: right;
+}
+
+@media (max-width: 768px) {
+	.statisticsTablesRow {
+		grid-template-columns: 1fr;
+	}
+}
+
 
 </style>
diff --git a/src/views/organisaties/OrganisatieIndex.vue b/src/views/organisaties/OrganisatieIndex.vue
index c5ab0c9d..7ef39e96 100644
--- a/src/views/organisaties/OrganisatieIndex.vue
+++ b/src/views/organisaties/OrganisatieIndex.vue
@@ -16,28 +16,49 @@ import OrganisatieCard from '../../components/cards/OrganisatieCard.vue'
 </script>
 
 <template>
-	<GenericObjectTable
-		object-type="organisatie"
-		object-type-plural="organisaties"
-		:title="t('softwarecatalog', 'Organisaties')"
-		:description="t('softwarecatalog', 'Manage your organisaties and their configurations')"
-		:empty-icon="OfficeBuildingOutline"
-		:card-icon="OfficeBuildingOutline"
-		:properties="organisatieProperties"
-		:object-actions="organisatieObjectActions"
-		:mass-actions="organisatieMassActions"
-		:actions="organisatieActions"
-		:add-action="addOrganisatieAction"
-		:help-url="'https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/organisaties'"
-		card-display-mode="description"
-		:custom-card-component="OrganisatieCard"
-		:filters="organisatieFilters"
-		@mounted="onMounted" />
+	<div class="organisatieIndex">
+		<!-- Search Bar -->
+		<div class="organisatieSearch">
+			<NcTextField
+				:value.sync="searchQuery"
+				:label="t('softwarecatalog', 'Zoeken in organisaties')"
+				:placeholder="t('softwarecatalog', 'Zoek op naam, website, type...')"
+				trailing-button-icon="close"
+				:show-trailing-button="searchQuery.length > 0"
+				@trailing-button-click="clearSearch"
+				@update:value="onSearchInput">
+				<template #icon>
+					<Magnify :size="16" />
+				</template>
+			</NcTextField>
+		</div>
+
+		<GenericObjectTable
+			object-type="organisatie"
+			object-type-plural="organisaties"
+			:title="t('softwarecatalog', 'Organisaties')"
+			:description="t('softwarecatalog', 'Manage your organisaties and their configurations')"
+			:empty-icon="OfficeBuildingOutline"
+			:card-icon="OfficeBuildingOutline"
+			:properties="organisatieProperties"
+			:object-actions="organisatieObjectActions"
+			:mass-actions="organisatieMassActions"
+			:actions="organisatieActions"
+			:add-action="addOrganisatieAction"
+			:help-url="'https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/organisaties'"
+			card-display-mode="description"
+			:custom-card-component="OrganisatieCard"
+			:filters="organisatieFilters"
+			:search-query="searchQuery"
+			@mounted="onMounted" />
+	</div>
 </template>
 
 <script>
 import GenericObjectTable from '../../components/GenericObjectTable.vue'
+import { NcTextField } from '@nextcloud/vue'
 import OfficeBuildingOutline from 'vue-material-design-icons/OfficeBuildingOutline.vue'
+import Magnify from 'vue-material-design-icons/Magnify.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import Refresh from 'vue-material-design-icons/Refresh.vue'
 import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
@@ -48,11 +69,16 @@ import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import PublishIcon from 'vue-material-design-icons/Publish.vue'
 import PublishOffIcon from 'vue-material-design-icons/PublishOff.vue'
+import CheckCircle from 'vue-material-design-icons/CheckCircle.vue'
+import CloseCircle from 'vue-material-design-icons/CloseCircle.vue'
+import OpenInNew from 'vue-material-design-icons/OpenInNew.vue'
 
 export default {
 	name: 'OrganisatieIndex',
 	components: {
 		GenericObjectTable,
+		NcTextField,
+		Magnify,
 		// eslint-disable-next-line vue/no-unused-components
 		OrganisatieCard,
 	},
@@ -140,6 +166,15 @@ export default {
 						})
 					},
 				},
+				{
+					id: 'goToOrganisation',
+					label: 'Go to organisation',
+					icon: OpenInNew,
+					handler: (organisatie) => {
+						this.goToOrganisation(organisatie)
+					},
+				},
+
 				{
 					id: 'delete',
 					label: 'Delete',
@@ -224,10 +259,23 @@ export default {
 					options: [
 						{ value: 'all', label: 'Alle statussen' },
 						{ value: 'Actief', label: 'Actief' },
-						{ value: 'concept', label: 'Concept' },
+						{ value: 'Concept', label: 'Concept' },
+					],
+				},
+				{
+					key: 'type',
+					label: 'Type',
+					options: [
+						{ value: 'all', label: 'Alle types' },
+						{ value: 'Gemeente', label: 'Gemeente' },
+						{ value: 'Leverancier', label: 'Leverancier' },
+						{ value: 'Samenwerking', label: 'Samenwerking' },
+						{ value: 'Community', label: 'Community' },
 					],
 				},
 			],
+			searchQuery: '',
+			searchDebounceTimeout: null,
 			addOrganisatieAction: {
 				id: 'add',
 				label: 'Add Organisatie',
@@ -237,6 +285,85 @@ export default {
 					navigationStore.setModal('organisatie')
 				},
 			},
+			organisatieObjectActions: [
+				{
+					id: 'view',
+					label: 'View',
+					icon: Eye,
+					handler: (organisatie) => {
+						objectStore.setActiveObject('organisatie', organisatie)
+						navigationStore.setModal('viewOrganisatie')
+					},
+				},
+				{
+					id: 'edit',
+					label: 'Edit',
+					icon: Pencil,
+					handler: (organisatie) => {
+						objectStore.setActiveObject('organisatie', organisatie)
+						navigationStore.setModal('organisatie')
+					},
+				},
+				{
+					id: 'copy',
+					label: 'Copy',
+					icon: ContentCopy,
+					handler: (organisatie) => {
+						objectStore.setActiveObject('organisatie', organisatie)
+						navigationStore.setDialog('copyObject', {
+							objectType: 'organisatie',
+							dialogTitle: 'Organisatie',
+						})
+					},
+				},
+				{
+					id: 'goToOrganisation',
+					label: 'Go to organisation',
+					icon: OpenInNew,
+					handler: (organisatie) => {
+						this.goToOrganisation(organisatie)
+					},
+				},
+				{
+					id: 'activeren',
+					label: 'Activeren',
+					icon: CheckCircle,
+					condition: (organisatie) => organisatie.status?.toLowerCase() === 'concept' || organisatie.status?.toLowerCase() === 'deactief',
+					handler: (organisatie) => {
+						objectStore.setActiveObject('organisatie', organisatie)
+						navigationStore.setDialog('changeOrganisatieStatus', {
+							objectType: 'organisatie',
+							dialogTitle: 'Organisatie Activeren',
+							newStatus: 'Actief',
+							action: 'activeren',
+						})
+					},
+				},
+				{
+					id: 'deactiveren',
+					label: 'Deactiveren',
+					icon: CloseCircle,
+					condition: (organisatie) => organisatie.status?.toLowerCase() === 'actief',
+					handler: (organisatie) => {
+						objectStore.setActiveObject('organisatie', organisatie)
+						navigationStore.setDialog('changeOrganisatieStatus', {
+							objectType: 'organisatie',
+							dialogTitle: 'Organisatie Deactiveren',
+							newStatus: 'Deactief',
+							action: 'deactiveren',
+						})
+					},
+				},
+				{
+					id: 'delete',
+					label: 'Delete',
+					icon: TrashCanOutline,
+					handler: (organisatie) => {
+						objectStore.setActiveObject('organisatie', organisatie)
+						navigationStore.setModal('deleteObject')
+					},
+				},
+			],
 		}
 	},
 	methods: {
@@ -261,6 +388,139 @@ export default {
 				// Show error to user if needed
 			}
 		},
+
+		/**
+		 * Handle search input with debouncing
+		 * @param {string} value - The search input value
+		 * @return {void}
+		 */
+		onSearchInput(value) {
+			this.searchQuery = value
+			
+			// Clear existing timeout
+			if (this.searchDebounceTimeout) {
+				clearTimeout(this.searchDebounceTimeout)
+			}
+
+			// Set new timeout for 1.5 seconds
+			this.searchDebounceTimeout = setTimeout(() => {
+				this.performSearch()
+			}, 1500)
+		},
+
+		/**
+		 * Perform the actual search with API call
+		 * @return {Promise<void>}
+		 */
+		async performSearch() {
+			try {
+				console.info('Performing search with query:', this.searchQuery)
+				
+				const searchParams = {}
+				if (this.searchQuery && this.searchQuery.trim()) {
+					searchParams._search = this.searchQuery.trim()
+				}
+
+				// Fetch organisaties with search parameter
+				await objectStore.fetchCollection('organisatie', searchParams)
+			} catch (error) {
+				console.error('Error performing search:', error)
+			}
+		},
+
+		/**
+		 * Clear the search query and reset results
+		 * @return {Promise<void>}
+		 */
+		async clearSearch() {
+			this.searchQuery = ''
+			
+			// Clear any pending timeout
+			if (this.searchDebounceTimeout) {
+				clearTimeout(this.searchDebounceTimeout)
+			}
+
+			// Fetch all organisaties without search filter
+			await objectStore.fetchCollection('organisatie')
+		},
+
+		/**
+		 * Navigate to external organisation catalog
+		 * @param {object} organisatie - The organisation object
+		 * @return {void}
+		 */
+		async goToOrganisation(organisatie) {
+			try {
+				// Get the catalog location from settings
+				const catalogLocation = objectStore.settings?.catalogLocation
+				
+				if (!catalogLocation) {
+					console.warn('No catalog location configured')
+					// Fallback: could show a notification to user
+					return
+				}
+
+				// Get the organisation UUID/ID
+				const organisatieId = organisatie.id || organisatie.uuid
+
+				if (!organisatieId) {
+					console.warn('Organisation has no valid ID')
+					return
+				}
+
+				// First, set the active organisation in OpenRegister via Nextcloud endpoint
+				const setActiveUrl = `${window.location.origin}/index.php/apps/openregister/api/organizations/${organisatieId}/set-active`
+				
+				try {
+					await fetch(setActiveUrl, {
+						method: 'POST',
+						headers: {
+							'Content-Type': 'application/json',
+						},
+					})
+					console.info('Active organisation set successfully')
+				} catch (error) {
+					console.warn('Failed to set active organisation:', error)
+					// Continue anyway - the catalog might still work
+				}
+
+				// Build the target URL: catalogLocation + '/beheer'
+				const targetUrl = catalogLocation.endsWith('/') 
+					? `${catalogLocation}beheer`
+					: `${catalogLocation}/beheer`
+
+				// Navigate to the external catalog
+				window.open(targetUrl, '_blank')
+
+			} catch (error) {
+				console.error('Error navigating to organisation:', error)
+			}
+		},
+	},
+
+	/**
+	 * Component cleanup - clear timeouts
+	 * @return {void}
+	 */
+	beforeDestroy() {
+		if (this.searchDebounceTimeout) {
+			clearTimeout(this.searchDebounceTimeout)
+		}
 	},
 }
 </script>
+
+<style scoped>
+.organisatieIndex {
+	padding: 16px;
+}
+
+.organisatieSearch {
+	margin-bottom: 24px;
+	max-width: 400px;
+}
+
+.organisatieSearch :deep(.input-field__input) {
+	border-radius: var(--border-radius);
+}
+</style>
diff --git a/src/views/settings/Settings.vue b/src/views/settings/Settings.vue
index 0570ba46..f29c5f5a 100644
--- a/src/views/settings/Settings.vue
+++ b/src/views/settings/Settings.vue
@@ -71,6 +71,55 @@
 				:size="64"
 				appearance="dark" />
 		</NcSettingsSection>
+
+		<NcSettingsSection
+			name="Other Configuration"
+			description="Configure additional application settings">
+			<div v-if="!loading">
+				<!-- Catalog Location -->
+				<div class="catalog-location-section">
+					<h3>Catalog Location</h3>
+					<p>Set the base URL for your catalog interface</p>
+
+					<NcTextField
+						:value.sync="catalogLocation"
+						:label="t('softwarecatalog', 'Catalog Location URL')"
+						:placeholder="t('softwarecatalog', 'https://catalog.example.com')"
+						:disabled="loading || savingCatalogLocation"
+						@update:value="onCatalogLocationChange">
+						<template #icon>
+							<Web :size="16" />
+						</template>
+					</NcTextField>
+
+					<div class="catalog-location-help">
+						<p class="help-text">
+							This URL will be used for "Go to organisation" links. The system will append "/beheer" to this URL.
+						</p>
+					</div>
+
+					<!-- Save Catalog Location Button -->
+					<div class="button-container">
+						<NcButton
+							type="secondary"
+							:disabled="loading || savingCatalogLocation || !catalogLocationChanged"
+							@click="saveCatalogLocation">
+							<template #icon>
+								<NcLoadingIcon v-if="savingCatalogLocation" :size="20" />
+								<Save v-else :size="20" />
+							</template>
+							Save Catalog Location
+						</NcButton>
+					</div>
+				</div>
+			</div>
+
+			<!-- Loading State -->
+			<NcLoadingIcon v-else
+				class="loading-icon"
+				:size="64"
+				appearance="dark" />
+		</NcSettingsSection>
 	</div>
 </template>
 
@@ -82,8 +131,10 @@ import {
 	NcSelect,
 	NcButton,
 	NcLoadingIcon,
+	NcTextField,
 } from '@nextcloud/vue'
 import Save from 'vue-material-design-icons/ContentSave.vue'
+import Web from 'vue-material-design-icons/Web.vue'
 
 /**
  * @class Settings
@@ -106,7 +157,9 @@ export default defineComponent({
 		NcSelect,
 		NcButton,
 		NcLoadingIcon,
+		NcTextField,
 		Save,
+		Web,
 	},
 
 	/**
@@ -118,6 +171,7 @@ export default defineComponent({
 		return {
 			loading: true,
 			saving: false,
+			savingCatalogLocation: false,
 			loadingConfiguration: false,
 			configurationResults: null,
 			settings: {
@@ -125,10 +179,13 @@ export default defineComponent({
 				openRegisters: false,
 				availableRegisters: [],
 				configuration: {},
+				catalogLocation: '',
 			},
 			selectedRegister: null,
 			configuration: {},
 			schemaOptions: [],
+			catalogLocation: '',
+			originalCatalogLocation: '',
 		}
 	},
 
@@ -171,6 +228,15 @@ export default defineComponent({
 
 			return this.schemaOptions.filter(option => !usedSchemaIds.includes(option.value))
 		},
+
+		/**
+		 * Check if catalog location has changed
+		 *
+		 * @return {boolean} True if catalog location has changed
+		 */
+		catalogLocationChanged() {
+			return this.catalogLocation !== this.originalCatalogLocation
+		},
 	},
 
 	/**
@@ -193,6 +259,10 @@ export default defineComponent({
 				const data = await response.json()
 				this.settings = data
 
+				// Initialize catalog location
+				this.catalogLocation = data.catalogLocation || ''
+				this.originalCatalogLocation = this.catalogLocation
+
 				// Initialize configuration object
 				this.initializeConfiguration()
 
@@ -450,6 +520,52 @@ export default defineComponent({
 				this.loadingConfiguration = false
 			}
 		},
+
+		/**
+		 * Handle catalog location input change
+		 *
+		 * @param {string} value - New catalog location value
+		 * @return {void}
+		 */
+		onCatalogLocationChange(value) {
+			this.catalogLocation = value
+		},
+
+		/**
+		 * Save catalog location to backend
+		 *
+		 * @async
+		 * @return {Promise<void>}
+		 */
+		async saveCatalogLocation() {
+			if (!this.catalogLocationChanged) {
+				return
+			}
+
+			this.savingCatalogLocation = true
+			try {
+				const response = await fetch('/index.php/apps/softwarecatalog/api/settings/catalog-location', {
+					method: 'POST',
+					headers: {
+						'Content-Type': 'application/json',
+					},
+					body: JSON.stringify({
+						catalogLocation: this.catalogLocation,
+					}),
+				})
+
+				if (response.ok) {
+					this.originalCatalogLocation = this.catalogLocation
+					console.info('Catalog location saved successfully')
+				} else {
+					console.error('Failed to save catalog location')
+				}
+			} catch (error) {
+				console.error('Failed to save catalog location:', error)
+			} finally {
+				this.savingCatalogLocation = false
+			}
+		},
 	},
 })
 </script>
@@ -492,4 +608,20 @@ export default defineComponent({
 	justify-content: center;
 	margin: 2rem 0;
 }
+
+.catalog-location-section {
+	margin-bottom: 2rem;
+	max-width: 500px;
+}
+
+.catalog-location-help {
+	margin-top: 0.5rem;
+	margin-bottom: 1rem;
+}
+
+.help-text {
+	font-size: 12px;
+	color: var(--color-text-lighter);
+	margin: 0;
+}
 </style>