diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 732fb75..45aa628 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -13,7 +13,7 @@ jobs:
               uses: actions/checkout@v3
             - run: echo "The ${{ github.repository }} repository has been cloned to the runner."
             - run: echo "The workflow is now ready to test your code on the runner."
-            - name: List files in the repository
+            - name: List files in the repository:
               run: |
                   ls ${{ github.workspace }}
             - run: echo "This job's status is ${{ job.status }}."
diff --git a/app/Controllers/Http/Admin/mailsettings_controller.ts b/app/Controllers/Http/Admin/mailsettings_controller.ts
index 628a9fc..43e9dc7 100644
--- a/app/Controllers/Http/Admin/mailsettings_controller.ts
+++ b/app/Controllers/Http/Admin/mailsettings_controller.ts
@@ -76,24 +76,23 @@ export default class MailSettingsController {
     public async sendTestMail({ response, auth }: HttpContext) {
         const user = auth.user!;
         const userEmail = user.email;
-
+        
         // let mailManager = await app.container.make('mail.manager');
-        // let iwas = mailManager.use();
+        // let iwas = mailManager.use();       
         // let test = mail.config.mailers.smtp();
         if (!userEmail) {
             return response.badRequest({ message: 'User email is not set. Please update your profile.' });
         }
 
         try {
-            await mail.send(
-                (message) => {
-                    message
-                        // .from(Config.get('mail.from.address'))
-                        .from('tethys@geosphere.at')
-                        .to(userEmail)
-                        .subject('Test Email')
-                        .html('<p>If you received this email, the email configuration seems to be correct.</p>');
-                });
+            await mail.send((message) => {
+                message
+                    // .from(Config.get('mail.from.address'))
+                    .from('tethys@geosphere.at')
+                    .to(userEmail)
+                    .subject('Test Email')
+                    .html('<p>If you received this email, the email configuration seems to be correct.</p>');
+            });
 
             return response.json({ success: true, message: 'Test email sent successfully' });
             // return response.flash('Test email sent successfully!', 'message').redirect().back();
diff --git a/app/Controllers/Http/Editor/DatasetController.ts b/app/Controllers/Http/Editor/DatasetController.ts
index f2a0417..04c450d 100644
--- a/app/Controllers/Http/Editor/DatasetController.ts
+++ b/app/Controllers/Http/Editor/DatasetController.ts
@@ -188,16 +188,10 @@ export default class DatasetsController {
         }
     }
 
-    public async approve({ request, inertia, response, auth }: HttpContext) {
+    public async approve({ request, inertia, response }: HttpContext) {
         const id = request.param('id');
-
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-        
         // $dataset = Dataset::with('user:id,login')->findOrFail($id);
-        const dataset = await Dataset.query().where('id', id).where('editor_id', user.id).firstOrFail();
+        const dataset = await Dataset.findOrFail(id);
 
         const validStates = ['editor_accepted', 'rejected_reviewer'];
         if (!validStates.includes(dataset.server_state)) {
@@ -223,7 +217,7 @@ export default class DatasetsController {
         });
     }
 
-    public async approveUpdate({ request, response, auth }: HttpContext) {
+    public async approveUpdate({ request, response }: HttpContext) {
         const approveDatasetSchema = vine.object({
             reviewer_id: vine.number(),
         });
@@ -236,11 +230,7 @@ export default class DatasetsController {
             throw error;
         }
         const id = request.param('id');
-          const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-        const dataset = await Dataset.query().where('id', id).where('editor_id', user.id).firstOrFail();
+        const dataset = await Dataset.findOrFail(id);
 
         const validStates = ['editor_accepted', 'rejected_reviewer'];
         if (!validStates.includes(dataset.server_state)) {
@@ -271,15 +261,10 @@ export default class DatasetsController {
         }
     }
 
-    public async reject({ request, inertia, response, auth }: HttpContext) {
+    public async reject({ request, inertia, response }: HttpContext) {
         const id = request.param('id');
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
         const dataset = await Dataset.query()
             .where('id', id)
-            .where('editor_id', user.id) // Ensure the user is the editor of the dataset
             // .preload('titles')
             // .preload('descriptions')
             .preload('user', (builder) => {
@@ -306,15 +291,10 @@ export default class DatasetsController {
 
     public async rejectUpdate({ request, response, auth }: HttpContext) {
         const authUser = auth.user!;
-        
-        if (!authUser) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
 
         const id = request.param('id');
         const dataset = await Dataset.query()
             .where('id', id)
-            .where('editor_id', authUser.id) // Ensure the user is the editor of the dataset
             .preload('user', (builder) => {
                 builder.select('id', 'login', 'email');
             })
@@ -397,14 +377,9 @@ export default class DatasetsController {
 
     public async publish({ request, inertia, response, auth }: HttpContext) {
         const id = request.param('id');
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
 
         const dataset = await Dataset.query()
             .where('id', id)
-            .where('editor_id', user.id) // Ensure the user is the editor of the dataset
             .preload('titles')
             .preload('authors')
             // .preload('persons', (builder) => {
@@ -433,7 +408,7 @@ export default class DatasetsController {
         });
     }
 
-    public async publishUpdate({ request, response, auth }: HttpContext) {
+    public async publishUpdate({ request, response }: HttpContext) {
         const publishDatasetSchema = vine.object({
             publisher_name: vine.string().trim(),
         });
@@ -445,12 +420,7 @@ export default class DatasetsController {
             throw error;
         }
         const id = request.param('id');
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
-        const dataset = await Dataset.query().where('id', id).where('editor_id', user.id).firstOrFail();
+        const dataset = await Dataset.findOrFail(id);
 
         // let test = await Dataset.getMax('publish_id');
         // const maxPublishId = await Database.from('documents').max('publish_id as max_publish_id').first();
@@ -476,16 +446,10 @@ export default class DatasetsController {
         }
     }
 
-    public async rejectToReviewer({ request, inertia, response, auth }: HttpContext) {
+    public async rejectToReviewer({ request, inertia, response }: HttpContext) {
         const id = request.param('id');
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
         const dataset = await Dataset.query()
             .where('id', id)
-            .where('editor_id', user.id) // Ensure the user is the editor of the dataset
             .preload('reviewer', (builder) => {
                 builder.select('id', 'login', 'email');
             })
@@ -511,14 +475,9 @@ export default class DatasetsController {
     public async rejectToReviewerUpdate({ request, response, auth }: HttpContext) {
         const authUser = auth.user!;
 
-        if (!authUser) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
         const id = request.param('id');
         const dataset = await Dataset.query()
             .where('id', id)
-            .where('editor_id', authUser.id) // Ensure the user is the editor of the dataset
             .preload('reviewer', (builder) => {
                 builder.select('id', 'login', 'email');
             })
@@ -599,16 +558,10 @@ export default class DatasetsController {
             .toRoute('editor.dataset.list');
     }
 
-    public async doiCreate({ request, inertia, auth, response }: HttpContext) {
+    public async doiCreate({ request, inertia }: HttpContext) {
         const id = request.param('id');
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
         const dataset = await Dataset.query()
             .where('id', id)
-            .where('editor_id', user.id) // Ensure the user is the editor of the dataset
             .preload('titles')
             .preload('descriptions')
             // .preload('identifier')
@@ -619,18 +572,11 @@ export default class DatasetsController {
         });
     }
 
-    public async doiStore({ request, response, auth }: HttpContext) {
+    public async doiStore({ request, response }: HttpContext) {
         const dataId = request.param('publish_id');
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
 
         // Load dataset with minimal required relationships
-        const dataset = await Dataset.query()
-            .where('editor_id', user.id) // Ensure the user is the editor of the dataset
-            .where('publish_id', dataId)
-            .firstOrFail();
+        const dataset = await Dataset.query().where('publish_id', dataId).firstOrFail();
 
         const prefix = process.env.DATACITE_PREFIX || '';
         const base_domain = process.env.BASE_DOMAIN || '';
@@ -712,17 +658,9 @@ export default class DatasetsController {
 
     public async show({}: HttpContext) {}
 
-    public async edit({ request, inertia, response, auth }: HttpContext) {
+    public async edit({ request, inertia, response }: HttpContext) {
         const id = request.param('id');
-
-        // Check if user is authenticated
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
-        // Prefilter by both id AND editor_id to ensure user has permission to edit
-        const datasetQuery = Dataset.query().where('id', id).where('editor_id', user.id);
+        const datasetQuery = Dataset.query().where('id', id);
         datasetQuery
             .preload('titles', (query) => query.orderBy('id', 'asc'))
             .preload('descriptions', (query) => query.orderBy('id', 'asc'))
@@ -739,7 +677,6 @@ export default class DatasetsController {
                 query.orderBy('sort_order', 'asc'); // Sort by sort_order column
             });
 
-        // This will throw 404 if editor_id does not match logged in user
         const dataset = await datasetQuery.firstOrFail();
         const validStates = ['editor_accepted', 'rejected_reviewer'];
         if (!validStates.includes(dataset.server_state)) {
@@ -813,16 +750,11 @@ export default class DatasetsController {
         });
     }
 
-    public async update({ request, response, session, auth }: HttpContext) {
+    public async update({ request, response, session }: HttpContext) {
         // Get the dataset id from the route parameter
         const datasetId = request.param('id');
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
         // Retrieve the dataset and load its existing files
-        const dataset = await Dataset.query().where('id', datasetId).where('editor_id', user.id).firstOrFail();
+        const dataset = await Dataset.findOrFail(datasetId);
         await dataset.load('files');
 
         let trx: TransactionClientContract | null = null;
@@ -831,7 +763,7 @@ export default class DatasetsController {
             trx = await db.transaction();
             // const user = (await User.find(auth.user?.id)) as User;
             // await this.createDatasetAndAssociations(user, request, trx);
-            // const dataset = await Dataset.findOrFail(datasetId);
+            const dataset = await Dataset.findOrFail(datasetId);
 
             // save the licenses
             const licenses: number[] = request.input('licenses', []);
@@ -1017,15 +949,10 @@ export default class DatasetsController {
         }
     }
 
-    public async categorize({ inertia, request, response, auth }: HttpContext) {
+    public async categorize({ inertia, request, response }: HttpContext) {
         const id = request.param('id');
-        // Check if user is authenticated
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
         // Preload dataset and its "collections" relation
-        const dataset = await Dataset.query().where('id', id).where('editor_id', user.id).preload('collections').firstOrFail();
+        const dataset = await Dataset.query().where('id', id).preload('collections').firstOrFail();
         const validStates = ['editor_accepted', 'rejected_reviewer'];
         if (!validStates.includes(dataset.server_state)) {
             // session.flash('errors', 'Invalid server state!');
@@ -1053,15 +980,10 @@ export default class DatasetsController {
         });
     }
 
-    public async categorizeUpdate({ request, response, session, auth }: HttpContext) {
+    public async categorizeUpdate({ request, response, session }: HttpContext) {
         // Get the dataset id from the route parameter
         const id = request.param('id');
-        const user = auth.user;
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-        // Retrieve the dataset and load its existing files
-        const dataset = await Dataset.query().preload('files').where('id', id).where('editor_id', user.id).firstOrFail();
+        const dataset = await Dataset.query().preload('files').where('id', id).firstOrFail();
 
         const validStates = ['editor_accepted', 'rejected_reviewer'];
         if (!validStates.includes(dataset.server_state)) {
@@ -1266,7 +1188,7 @@ export default class DatasetsController {
         }
 
         // return cache.getDomDocument();
-        const xmlDocument: XMLBuilder | null = await serializer.toXmlDocument();
+        const xmlDocument : XMLBuilder | null = await serializer.toXmlDocument();
         return xmlDocument;
     }
 }
diff --git a/app/Controllers/Http/Submitter/DatasetController.ts b/app/Controllers/Http/Submitter/DatasetController.ts
index d666e6f..cda7da6 100644
--- a/app/Controllers/Http/Submitter/DatasetController.ts
+++ b/app/Controllers/Http/Submitter/DatasetController.ts
@@ -824,20 +824,13 @@ export default class DatasetController {
     };
 
     // public async release({ params, view }) {
-    public async release({ request, inertia, response, auth }: HttpContext) {
+    public async release({ request, inertia, response }: HttpContext) {
         const id = request.param('id');
-        const user = auth.user;
-
-        // Check if user is authenticated
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
 
         const dataset = await Dataset.query()
             .preload('user', (builder) => {
                 builder.select('id', 'login');
             })
-            .where('account_id', user.id) // Only fetch if user owns it
             .where('id', id)
             .firstOrFail();
 
@@ -858,20 +851,9 @@ export default class DatasetController {
         });
     }
 
-    public async releaseUpdate({ request, response, auth }: HttpContext) {
+    public async releaseUpdate({ request, response }: HttpContext) {
         const id = request.param('id');
-        const user = auth.user;
-
-        // Check if user is authenticated
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
-        const dataset = await Dataset.query()
-            .preload('files')
-            .where('id', id)
-            .where('account_id', user.id) // Only fetch if user owns it
-            .firstOrFail();
+        const dataset = await Dataset.query().preload('files').where('id', id).firstOrFail();
 
         const validStates = ['inprogress', 'rejected_editor'];
         if (!validStates.includes(dataset.server_state)) {
@@ -951,15 +933,7 @@ export default class DatasetController {
 
     public async edit({ request, inertia, response, auth }: HttpContext) {
         const id = request.param('id');
-        const user = auth.user;
-
-        // Check if user is authenticated
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
-        // Prefilter by both id AND account_id
-        const datasetQuery = Dataset.query().where('id', id).where('account_id', user.id); // Only fetch if user owns it
+        const datasetQuery = Dataset.query().where('id', id);
         datasetQuery
             .preload('titles', (query) => query.orderBy('id', 'asc'))
             .preload('descriptions', (query) => query.orderBy('id', 'asc'))
@@ -975,9 +949,8 @@ export default class DatasetController {
             .preload('files', (query) => {
                 query.orderBy('sort_order', 'asc'); // Sort by sort_order column
             });
-        // This will throw 404 if dataset doesn't exist OR user doesn't own it
-        const dataset = await datasetQuery.firstOrFail();
 
+        const dataset = await datasetQuery.firstOrFail();
         const validStates = ['inprogress', 'rejected_editor'];
         if (!validStates.includes(dataset.server_state)) {
             // session.flash('errors', 'Invalid server state!');
@@ -1041,30 +1014,11 @@ export default class DatasetController {
         });
     }
 
-    public async update({ request, response, session, auth }: HttpContext) {
+    public async update({ request, response, session }: HttpContext) {
         // Get the dataset id from the route parameter
         const datasetId = request.param('id');
-        const user = auth.user;
-
-        // Check if user is authenticated
-        if (!user) {
-            return response.flash('You must be logged in to update a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
-        // Prefilter by both id AND account_id
-        const dataset = await Dataset.query()
-            .where('id', datasetId)
-            .where('account_id', user.id) // Only fetch if user owns it
-            .firstOrFail();
-
-        // // Check if the authenticated user is the owner of the dataset
-        // if (dataset.account_id !== user.id) {
-        //     return response
-        //         .flash(`Unauthorized access. You are not the owner of dataset with id ${id}.`, 'error')
-        //         .redirect()
-        //         .toRoute('dataset.list');
-        // }
-
+        // Retrieve the dataset and load its existing files
+        const dataset = await Dataset.findOrFail(datasetId);
         await dataset.load('files');
         // Accumulate the size of the already related files
         // const preExistingFileSize = dataset.files.reduce((acc, file) => acc + file.fileSize, 0);
@@ -1488,26 +1442,16 @@ export default class DatasetController {
         }
     }
 
-    public async delete({ request, inertia, response, session, auth }: HttpContext) {
+    public async delete({ request, inertia, response, session }: HttpContext) {
         const id = request.param('id');
-        const user = auth.user;
-
-        // Check if user is authenticated
-        if (!user) {
-            return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-        }
-
         try {
-            // This will throw 404 if dataset doesn't exist OR user doesn't own it
             const dataset = await Dataset.query()
                 .preload('user', (builder) => {
                     builder.select('id', 'login');
                 })
                 .where('id', id)
-                .where('account_id', user.id) // Only fetch if user owns it
                 .preload('files')
                 .firstOrFail();
-
             const validStates = ['inprogress', 'rejected_editor'];
             if (!validStates.includes(dataset.server_state)) {
                 // session.flash('errors', 'Invalid server state!');
@@ -1532,27 +1476,9 @@ export default class DatasetController {
         }
     }
 
-    public async deleteUpdate({ params, session, response, auth }: HttpContext) {
+    public async deleteUpdate({ params, session, response }: HttpContext) {
         try {
-            const user = auth.user;
-            if (!user) {
-                return response.flash('You must be logged in to edit a dataset.', 'error').redirect().toRoute('app.login.show');
-            }
-
-            // This will throw 404 if dataset doesn't exist OR user doesn't own it
-            const dataset = await Dataset.query()
-                .where('id', params.id)
-                .where('account_id', user.id) // Only fetch if user owns it
-                .preload('files')
-                .firstOrFail();
-
-            // // Check if the authenticated user is the owner of the dataset
-            // if (dataset.account_id !== user.id) {
-            //     return response
-            //         .flash(`Unauthorized access. You are not the owner of dataset with id ${params.id}.`, 'error')
-            //         .redirect()
-            //         .toRoute('dataset.list');
-            // }
+            const dataset = await Dataset.query().where('id', params.id).preload('files').firstOrFail();
 
             const validStates = ['inprogress', 'rejected_editor'];
             if (validStates.includes(dataset.server_state)) {
diff --git a/config/mail.ts b/config/mail.ts
index a97489f..8016c29 100644
--- a/config/mail.ts
+++ b/config/mail.ts
@@ -16,7 +16,7 @@ const mailConfig = defineConfig({
             host: env.get('SMTP_HOST', ''),
             port: env.get('SMTP_PORT'),
             secure: false,
-            ignoreTLS: true,
+            // ignoreTLS: true,
             requireTLS: false,
 
             /**
diff --git a/resources/js/Components/CardBox.vue b/resources/js/Components/CardBox.vue
index dbdee01..c2d200e 100644
--- a/resources/js/Components/CardBox.vue
+++ b/resources/js/Components/CardBox.vue
@@ -67,7 +67,7 @@ const submit = (e) => {
                 <BaseIcon v-if="icon" :path="icon" class="mr-3" />
                 {{ title }}
             </div>
-            <button v-if="showHeaderIcon" class="flex items-center py-3 px-4 justify-center ring-blue-700 focus:ring" @click.stop="headerIconClick">
+            <button v-if="showHeaderIcon" class="flex items-center py-3 px-4 justify-center ring-blue-700 focus:ring" @click="headerIconClick">
                 <BaseIcon :path="computedHeaderIcon" />
             </button>
         </header>
diff --git a/resources/js/Components/Map/map.component.vue b/resources/js/Components/Map/map.component.vue
index 0edd1db..353162b 100644
--- a/resources/js/Components/Map/map.component.vue
+++ b/resources/js/Components/Map/map.component.vue
@@ -87,10 +87,8 @@ import BaseIcon from '@/Components/BaseIcon.vue';
 import { MapOptions } from './MapOptions';
 import { LayerOptions, LayerMap } from './LayerOptions';
 import { MapService } from '@/Stores/map.service';
-// import ZoomControlComponent from '@/Components/Map/zoom.component.vue';
-// import DrawControlComponent from '@/Components/Map/draw.component.vue';
-import ZoomControlComponent from './zoom.component.vue';
-import DrawControlComponent from './draw.component.vue';
+import { ZoomControlComponent } from './zoom.component.vue';
+import { DrawControlComponent } from './draw.component.vue';
 import { Coverage } from '@/Dataset';
 import { canvas } from 'leaflet/src/layer/vector/Canvas';
 import { svg } from 'leaflet/src/layer/vector/SVG';
@@ -139,7 +137,7 @@ const DEFAULT_BASE_LAYER_ATTRIBUTION = '&copy; <a target="_blank" href="http://o
         BaseIcon,
     },
 })
-export default class MapComponent extends Vue {
+export class MapComponent extends Vue {
     @Prop()
     public mapId: string;
 
@@ -303,7 +301,7 @@ export default class MapComponent extends Vue {
         }
     }
 }
-// export default MapComponent;
+export default MapComponent;
 </script>
 
 <style scoped>
diff --git a/resources/js/Components/TablePersons.vue b/resources/js/Components/TablePersons.vue
index 9bae518..c119d8c 100644
--- a/resources/js/Components/TablePersons.vue
+++ b/resources/js/Components/TablePersons.vue
@@ -46,8 +46,8 @@ const dragEnabled = ref(props.canReorder);
 
 // Name type options
 const nameTypeOptions = {
-    Personal: 'Personal',
-    Organizational: 'Org',
+    'Personal': 'Personal',
+    'Organizational': 'Org'
 };
 
 // Computed properties
@@ -111,10 +111,9 @@ const removeAuthor = (index: number) => {
     const actualIndex = perPage.value * currentPage.value + index;
     const person = items.value[actualIndex];
 
-    const displayName =
-        person.name_type === 'Organizational'
-            ? person.last_name || person.email
-            : `${person.first_name || ''} ${person.last_name || person.email}`.trim();
+    const displayName = person.name_type === 'Organizational' 
+        ? person.last_name || person.email 
+        : `${person.first_name || ''} ${person.last_name || person.email}`.trim();
 
     if (confirm(`Are you sure you want to remove ${displayName}?`)) {
         items.value.splice(actualIndex, 1);
@@ -129,12 +128,12 @@ const removeAuthor = (index: number) => {
 const updatePerson = (index: number, field: keyof Person, value: any) => {
     const actualIndex = perPage.value * currentPage.value + index;
     const person = items.value[actualIndex];
-
+    
     // Handle name_type change - clear first_name if switching to Organizational
     if (field === 'name_type' && value === 'Organizational') {
         person.first_name = '';
     }
-
+    
     (person as any)[field] = value;
     emit('person-updated', actualIndex, person);
 };
@@ -179,10 +178,7 @@ const perPageOptions = [
 <template>
     <div class="card">
         <!-- Table Controls -->
-        <div
-            v-if="hasMultiplePages"
-            class="flex justify-between items-center px-4 py-2.5 border-b border-gray-200 dark:border-slate-700 bg-gray-50 dark:bg-slate-800/50"
-        >
+        <div v-if="hasMultiplePages" class="flex justify-between items-center px-4 py-2.5 border-b border-gray-200 dark:border-slate-700 bg-gray-50 dark:bg-slate-800/50">
             <div class="flex items-center gap-2">
                 <span class="text-xs text-gray-600 dark:text-gray-400">
                     {{ currentPage * perPage + 1 }}-{{ Math.min((currentPage + 1) * perPage, items.length) }} of {{ items.length }}
@@ -208,18 +204,10 @@ const perPageOptions = [
                         <th scope="col" class="text-left px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300 w-10">#</th>
                         <th class="text-left px-2 py-2 text-[10px] font-semibold text-gray-600 dark:text-gray-300 w-40">Type</th>
                         <th class="text-left px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300 min-w-[120px]">First Name</th>
-                        <th class="text-left px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300 min-w-[160px]">
-                            Last Name / Org
-                        </th>
+                        <th class="text-left px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300 min-w-[160px]">Last Name / Org</th>
                         <th class="text-left px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300 min-w-[140px]">ORCID</th>
                         <th class="text-left px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300 min-w-[160px]">Email</th>
-                        <th
-                            v-if="showContributorTypes"
-                            scope="col"
-                            class="text-left px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300 w-32"
-                        >
-                            Role
-                        </th>
+                        <th v-if="showContributorTypes" scope="col" class="text-left px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300 w-32">Role</th>
                         <th v-if="canDelete" class="w-16 px-2 py-2 text-xs font-semibold text-gray-600 dark:text-gray-300">Actions</th>
                     </tr>
                 </thead>
@@ -235,9 +223,7 @@ const perPageOptions = [
                     handle=".drag-handle"
                 >
                     <template #item="{ index, element }">
-                        <tr
-                            class="border-b border-gray-100 dark:border-slate-800 hover:bg-blue-50 dark:hover:bg-slate-800/70 transition-colors"
-                        >
+                        <tr class="border-b border-gray-100 dark:border-slate-800 hover:bg-blue-50 dark:hover:bg-slate-800/70 transition-colors">
                             <td v-if="canReorder" class="px-2 py-2">
                                 <div class="drag-handle cursor-move text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
                                     <BaseIcon :path="mdiDragVariant" :size="18" />
@@ -248,8 +234,8 @@ const perPageOptions = [
                             <!-- Name Type Selector -->
                             <td class="px-2 py-2">
                                 <div class="flex items-center gap-1.5">
-                                    <BaseIcon
-                                        :path="element.name_type === 'Organizational' ? mdiDomain : mdiAccount"
+                                    <BaseIcon 
+                                        :path="element.name_type === 'Organizational' ? mdiDomain : mdiAccount" 
                                         :size="16"
                                         :class="element.name_type === 'Organizational' ? 'text-purple-500' : 'text-blue-500'"
                                         :title="element.name_type"
@@ -263,10 +249,7 @@ const perPageOptions = [
                                         class="text-[8px] compact-select-mini flex-1"
                                     />
                                 </div>
-                                <div
-                                    class="text-red-500 text-[8px] mt-0.5"
-                                    v-if="errors && Array.isArray(errors[`${relation}.${index}.name_type`])"
-                                >
+                                <div class="text-red-500 text-[8px] mt-0.5" v-if="errors && Array.isArray(errors[`${relation}.${index}.name_type`])">
                                     {{ errors[`${relation}.${index}.name_type`][0] }}
                                 </div>
                             </td>
@@ -283,10 +266,7 @@ const perPageOptions = [
                                     class="text-xs compact-input"
                                 />
                                 <span v-else class="text-gray-400 text-xs italic">—</span>
-                                <div
-                                    class="text-red-500 text-xs mt-0.5"
-                                    v-if="errors && Array.isArray(errors[`${relation}.${index}.first_name`])"
-                                >
+                                <div class="text-red-500 text-xs mt-0.5" v-if="errors && Array.isArray(errors[`${relation}.${index}.first_name`])">
                                     {{ errors[`${relation}.${index}.first_name`][0] }}
                                 </div>
                             </td>
@@ -301,10 +281,7 @@ const perPageOptions = [
                                     :placeholder="element.name_type === 'Organizational' ? 'Organization' : 'Last name'"
                                     class="text-xs compact-input"
                                 />
-                                <div
-                                    class="text-red-500 text-xs mt-0.5"
-                                    v-if="errors && Array.isArray(errors[`${relation}.${index}.last_name`])"
-                                >
+                                <div class="text-red-500 text-xs mt-0.5" v-if="errors && Array.isArray(errors[`${relation}.${index}.last_name`])">
                                     {{ errors[`${relation}.${index}.last_name`][0] }}
                                 </div>
                             </td>
@@ -318,10 +295,7 @@ const perPageOptions = [
                                     placeholder="0000-0000-0000-0000"
                                     class="text-xs compact-input font-mono"
                                 />
-                                <div
-                                    class="text-red-500 text-xs mt-0.5"
-                                    v-if="errors && Array.isArray(errors[`${relation}.${index}.identifier_orcid`])"
-                                >
+                                <div class="text-red-500 text-xs mt-0.5" v-if="errors && Array.isArray(errors[`${relation}.${index}.identifier_orcid`])">
                                     {{ errors[`${relation}.${index}.identifier_orcid`][0] }}
                                 </div>
                             </td>
@@ -336,10 +310,7 @@ const perPageOptions = [
                                     placeholder="email@example.com"
                                     class="text-xs compact-input"
                                 />
-                                <div
-                                    class="text-red-500 text-xs mt-0.5"
-                                    v-if="errors && Array.isArray(errors[`${relation}.${index}.email`])"
-                                >
+                                <div class="text-red-500 text-xs mt-0.5" v-if="errors && Array.isArray(errors[`${relation}.${index}.email`])">
                                     {{ errors[`${relation}.${index}.email`][0] }}
                                 </div>
                             </td>
@@ -364,10 +335,10 @@ const perPageOptions = [
 
                             <!-- Actions -->
                             <td class="px-2 py-2 whitespace-nowrap">
-                                <BaseButton
-                                    color="danger"
-                                    :icon="mdiTrashCan"
-                                    small
+                                <BaseButton 
+                                    color="danger" 
+                                    :icon="mdiTrashCan" 
+                                    small 
                                     @click.prevent="removeAuthor(index)"
                                     class="compact-button"
                                 />
@@ -383,30 +354,29 @@ const perPageOptions = [
                         :key="element.id || index"
                         class="border-b border-gray-100 dark:border-slate-800 hover:bg-blue-50 dark:hover:bg-slate-800/70 transition-colors"
                     >
-                        <td class="px-2 py-2 text-gray-400">
-                            <BaseIcon v-if="canReorder && !hasMultiplePages" :path="mdiDragVariant" :size="18" />
+                        <td   v-if="canReorder" class="px-2 py-2 text-gray-400">
+                            <BaseIcon :path="mdiDragVariant" :size="18" />
                         </td>
                         <td class="px-2 py-2 text-xs text-gray-600 dark:text-gray-400">{{ currentPage * perPage + index + 1 }}</td>
 
                         <!-- Name Type Selector -->
                         <td class="px-2 py-2">
-                            <div class="flex items-center gap-1.5">
-                                <BaseIcon
-                                    :path="element.name_type === 'Organizational' ? mdiDomain : mdiAccount"
-                                    :size="16"
-                                    :class="element.name_type === 'Organizational' ? 'text-purple-500' : 'text-blue-500'"
-                                    :title="element.name_type"
-                                />
-                                <FormControl
-                                    required
-                                    v-model="element.name_type"
-                                    type="select"
-                                    :options="nameTypeOptions"
-                                    :is-read-only="element.status == true"
-                                    class="text-xs compact-select"
-                                    :error="getFieldError(index, 'name_type')"
-                                />
-                            </div>
+                            <BaseIcon 
+                                        :path="element.name_type === 'Organizational' ? mdiDomain : mdiAccount" 
+                                        :size="16"
+                                        :class="element.name_type === 'Organizational' ? 'text-purple-500' : 'text-blue-500'"
+                                        :title="element.name_type"
+                                    />
+                            <FormControl
+                                required
+                                :model-value="element.name_type"                              
+                                @update:model-value="updatePerson(index, 'name_type', $event)"
+                                type="select"
+                                :options="nameTypeOptions"
+                                :is-read-only="element.status || !canEdit"
+                                class="text-xs compact-select"
+                                :error="getFieldError(index, 'name_type')"
+                            />
                             <div v-if="getFieldError(index, 'name_type')" class="text-red-500 text-xs mt-0.5">
                                 {{ getFieldError(index, 'name_type') }}
                             </div>
@@ -489,7 +459,7 @@ const perPageOptions = [
                                 @update:model-value="updatePerson(index, 'pivot_contributor_type', $event)"
                                 type="select"
                                 :options="contributortypes"
-                                :is-read-only="!canEdit"
+                                :is-read-only="element.status || !canEdit"
                                 placeholder="Role"
                                 class="text-xs compact-select"
                                 :error="getFieldError(index, 'pivot_contributor_type')"
@@ -505,7 +475,8 @@ const perPageOptions = [
                                 color="danger"
                                 :icon="mdiTrashCan"
                                 small
-                                @click.prevent="removeAuthor(index)"
+                                @click="removeAuthor(index)"
+                                :disabled="element.status || !canEdit"
                                 title="Remove person"
                                 class="compact-button"
                             />
@@ -571,7 +542,9 @@ const perPageOptions = [
                 />
             </div>
 
-            <span class="text-sm text-gray-600 dark:text-gray-400"> Page {{ currentPageHuman }} of {{ numPages }} </span>
+            <span class="text-sm text-gray-600 dark:text-gray-400">
+                Page {{ currentPageHuman }} of {{ numPages }}
+            </span>
         </div>
     </div>
 </template>
@@ -595,4 +568,4 @@ const perPageOptions = [
         padding: 0.5rem !important;
     }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/resources/js/Pages/Editor/Dataset/Edit.vue b/resources/js/Pages/Editor/Dataset/Edit.vue
index bbaf3c1..9a2385c 100644
--- a/resources/js/Pages/Editor/Dataset/Edit.vue
+++ b/resources/js/Pages/Editor/Dataset/Edit.vue
@@ -13,7 +13,7 @@
             </NotificationBar>
             <FormValidationErrors v-bind:errors="errors" />
 
-            <CardBox>
+            <CardBox :form="true">
                 <!-- <FormValidationErrors v-bind:errors="errors" /> -->
                 <div class="mb-4">
                     <div class="flex flex-col md:flex-row">
diff --git a/resources/js/Pages/Submitter/Dataset/Edit.vue b/resources/js/Pages/Submitter/Dataset/Edit.vue
index 4271e72..027bbc2 100644
--- a/resources/js/Pages/Submitter/Dataset/Edit.vue
+++ b/resources/js/Pages/Submitter/Dataset/Edit.vue
@@ -3,6 +3,7 @@
     <LayoutAuthenticated>
         <Head title="Edit dataset" />
 
+        <!-- Progress Bar for Unsaved Changes -->
         <!-- Progress Bar for Unsaved Changes -->
         <div v-if="hasUnsavedChanges" class="fixed top-0 left-0 right-0 z-50 bg-amber-500 text-white px-4 py-2.5 text-sm shadow-lg h-14">
             <div class="container mx-auto flex items-center justify-between h-full">
@@ -16,7 +17,7 @@
                     </svg>
                     <span class="font-medium">You have unsaved changes</span>
                 </div>
-                <BaseButton @click.prevent="submitAlternative" label="Save Now" color="white" small :disabled="form.processing" />
+                <BaseButton @click="submitAlternative" label="Save Now" color="white" small :disabled="form.processing" />
             </div>
         </div>
 
@@ -46,18 +47,18 @@
                 {{ flash.message }}
             </NotificationBar>
             <FormValidationErrors v-bind:errors="errors" />
-  <UnsavedChangesWarning
+
+            <!-- Main Form with Sections -->
+            <CardBox :form="true" class="shadow-lg">
+                <UnsavedChangesWarning
                     :show="hasUnsavedChanges"
                     :changes-summary="getChangesSummary()"
                     :show-details="true"
                     :show-actions="false"
                     :show-auto-save-progress="true"
                     :auto-save-delay="30"
-                    @save.prevent="submitAlternative"
+                    @save="submitAlternative"
                 />
-            <!-- Main Form with Sections -->
-            <CardBox class="shadow-lg">
-              
                 <!-- Collapsible Sections for Better Organization -->
 
                 <!-- Section 1: Basic Information -->
@@ -419,7 +420,7 @@
                             title="Creators"
                             :icon="mdiBookOpenPageVariant"
                             :header-icon="mdiPlusCircle"
-                             v-on:header-icon-click="addNewAuthor()"
+                            @header-icon-click="addNewAuthor()"
                         >
                             <div
                                 class="mb-4 p-3 bg-blue-50 dark:bg-slate-800 rounded-lg text-sm text-blue-800 dark:text-blue-300 flex items-start gap-2"
@@ -474,7 +475,7 @@
                             title="Contributors"
                             :icon="mdiBookOpenPageVariant"
                             :header-icon="mdiPlusCircle"
-                             v-on:header-icon-click="addNewContributor()"
+                            @header-icon-click="addNewContributor()"
                         >
                             <div class="mb-2 text-gray-600 text-sm flex items-center gap-2">
                                 <span>Add contributors by searching existing persons or manually adding new ones.</span>
@@ -933,7 +934,6 @@ import FileUploadComponent from '@/Components/FileUpload.vue';
 import { MapOptions } from '@/Components/Map/MapOptions';
 import { LatLngBoundsExpression } from 'leaflet';
 import { LayerOptions } from '@/Components/Map/LayerOptions';
-import BaseIcon from '@/Components/BaseIcon.vue';
 import {
     mdiImageText,
     mdiArrowLeftBoldOutline,