diff --git a/boranga/components/conservation_status/admin.py b/boranga/components/conservation_status/admin.py
index 1948eac5..19e7197a 100644
--- a/boranga/components/conservation_status/admin.py
+++ b/boranga/components/conservation_status/admin.py
@@ -49,6 +49,12 @@ class CommonwealthConservationListAdmin(ArchivableModelAdminMixin, AbstractListA
     pass
 
 
+class OtherConservationAssessmentListAdmin(
+    ArchivableModelAdminMixin, AbstractListAdmin
+):
+    pass
+
+
 class ConservationChangeCodeAdmin(ArchivableModelAdminMixin, DeleteProtectedModelAdmin):
     list_display = ["code", "label"]
 
@@ -61,4 +67,7 @@ class ConservationChangeCodeAdmin(ArchivableModelAdminMixin, DeleteProtectedMode
 admin.site.register(
     models.CommonwealthConservationList, CommonwealthConservationListAdmin
 )
+admin.site.register(
+    models.OtherConservationAssessmentList, OtherConservationAssessmentListAdmin
+)
 admin.site.register(models.ConservationChangeCode, ConservationChangeCodeAdmin)
diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index f9ac59d3..8c87b6bd 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -36,6 +36,7 @@
     ConservationStatusUserAction,
     CSExternalRefereeInvite,
     IUCNVersion,
+    OtherConservationAssessmentList,
     ProposalAmendmentReason,
     WALegislativeCategory,
     WALegislativeList,
@@ -176,6 +177,9 @@ def get(self, request, format=None):
             "commonwealth_conservation_categories": CommonwealthConservationList.get_lists_dict(
                 group_type, active_only=True
             ),
+            "other_conservation_assessments": OtherConservationAssessmentList.get_lists_dict(
+                group_type, active_only=True
+            ),
             "change_codes": ConservationChangeCode.get_filter_list(),
             "active_change_codes": ConservationChangeCode.get_active_filter_list(),
             "submitter_categories": SubmitterCategory.get_filter_list(),
@@ -2012,6 +2016,9 @@ def filter_list(self, request, *args, **kwargs):
             "commonwealth_conservation_categories": CommonwealthConservationList.get_lists_dict(
                 group_type
             ),
+            "other_conservation_assessments": OtherConservationAssessmentList.get_lists_dict(
+                group_type
+            ),
             "processing_status_list": processing_status_list,
         }
         res_json = json.dumps(res_json)
diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index c67e27b0..02716e7e 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -326,6 +326,14 @@ class Meta:
         verbose_name = "Commonwealth Conservation Category"
 
 
+class OtherConservationAssessmentList(AbstractConservationList):
+
+    class Meta:
+        ordering = ["code"]
+        app_label = "boranga"
+        verbose_name = "Other Conservation Assessment"
+
+
 class ConservationChangeCode(ArchivableModel):
     """
     When the conservation status of a species/community is changed, it can be for a number of reasons.
@@ -577,8 +585,11 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         # Leave the following as _list otherwise django has remove the field and create a new one
         related_name="curr_commonwealth_conservation_list",
     )
-    other_conservation_assessment = models.CharField(
-        max_length=100, blank=True, null=True
+    other_conservation_assessment = models.ForeignKey(
+        OtherConservationAssessmentList,
+        on_delete=models.PROTECT,
+        blank=True,
+        null=True,
     )
     conservation_criteria = models.CharField(max_length=100, blank=True, null=True)
     cam_mou = models.BooleanField(null=True, blank=True)
@@ -600,7 +611,7 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         null=True,
     )
 
-    comment = models.CharField(max_length=512, blank=True, null=True)
+    comment = models.TextField(blank=True, null=True)
     review_due_date = models.DateField(null=True, blank=True)
     effective_from = models.DateField(null=True, blank=True)
     effective_to = models.DateField(null=True, blank=True)
diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index ca1cf060..d5911221 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -539,6 +539,7 @@ class BaseConservationStatusSerializer(serializers.ModelSerializer):
     commonwealth_conservation_category = serializers.SerializerMethodField(
         read_only=True
     )
+    other_conservation_assessment = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = ConservationStatus
@@ -562,6 +563,7 @@ class Meta:
             "wa_priority_category",
             "commonwealth_conservation_category_id",
             "commonwealth_conservation_category",
+            "other_conservation_assessment_id",
             "other_conservation_assessment",
             "conservation_criteria",
             "comment",
@@ -643,6 +645,18 @@ def get_commonwealth_conservation_category(self, obj):
 
         return obj.commonwealth_conservation_category.code
 
+    def get_other_conservation_assessment(self, obj):
+        if not obj.other_conservation_assessment:
+            return None
+
+        if (
+            obj.other_conservation_assessment.code
+            and obj.other_conservation_assessment.label
+        ):
+            return f"{obj.other_conservation_assessment.code} - {obj.other_conservation_assessment.label}"
+
+        return obj.other_conservation_assessment.code
+
     def get_readonly(self, obj):
         return False
 
@@ -788,6 +802,7 @@ class Meta:
             "wa_priority_category_id",
             "commonwealth_conservation_category_id",
             "other_conservation_assessment",
+            "other_conservation_assessment_id",
             "conservation_criteria",
         ]
 
@@ -853,6 +868,7 @@ class Meta:
             "wa_priority_category",
             "commonwealth_conservation_category_id",
             "commonwealth_conservation_category",
+            "other_conservation_assessment_id",
             "other_conservation_assessment",
             "conservation_criteria",
             "comment",
@@ -1092,6 +1108,9 @@ class SaveSpeciesConservationStatusSerializer(BaseConservationStatusSerializer):
     commonwealth_conservation_category_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
+    other_conservation_assessment_id = serializers.IntegerField(
+        required=False, allow_null=True, write_only=True
+    )
     change_code_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
@@ -1113,7 +1132,7 @@ class Meta:
             "wa_priority_list_id",
             "wa_priority_category_id",
             "commonwealth_conservation_category_id",
-            "other_conservation_assessment",
+            "other_conservation_assessment_id",
             "conservation_criteria",
             "comment",
             "lodgement_date",
@@ -1251,6 +1270,9 @@ class SaveCommunityConservationStatusSerializer(BaseConservationStatusSerializer
     commonwealth_conservation_category_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
+    other_conservation_assessment_id = serializers.IntegerField(
+        required=False, allow_null=True, write_only=True
+    )
     change_code_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
@@ -1267,7 +1289,7 @@ class Meta:
             "wa_priority_list_id",
             "wa_priority_category_id",
             "commonwealth_conservation_category_id",
-            "other_conservation_assessment",
+            "other_conservation_assessment_id",
             "conservation_criteria",
             "comment",
             "lodgement_date",
diff --git a/boranga/components/species_and_communities/models.py b/boranga/components/species_and_communities/models.py
index 4710e32c..97fc88ad 100644
--- a/boranga/components/species_and_communities/models.py
+++ b/boranga/components/species_and_communities/models.py
@@ -421,7 +421,7 @@ class Species(RevisionedMixin):
     districts = models.ManyToManyField(
         District, blank=True, related_name="species_districts"
     )
-    last_data_curration_date = models.DateField(blank=True, null=True)
+    last_data_curation_date = models.DateField(blank=True, null=True)
     conservation_plan_exists = models.BooleanField(default=False)
     conservation_plan_reference = models.CharField(
         max_length=500, null=True, blank=True
@@ -1230,7 +1230,7 @@ class Community(RevisionedMixin):
     districts = models.ManyToManyField(
         District, blank=True, related_name="community_districts"
     )
-    last_data_curration_date = models.DateField(blank=True, null=True)
+    last_data_curation_date = models.DateField(blank=True, null=True)
     conservation_plan_exists = models.BooleanField(default=False)
     conservation_plan_reference = models.CharField(
         max_length=500, null=True, blank=True
diff --git a/boranga/components/species_and_communities/serializers.py b/boranga/components/species_and_communities/serializers.py
index 6e77d6d0..5e36d4c2 100755
--- a/boranga/components/species_and_communities/serializers.py
+++ b/boranga/components/species_and_communities/serializers.py
@@ -674,7 +674,7 @@ class Meta:
             "distribution",
             "regions",
             "districts",
-            "last_data_curration_date",
+            "last_data_curation_date",
             "image_doc",
             "processing_status",
             "applicant",
@@ -838,7 +838,7 @@ class Meta:
             "publishing_status",
             "regions",
             "districts",
-            "last_data_curration_date",
+            "last_data_curation_date",
             "image_doc",
             "processing_status",
             "readonly",
@@ -1114,7 +1114,7 @@ class Meta:
             "distribution",
             "publishing_status",
             "conservation_attributes",
-            "last_data_curration_date",
+            "last_data_curation_date",
             "image_doc",
             "processing_status",
             "lodgement_date",
@@ -1294,7 +1294,7 @@ class Meta:
             "distribution",
             "publishing_status",
             "conservation_attributes",
-            "last_data_curration_date",
+            "last_data_curation_date",
             "image_doc",
             "processing_status",
             "lodgement_date",
@@ -1377,7 +1377,7 @@ class Meta:
             "id",
             "group_type",
             "taxonomy_id",
-            "last_data_curration_date",
+            "last_data_curation_date",
             "submitter",
             "readonly",
             "can_user_edit",
@@ -1424,7 +1424,7 @@ class Meta:
         fields = (
             "id",
             "group_type",
-            "last_data_curration_date",
+            "last_data_curation_date",
             "submitter",
             "readonly",
             "can_user_edit",
diff --git a/boranga/frontend/boranga/package.json b/boranga/frontend/boranga/package.json
index f706c28a..44217583 100644
--- a/boranga/frontend/boranga/package.json
+++ b/boranga/frontend/boranga/package.json
@@ -8,8 +8,7 @@
     "scripts": {
         "lint": "eslint -c eslint.config.mjs .",
         "dev": "vite",
-        "build": "vite build",
-        "serve": "vite preview"
+        "build": "vite build"
     },
     "dependencies": {
         "@fortawesome/fontawesome-free": "^6.0",
diff --git a/boranga/frontend/boranga/src/components/common/component_map.vue b/boranga/frontend/boranga/src/components/common/component_map.vue
index d991c2a5..0ae00193 100644
--- a/boranga/frontend/boranga/src/components/common/component_map.vue
+++ b/boranga/frontend/boranga/src/components/common/component_map.vue
@@ -66,24 +66,21 @@
                 </div>
                 <div v-show="map" class="optional-layers-wrapper">
                     <div style="position: relative">
-                        <transition>
-                            <div
-                                v-show="hover"
-                                class="optional-layers-button-wrapper"
-                                :title="`There are ${optionalLayers.length} optional layers available}`"
-                            >
-                                <!-- :class="
+                        <div
+                            class="optional-layers-button-wrapper"
+                            :title="`There are ${optionalLayers.length} optional layers available}`"
+                        >
+                            <!-- :class="
                                     optionalLayers.length ? '' : 'disabled'
                                 " -->
-                                <div
-                                    class="optional-layers-button btn"
-                                    :class="isEditingALayer ? 'btn-danger' : ''"
-                                    @mouseover="hover = true"
-                                >
-                                    <img src="../../assets/layers.svg" />
-                                </div>
+                            <div
+                                class="optional-layers-button btn"
+                                :class="isEditingALayer ? 'btn-danger' : ''"
+                                @mouseover="hover = true"
+                            >
+                                <img src="../../assets/layers.svg" />
                             </div>
-                        </transition>
+                        </div>
                         <transition>
                             <div
                                 v-show="hover"
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index 0e5725e4..923a13dd 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -634,6 +634,29 @@
                             </template>
                         </div>
                     </div>
+                    <div class="row mb-3">
+                        <label
+                            for="proposed_conservation_criteria"
+                            class="col-sm-5 col-form-label"
+                            >Conservation Criteria:</label
+                        >
+                        <div class="col-sm-7">
+                            <input
+                                id="proposed_conservation_criteria"
+                                v-model="
+                                    conservation_status_obj.conservation_criteria
+                                "
+                                :disabled="isReadOnly"
+                                type="text"
+                                class="form-control"
+                                :placeholder="
+                                    isReadOnly
+                                        ? 'N/A'
+                                        : 'Enter Conservation Criteria if Applicable'
+                                "
+                            />
+                        </div>
+                    </div>
                     <div class="row mb-3">
                         <label
                             for="proposed_wa_priority_list"
@@ -857,46 +880,72 @@
                         <label
                             for="proposed_other_conservation_assessment"
                             class="col-sm-5 col-form-label"
-                            >Other Conservation Assessment:</label
+                            >Other Conservation Criteria:</label
                         >
                         <div class="col-sm-7">
-                            <input
-                                id="proposed_other_conservation_assessment"
-                                v-model="
-                                    conservation_status_obj.other_conservation_assessment
-                                "
-                                :disabled="isReadOnly"
-                                type="text"
-                                class="form-control"
-                                :placeholder="
-                                    isReadOnly
-                                        ? 'N/A'
-                                        : 'Enter Other Conservation Assessment Details if Applicable'
-                                "
-                            />
-                        </div>
-                    </div>
-                    <div class="row mb-3">
-                        <label
-                            for="proposed_conservation_criteria"
-                            class="col-sm-5 col-form-label"
-                            >Conservation Criteria:</label
-                        >
-                        <div class="col-sm-7">
-                            <input
-                                id="proposed_conservation_criteria"
-                                v-model="
-                                    conservation_status_obj.conservation_criteria
-                                "
-                                :disabled="isReadOnly"
-                                type="text"
-                                class="form-control"
-                                :placeholder="
-                                    isReadOnly
-                                        ? 'N/A'
-                                        : 'Enter Conservation Criteria if Applicable'
-                                "
-                            />
+                            <template v-if="!isReadOnly">
+                                <template
+                                    v-if="
+                                        other_conservation_assessments &&
+                                        other_conservation_assessments.length >
+                                            0 &&
+                                        conservation_status_obj.other_conservation_assessment_id &&
+                                        !other_conservation_assessments
+                                            .map((d) => d.id)
+                                            .includes(
+                                                conservation_status_obj.other_conservation_assessment_id
+                                            )
+                                    "
+                                >
+                                    <input
+                                        v-if="
+                                            conservation_status_obj.other_conservation_assessment
+                                        "
+                                        type="text"
+                                        class="form-control mb-3"
+                                        :value="
+                                            conservation_status_obj.other_conservation_assessment +
+                                            ' (Now Archived)'
+                                        "
+                                        disabled
+                                    />
+                                    <div class="mb-3 text-muted">
+                                        Change other conservation assessment to:
+                                    </div>
+                                </template>
+                                <select
+                                    id="proposed_other_conservation_assessment"
+                                    v-model="
+                                        conservation_status_obj.other_conservation_assessment_id
+                                    "
+                                    :disabled="isReadOnly"
+                                    class="form-select"
+                                >
+                                    <option :value="null" disabled>
+                                        Select the appropriate Other
+                                        Conservation Assessment
+                                    </option>
+                                    <option
+                                        v-for="option in other_conservation_assessments"
+                                        :key="option.id"
+                                        :value="option.id"
+                                    >
+                                        {{ option.code }} - {{ option.label }}
+                                    </option>
+                                </select>
+                            </template>
+                            <template v-else>
+                                <input
+                                    class="form-control"
+                                    type="text"
+                                    :disabled="true"
+                                    :value="
+                                        conservation_status_obj.other_conservation_assessment
+                                            ? conservation_status_obj.other_conservation_assessment
+                                            : 'N/A'
+                                    "
+                                />
+                            </template>
                         </div>
                     </div>
                     <div class="row mb-3">
@@ -1104,6 +1153,32 @@
                             </select>
                         </div>
                     </div>
+                    <div
+                        v-if="
+                            conservation_status_obj.current_conservation_status
+                                .conservation_criteria
+                        "
+                        class="row mb-3"
+                    >
+                        <label
+                            for="current_conservation_criteria"
+                            class="col-sm-5 col-form-label"
+                            >Conservation Criteria:</label
+                        >
+                        <div class="col-sm-7">
+                            <input
+                                id="current_conservation_criteria"
+                                v-model="
+                                    conservation_status_obj
+                                        .current_conservation_status
+                                        .conservation_criteria
+                                "
+                                :disabled="true"
+                                type="text"
+                                class="form-control"
+                            />
+                        </div>
+                    </div>
                     <div
                         v-if="
                             conservation_status_obj.current_conservation_status
@@ -1230,32 +1305,6 @@
                             />
                         </div>
                     </div>
-                    <div
-                        v-if="
-                            conservation_status_obj.current_conservation_status
-                                .conservation_criteria
-                        "
-                        class="row mb-3"
-                    >
-                        <label
-                            for="current_conservation_criteria"
-                            class="col-sm-5 col-form-label"
-                            >Conservation Criteria:</label
-                        >
-                        <div class="col-sm-7">
-                            <input
-                                id="current_conservation_criteria"
-                                v-model="
-                                    conservation_status_obj
-                                        .current_conservation_status
-                                        .conservation_criteria
-                                "
-                                :disabled="true"
-                                type="text"
-                                class="form-control"
-                            />
-                        </div>
-                    </div>
                     <div
                         v-if="
                             conservation_status_obj.current_conservation_status
@@ -1615,20 +1664,6 @@ export default {
 
             return true;
         },
-        conservation_criteria_label: function () {
-            if (
-                this.conservation_status_obj.processing_status == 'Approved' ||
-                this.conservation_status_obj.processing_status == 'DeListed'
-            ) {
-                return 'Conservation Criteria';
-            } else {
-                if (this.conservation_status_obj.processing_status == 'Draft') {
-                    return 'Propose Conservation Criteria';
-                } else {
-                    return 'Proposed Conservation Criteria';
-                }
-            }
-        },
         conservation_list_proposed: function () {
             return ![
                 'Approved',
@@ -1699,6 +1734,8 @@ export default {
                     vm.cs_profile_dict.wa_priority_categories;
                 vm.commonwealth_conservation_categories =
                     vm.cs_profile_dict.commonwealth_conservation_categories;
+                vm.other_conservation_assessments =
+                    vm.cs_profile_dict.other_conservation_assessments;
                 vm.change_codes = vm.cs_profile_dict.active_change_codes;
                 this.getCommunityDisplay();
                 this.filterWALegislativeCategories();
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index 1f18ff67..b549674a 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -653,6 +653,29 @@
                             </template>
                         </div>
                     </div>
+                    <div class="row mb-3">
+                        <label
+                            for="proposed_conservation_criteria"
+                            class="col-sm-5 col-form-label"
+                            >Conservation Criteria:</label
+                        >
+                        <div class="col-sm-7">
+                            <input
+                                id="proposed_conservation_criteria"
+                                v-model="
+                                    conservation_status_obj.conservation_criteria
+                                "
+                                :disabled="isReadOnly"
+                                type="text"
+                                class="form-control"
+                                :placeholder="
+                                    isReadOnly
+                                        ? 'N/A'
+                                        : 'Enter Conservation Criteria if Applicable'
+                                "
+                            />
+                        </div>
+                    </div>
                     <div class="row mb-3">
                         <label
                             for="proposed_wa_priority_list"
@@ -876,46 +899,72 @@
                         <label
                             for="proposed_other_conservation_assessment"
                             class="col-sm-5 col-form-label"
-                            >Other Conservation Assessment:</label
+                            >Other Conservation Criteria:</label
                         >
                         <div class="col-sm-7">
-                            <input
-                                id="proposed_other_conservation_assessment"
-                                v-model="
-                                    conservation_status_obj.other_conservation_assessment
-                                "
-                                :disabled="isReadOnly"
-                                type="text"
-                                class="form-control"
-                                :placeholder="
-                                    isReadOnly
-                                        ? 'N/A'
-                                        : 'Enter Other Conservation Assessment Details if Applicable'
-                                "
-                            />
-                        </div>
-                    </div>
-                    <div class="row mb-3">
-                        <label
-                            for="proposed_conservation_criteria"
-                            class="col-sm-5 col-form-label"
-                            >Conservation Criteria:</label
-                        >
-                        <div class="col-sm-7">
-                            <input
-                                id="proposed_conservation_criteria"
-                                v-model="
-                                    conservation_status_obj.conservation_criteria
-                                "
-                                :disabled="isReadOnly"
-                                type="text"
-                                class="form-control"
-                                :placeholder="
-                                    isReadOnly
-                                        ? 'N/A'
-                                        : 'Enter Conservation Criteria if Applicable'
-                                "
-                            />
+                            <template v-if="!isReadOnly">
+                                <template
+                                    v-if="
+                                        other_conservation_assessments &&
+                                        other_conservation_assessments.length >
+                                            0 &&
+                                        conservation_status_obj.other_conservation_assessment_id &&
+                                        !other_conservation_assessments
+                                            .map((d) => d.id)
+                                            .includes(
+                                                conservation_status_obj.other_conservation_assessment_id
+                                            )
+                                    "
+                                >
+                                    <input
+                                        v-if="
+                                            conservation_status_obj.other_conservation_assessment
+                                        "
+                                        type="text"
+                                        class="form-control mb-3"
+                                        :value="
+                                            conservation_status_obj.other_conservation_assessment +
+                                            ' (Now Archived)'
+                                        "
+                                        disabled
+                                    />
+                                    <div class="mb-3 text-muted">
+                                        Change other conservation assessment to:
+                                    </div>
+                                </template>
+                                <select
+                                    id="proposed_other_conservation_assessment"
+                                    v-model="
+                                        conservation_status_obj.other_conservation_assessment_id
+                                    "
+                                    :disabled="isReadOnly"
+                                    class="form-select"
+                                >
+                                    <option :value="null" disabled>
+                                        Select the appropriate Other
+                                        Conservation Assessment
+                                    </option>
+                                    <option
+                                        v-for="option in other_conservation_assessments"
+                                        :key="option.id"
+                                        :value="option.id"
+                                    >
+                                        {{ option.code }} - {{ option.label }}
+                                    </option>
+                                </select>
+                            </template>
+                            <template v-else>
+                                <input
+                                    class="form-control"
+                                    type="text"
+                                    :disabled="true"
+                                    :value="
+                                        conservation_status_obj.other_conservation_assessment
+                                            ? conservation_status_obj.other_conservation_assessment
+                                            : 'N/A'
+                                    "
+                                />
+                            </template>
                         </div>
                     </div>
                     <div class="row mb-3">
@@ -1123,6 +1172,32 @@
                             </select>
                         </div>
                     </div>
+                    <div
+                        v-if="
+                            conservation_status_obj.current_conservation_status
+                                .conservation_criteria
+                        "
+                        class="row mb-3"
+                    >
+                        <label
+                            for="current_conservation_criteria"
+                            class="col-sm-5 col-form-label"
+                            >Conservation Criteria:</label
+                        >
+                        <div class="col-sm-7">
+                            <input
+                                id="current_conservation_criteria"
+                                v-model="
+                                    conservation_status_obj
+                                        .current_conservation_status
+                                        .conservation_criteria
+                                "
+                                :disabled="true"
+                                type="text"
+                                class="form-control"
+                            />
+                        </div>
+                    </div>
                     <div
                         v-if="
                             conservation_status_obj.current_conservation_status
@@ -1249,32 +1324,6 @@
                             />
                         </div>
                     </div>
-                    <div
-                        v-if="
-                            conservation_status_obj.current_conservation_status
-                                .conservation_criteria
-                        "
-                        class="row mb-3"
-                    >
-                        <label
-                            for="current_conservation_criteria"
-                            class="col-sm-5 col-form-label"
-                            >Conservation Criteria:</label
-                        >
-                        <div class="col-sm-7">
-                            <input
-                                id="current_conservation_criteria"
-                                v-model="
-                                    conservation_status_obj
-                                        .current_conservation_status
-                                        .conservation_criteria
-                                "
-                                :disabled="true"
-                                type="text"
-                                class="form-control"
-                            />
-                        </div>
-                    </div>
                     <div
                         v-if="
                             conservation_status_obj.current_conservation_status
@@ -1728,6 +1777,8 @@ export default {
                     vm.cs_profile_dict.wa_priority_categories;
                 vm.commonwealth_conservation_categories =
                     vm.cs_profile_dict.commonwealth_conservation_categories;
+                vm.other_conservation_assessments =
+                    vm.cs_profile_dict.other_conservation_assessments;
                 vm.change_codes = vm.cs_profile_dict.active_change_codes;
                 this.getSpeciesDisplay();
                 this.filterWALegislativeCategories();
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/occurrence_report_profile.vue b/boranga/frontend/boranga/src/components/common/occurrence/occurrence_report_profile.vue
index ae4a0e87..f908ca74 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/occurrence_report_profile.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/occurrence_report_profile.vue
@@ -459,9 +459,6 @@ export default {
         });
     },
     methods: {
-        test: function () {
-            console.log('test');
-        },
         initialiseScientificNameLookup: function () {
             let vm = this;
             $(vm.$refs[vm.scientific_name_lookup])
@@ -652,11 +649,8 @@ export default {
             this.$emit('refreshOccurrenceReport');
         },
         saveOccurrenceReport: function (e) {
-            console.log(e.target.id);
-            if (
-                e.target.id != 'select_scientific_name' &&
-                e.target.id != 'select_community_name'
-            ) {
+            // For the select2 we emit after the select/unselect event as otherwise the value is not yet updated
+            if (!e.target.className.includes('select2-')) {
                 this.$emit('saveOccurrenceReport');
             }
         },
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/community_profile.vue b/boranga/frontend/boranga/src/components/common/species_communities/community_profile.vue
index afa6dea5..d6e8d34c 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/community_profile.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/community_profile.vue
@@ -1,607 +1,640 @@
 <template lang="html">
     <div id="community">
-        <FormSection :form-collapse="false" label="Taxonomy" Index="taxonomy">
-            <div class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 control-label"
-                    :class="isReadOnly ? '' : 'fw-bold'"
-                    >Community Name:
-                    <span v-if="!isReadOnly" class="text-danger">*</span></label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="community_name"
-                        v-model="
-                            species_community.taxonomy_details.community_name
-                        "
-                        :disabled="isReadOnly"
-                        class="form-control"
-                        rows="1"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div v-if="species_community.renamed_from" class="row mb-3">
-                <label for="" class="col-sm-3 control-label"
-                    >Renamed From:</label
-                >
-                <div class="col-sm-7">
-                    <textarea
-                        id="renamed_from"
-                        :disabled="true"
-                        class="form-control"
-                        rows="1"
-                        placeholder=""
-                        :value="`${species_community.renamed_from.community_number} - ${species_community.renamed_from.community_name}`"
-                    />
+        <fieldset id="species-profile-fieldset" @change="saveSpeciesCommunity">
+            <FormSection
+                :form-collapse="false"
+                label="Taxonomy"
+                Index="taxonomy"
+            >
+                <div class="row mb-3">
+                    <label
+                        for=""
+                        class="col-sm-3 control-label"
+                        :class="isReadOnly ? '' : 'fw-bold'"
+                        >Community Name:
+                        <span v-if="!isReadOnly" class="text-danger"
+                            >*</span
+                        ></label
+                    >
+                    <div class="col-sm-9">
+                        <textarea
+                            id="community_name"
+                            v-model="
+                                species_community.taxonomy_details
+                                    .community_name
+                            "
+                            :disabled="isReadOnly"
+                            class="form-control"
+                            rows="1"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-                <div class="col-sm-2">
-                    <a
-                        class="btn btn-primary"
-                        role="button"
-                        target="_blank"
-                        :href="`/internal/species-communities/${species_community.renamed_from.id}?group_type_name=${species_community.group_type}`"
+                <div v-if="species_community.renamed_from" class="row mb-3">
+                    <label for="" class="col-sm-3 control-label"
+                        >Renamed From:</label
                     >
-                        <i class="bi bi-box-arrow-up-right"></i>
-                        {{ species_community.renamed_from.community_number }}
-                    </a>
+                    <div class="col-sm-7">
+                        <textarea
+                            id="renamed_from"
+                            :disabled="true"
+                            class="form-control"
+                            rows="1"
+                            placeholder=""
+                            :value="`${species_community.renamed_from.community_number} - ${species_community.renamed_from.community_name}`"
+                        />
+                    </div>
+                    <div class="col-sm-2">
+                        <a
+                            class="btn btn-primary"
+                            role="button"
+                            target="_blank"
+                            :href="`/internal/species-communities/${species_community.renamed_from.id}?group_type_name=${species_community.group_type}`"
+                        >
+                            <i class="bi bi-box-arrow-up-right"></i>
+                            {{
+                                species_community.renamed_from.community_number
+                            }}
+                        </a>
+                    </div>
                 </div>
-            </div>
-            <div class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 control-label"
-                    :class="isReadOnly ? '' : 'fw-bold'"
-                    >Community ID:
-                    <span v-if="!isReadOnly" class="text-danger">*</span></label
-                >
-                <div class="col-sm-9">
-                    <input
-                        id="community_migrated_id"
-                        v-model="
-                            species_community.taxonomy_details
-                                .community_migrated_id
-                        "
-                        :disabled="isReadOnly"
-                        type="text"
-                        class="form-control"
-                        placeholder=""
-                    />
+                <div class="row mb-3">
+                    <label
+                        for=""
+                        class="col-sm-3 control-label"
+                        :class="isReadOnly ? '' : 'fw-bold'"
+                        >Community ID:
+                        <span v-if="!isReadOnly" class="text-danger"
+                            >*</span
+                        ></label
+                    >
+                    <div class="col-sm-9">
+                        <input
+                            id="community_migrated_id"
+                            v-model="
+                                species_community.taxonomy_details
+                                    .community_migrated_id
+                            "
+                            :disabled="isReadOnly"
+                            type="text"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <div
-                v-if="
-                    showField(
-                        species_community.taxonomy_details.community_description
-                    )
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-3 control-label"
-                    >Community Description:</label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="community_description"
-                        v-model="
+                <div
+                    v-if="
+                        showField(
                             species_community.taxonomy_details
                                 .community_description
-                        "
-                        :disabled="isReadOnly"
-                        class="form-control"
-                        rows="2"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div
-                v-if="
-                    showField(species_community.taxonomy_details.previous_name)
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-3 control-label"
-                    >Previous Name:</label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="community_previous_name"
-                        v-model="
-                            species_community.taxonomy_details.previous_name
-                        "
-                        :disabled="isReadOnly"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div
-                v-if="
-                    showField(species_community.taxonomy_details.name_authority)
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-3 control-label"
-                    >Name Authority:</label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="name_authority"
-                        v-model="
-                            species_community.taxonomy_details.name_authority
-                        "
-                        :disabled="isReadOnly"
-                        rows="1"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div
-                v-if="
-                    showField(species_community.taxonomy_details.name_comments)
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-3 control-label"
-                    >Name Comments:</label
+                        )
+                    "
+                    class="row mb-3"
                 >
-                <div class="col-sm-9">
-                    <textarea
-                        id="community_comment"
-                        v-model="
-                            species_community.taxonomy_details.name_comments
-                        "
-                        :disabled="isReadOnly"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-        </FormSection>
-        <FormSection
-            v-if="distribution_public || is_internal"
-            :form-collapse="false"
-            label="Distribution"
-            Index="distribution"
-        >
-            <div class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 control-label"
-                    :class="isReadOnly ? '' : 'fw-bold'"
-                    >Distribution:
-                    <span v-if="!isReadOnly" class="text-danger">*</span></label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="distribution"
-                        v-model="species_community.distribution.distribution"
-                        :disabled="isReadOnly"
-                        class="form-control"
-                        rows="1"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 control-label"
-                    :class="isReadOnly ? '' : 'fw-bold'"
-                    >Region:
-                    <span v-if="!isReadOnly" class="text-danger">*</span></label
-                >
-                <div class="col-sm-9">
-                    <select
-                        ref="regions_select"
-                        v-model="species_community.regions"
-                        :disabled="isReadOnly"
-                        class="form-select"
+                    <label for="" class="col-sm-3 control-label"
+                        >Community Description:</label
                     >
-                        <option value="" selected disabled>
-                            Select region
-                        </option>
-                        <option
-                            v-for="option in region_list"
-                            :key="option.value"
-                            :value="option.value"
-                        >
-                            {{ option.text }}
-                        </option>
-                    </select>
+                    <div class="col-sm-9">
+                        <textarea
+                            id="community_description"
+                            v-model="
+                                species_community.taxonomy_details
+                                    .community_description
+                            "
+                            :disabled="isReadOnly"
+                            class="form-control"
+                            rows="2"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <div v-if="species_community.regions" class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 col-form-label"
-                    :class="isReadOnly ? '' : 'fw-bold'"
-                    >District:
-                    <span v-if="!isReadOnly" class="text-danger">*</span></label
+                <div
+                    v-if="
+                        showField(
+                            species_community.taxonomy_details.previous_name
+                        )
+                    "
+                    class="row mb-3"
                 >
-                <div class="col-sm-9">
-                    <select
-                        ref="districts_select"
-                        v-model="species_community.districts"
-                        :disabled="isReadOnly"
-                        class="form-select"
-                    >
-                        <option value="" selected disabled>
-                            Select district
-                        </option>
-                        <option
-                            v-for="option in district_list"
-                            :key="option.value"
-                            :value="option.value"
-                        >
-                            {{ option.text }}
-                        </option>
-                    </select>
-                </div>
-            </div>
-            <template v-if="show_calculated_distribution_fields">
-                <div class="row mb-3 border-top pt-3">
-                    <label for="" class="col-sm-5 col-form-label"
-                        >Number of Occurrences:</label
+                    <label for="" class="col-sm-3 control-label"
+                        >Previous Name:</label
                     >
-                    <div class="col-sm-4">
-                        <input
-                            v-if="species_community.distribution.noo_auto"
-                            id="no_of_occurrences"
-                            v-model="species_community.occurrence_count"
-                            :disabled="isNOOReadOnly"
-                            type="number"
+                    <div class="col-sm-9">
+                        <textarea
+                            id="community_previous_name"
+                            v-model="
+                                species_community.taxonomy_details.previous_name
+                            "
+                            :disabled="isReadOnly"
                             class="form-control"
                             placeholder=""
                         />
-                        <input
-                            v-else
-                            id="no_of_occurrences"
-                            ref="number_of_occurrences"
+                    </div>
+                </div>
+                <div
+                    v-if="
+                        showField(
+                            species_community.taxonomy_details.name_authority
+                        )
+                    "
+                    class="row mb-3"
+                >
+                    <label for="" class="col-sm-3 control-label"
+                        >Name Authority:</label
+                    >
+                    <div class="col-sm-9">
+                        <textarea
+                            id="name_authority"
                             v-model="
-                                species_community.distribution
-                                    .number_of_occurrences
+                                species_community.taxonomy_details
+                                    .name_authority
                             "
-                            :disabled="isNOOReadOnly"
-                            type="number"
+                            :disabled="isReadOnly"
+                            rows="1"
                             class="form-control"
                             placeholder=""
                         />
                     </div>
-                    <div
-                        v-if="!isReadOnly"
-                        class="col-sm-3 d-flex align-items-center"
+                </div>
+                <div
+                    v-if="
+                        showField(
+                            species_community.taxonomy_details.name_comments
+                        )
+                    "
+                    class="row mb-3"
+                >
+                    <label for="" class="col-sm-3 control-label"
+                        >Name Comments:</label
                     >
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="noo_auto"
-                                v-model="
-                                    species_community.distribution.noo_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="true"
-                                class="form-check-input"
-                                @click="switchNOO('true')"
-                            />
-                            <label class="form-check-label">auto</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="noo_manual"
-                                v-model="
-                                    species_community.distribution.noo_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="false"
-                                class="form-check-input"
-                                @click="switchNOO('false')"
-                            />
-                            <label class="form-check-label">manual</label>
-                        </div>
+                    <div class="col-sm-9">
+                        <textarea
+                            id="community_comment"
+                            v-model="
+                                species_community.taxonomy_details.name_comments
+                            "
+                            :disabled="isReadOnly"
+                            class="form-control"
+                            placeholder=""
+                        />
                     </div>
                 </div>
+            </FormSection>
+            <FormSection
+                v-if="distribution_public || is_internal"
+                :form-collapse="false"
+                label="Distribution"
+                Index="distribution"
+            >
                 <div class="row mb-3">
-                    <label for="" class="col-sm-5 col-form-label"
-                        >Extent of Occurrences:
-                        <HelpText
-                            v-if="species_community.distribution.eoo_auto"
-                            section_id="communities_extent_of_occurrences"
+                    <label
+                        for=""
+                        class="col-sm-3 control-label"
+                        :class="isReadOnly ? '' : 'fw-bold'"
+                        >Distribution:
+                        <span v-if="!isReadOnly" class="text-danger"
+                            >*</span
+                        ></label
+                    >
+                    <div class="col-sm-9">
+                        <textarea
+                            id="distribution"
+                            v-model="
+                                species_community.distribution.distribution
+                            "
+                            :disabled="isReadOnly"
+                            class="form-control"
+                            rows="1"
+                            placeholder=""
                         />
-                    </label>
-                    <div class="col-sm-4">
-                        <div class="input-group">
-                            <input
-                                v-if="species_community.distribution.eoo_auto"
-                                id="extent_of_occurrence"
-                                v-model="
-                                    species_community.area_occurrence_convex_hull_km2
-                                "
-                                :disabled="isEOOReadOnly"
-                                type="number"
-                                class="form-control"
-                                placeholder=""
-                            />
-                            <input
-                                v-else
-                                id="extent_of_occurrence"
-                                ref="extent_of_occurrence"
-                                v-model="
-                                    species_community.distribution
-                                        .extent_of_occurrences
-                                "
-                                :disabled="isEOOReadOnly"
-                                type="number"
-                                class="form-control"
-                                placeholder=""
-                            />
-                            <span
-                                id="area_of_occupancy_km2-addon"
-                                class="input-group-text"
-                                >km&#xb2;</span
-                            >
-                        </div>
                     </div>
-                    <div
-                        v-if="!isReadOnly"
-                        class="col-sm-3 d-flex align-items-center"
+                </div>
+                <div class="row mb-3">
+                    <label
+                        for=""
+                        class="col-sm-3 control-label"
+                        :class="isReadOnly ? '' : 'fw-bold'"
+                        >Region:
+                        <span v-if="!isReadOnly" class="text-danger"
+                            >*</span
+                        ></label
                     >
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="eoo_auto"
-                                v-model="
-                                    species_community.distribution.eoo_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="true"
-                                class="form-check-input"
-                                @click="switchEOO('true')"
-                            />
-                            <label class="form-check-label">auto</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="eoo_manual"
-                                v-model="
-                                    species_community.distribution.eoo_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="false"
-                                class="form-check-input"
-                                @click="switchEOO('false')"
-                            />
-                            <label class="form-check-label">manual</label>
-                        </div>
+                    <div class="col-sm-9">
+                        <select
+                            ref="regions_select"
+                            v-model="species_community.regions"
+                            :disabled="isReadOnly"
+                            class="form-select"
+                        >
+                            <option value="" selected disabled>
+                                Select region
+                            </option>
+                            <option
+                                v-for="option in region_list"
+                                :key="option.value"
+                                :value="option.value"
+                            >
+                                {{ option.text }}
+                            </option>
+                        </select>
                     </div>
                 </div>
-                <div class="row mb-3">
-                    <label for="" class="col-sm-5 col-form-label"
-                        >Area of Occupancy:</label
+                <div v-if="species_community.regions" class="row mb-3">
+                    <label
+                        for=""
+                        class="col-sm-3 col-form-label"
+                        :class="isReadOnly ? '' : 'fw-bold'"
+                        >District:
+                        <span v-if="!isReadOnly" class="text-danger"
+                            >*</span
+                        ></label
                     >
-                    <div class="col-sm-4">
-                        <div class="input-group">
-                            <input
-                                id="area_of_occupany"
-                                v-model="
-                                    species_community.distribution
-                                        .area_of_occupancy
-                                "
-                                :disabled="isReadOnly"
-                                type="number"
-                                class="form-control"
-                                placeholder=""
-                            />
-                            <span
-                                id="area_of_occupancy-addon"
-                                class="input-group-text"
-                                >2km x 2km</span
+                    <div class="col-sm-9">
+                        <select
+                            ref="districts_select"
+                            v-model="species_community.districts"
+                            :disabled="isReadOnly"
+                            class="form-select"
+                        >
+                            <option value="" selected disabled>
+                                Select district
+                            </option>
+                            <option
+                                v-for="option in district_list"
+                                :key="option.value"
+                                :value="option.value"
                             >
-                        </div>
+                                {{ option.text }}
+                            </option>
+                        </select>
                     </div>
                 </div>
-                <div class="row mb-3">
-                    <label for="" class="col-sm-5 col-form-label"
-                        >Actual Area of Occupancy:
-                        <HelpText
-                            v-if="
-                                species_community.distribution.aoo_actual_auto
-                            "
-                            section_id="communities_actual_area_of_occupancy"
-                        />
-                    </label>
-                    <div class="col-sm-4">
-                        <div class="input-group">
+                <template v-if="show_calculated_distribution_fields">
+                    <div class="row mb-3 border-top pt-3">
+                        <label for="" class="col-sm-5 col-form-label"
+                            >Number of Occurrences:</label
+                        >
+                        <div class="col-sm-4">
                             <input
-                                v-if="
-                                    species_community.distribution
-                                        .aoo_actual_auto
-                                "
-                                id="area_of_occupancy_actual"
-                                v-model="
-                                    species_community.area_of_occupancy_km2
-                                "
-                                :disabled="isAOOActualReadOnly"
+                                v-if="species_community.distribution.noo_auto"
+                                id="no_of_occurrences"
+                                v-model="species_community.occurrence_count"
+                                :disabled="isNOOReadOnly"
                                 type="number"
-                                step="any"
                                 class="form-control"
                                 placeholder=""
-                                area-describedby=""
                             />
                             <input
                                 v-else
-                                id="area_of_occupancy_actual"
-                                ref="area_of_occupancy_actual"
+                                id="no_of_occurrences"
+                                ref="number_of_occurrences"
                                 v-model="
                                     species_community.distribution
-                                        .area_of_occupancy_actual
+                                        .number_of_occurrences
                                 "
-                                :disabled="isAOOActualReadOnly"
+                                :disabled="isNOOReadOnly"
                                 type="number"
-                                step="any"
                                 class="form-control"
                                 placeholder=""
                             />
-                            <span
-                                id="area_of_occupancy_km2-addon"
-                                class="input-group-text"
-                                >km&#xb2;</span
-                            >
+                        </div>
+                        <div
+                            v-if="!isReadOnly"
+                            class="col-sm-3 d-flex align-items-center"
+                        >
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="noo_auto"
+                                    v-model="
+                                        species_community.distribution.noo_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="true"
+                                    class="form-check-input"
+                                    @click="switchNOO('true')"
+                                />
+                                <label class="form-check-label">auto</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="noo_manual"
+                                    v-model="
+                                        species_community.distribution.noo_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="false"
+                                    class="form-check-input"
+                                    @click="switchNOO('false')"
+                                />
+                                <label class="form-check-label">manual</label>
+                            </div>
                         </div>
                     </div>
-                    <div
-                        v-if="!isReadOnly"
-                        class="col-sm-3 d-flex align-items-center"
-                    >
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="aoo_actual_auto"
-                                v-model="
-                                    species_community.distribution
-                                        .aoo_actual_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="true"
-                                class="form-check-input"
-                                @click="switchAOOActual('true')"
+                    <div class="row mb-3">
+                        <label for="" class="col-sm-5 col-form-label"
+                            >Extent of Occurrences:
+                            <HelpText
+                                v-if="species_community.distribution.eoo_auto"
+                                section_id="communities_extent_of_occurrences"
                             />
-                            <label class="form-check-label">auto</label>
+                        </label>
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <input
+                                    v-if="
+                                        species_community.distribution.eoo_auto
+                                    "
+                                    id="extent_of_occurrence"
+                                    v-model="
+                                        species_community.area_occurrence_convex_hull_km2
+                                    "
+                                    :disabled="isEOOReadOnly"
+                                    type="number"
+                                    class="form-control"
+                                    placeholder=""
+                                />
+                                <input
+                                    v-else
+                                    id="extent_of_occurrence"
+                                    ref="extent_of_occurrence"
+                                    v-model="
+                                        species_community.distribution
+                                            .extent_of_occurrences
+                                    "
+                                    :disabled="isEOOReadOnly"
+                                    type="number"
+                                    class="form-control"
+                                    placeholder=""
+                                />
+                                <span
+                                    id="area_of_occupancy_km2-addon"
+                                    class="input-group-text"
+                                    >km&#xb2;</span
+                                >
+                            </div>
                         </div>
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="aoo_actual_manual"
-                                v-model="
+                        <div
+                            v-if="!isReadOnly"
+                            class="col-sm-3 d-flex align-items-center"
+                        >
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="eoo_auto"
+                                    v-model="
+                                        species_community.distribution.eoo_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="true"
+                                    class="form-check-input"
+                                    @click="switchEOO('true')"
+                                />
+                                <label class="form-check-label">auto</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="eoo_manual"
+                                    v-model="
+                                        species_community.distribution.eoo_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="false"
+                                    class="form-check-input"
+                                    @click="switchEOO('false')"
+                                />
+                                <label class="form-check-label">manual</label>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mb-3">
+                        <label for="" class="col-sm-5 col-form-label"
+                            >Area of Occupancy:</label
+                        >
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <input
+                                    id="area_of_occupany"
+                                    v-model="
+                                        species_community.distribution
+                                            .area_of_occupancy
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="number"
+                                    class="form-control"
+                                    placeholder=""
+                                />
+                                <span
+                                    id="area_of_occupancy-addon"
+                                    class="input-group-text"
+                                    >2km x 2km</span
+                                >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mb-3">
+                        <label for="" class="col-sm-5 col-form-label"
+                            >Actual Area of Occupancy:
+                            <HelpText
+                                v-if="
                                     species_community.distribution
                                         .aoo_actual_auto
                                 "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="false"
-                                class="form-check-input"
-                                @click="switchAOOActual('false')"
+                                section_id="communities_actual_area_of_occupancy"
                             />
-                            <label class="form-check-label">manual</label>
+                        </label>
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <input
+                                    v-if="
+                                        species_community.distribution
+                                            .aoo_actual_auto
+                                    "
+                                    id="area_of_occupancy_actual"
+                                    v-model="
+                                        species_community.area_of_occupancy_km2
+                                    "
+                                    :disabled="isAOOActualReadOnly"
+                                    type="number"
+                                    step="any"
+                                    class="form-control"
+                                    placeholder=""
+                                    area-describedby=""
+                                />
+                                <input
+                                    v-else
+                                    id="area_of_occupancy_actual"
+                                    ref="area_of_occupancy_actual"
+                                    v-model="
+                                        species_community.distribution
+                                            .area_of_occupancy_actual
+                                    "
+                                    :disabled="isAOOActualReadOnly"
+                                    type="number"
+                                    step="any"
+                                    class="form-control"
+                                    placeholder=""
+                                />
+                                <span
+                                    id="area_of_occupancy_km2-addon"
+                                    class="input-group-text"
+                                    >km&#xb2;</span
+                                >
+                            </div>
+                        </div>
+                        <div
+                            v-if="!isReadOnly"
+                            class="col-sm-3 d-flex align-items-center"
+                        >
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="aoo_actual_auto"
+                                    v-model="
+                                        species_community.distribution
+                                            .aoo_actual_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="true"
+                                    class="form-check-input"
+                                    @click="switchAOOActual('true')"
+                                />
+                                <label class="form-check-label">auto</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="aoo_actual_manual"
+                                    v-model="
+                                        species_community.distribution
+                                            .aoo_actual_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="false"
+                                    class="form-check-input"
+                                    @click="switchAOOActual('false')"
+                                />
+                                <label class="form-check-label">manual</label>
+                            </div>
                         </div>
                     </div>
-                </div>
-            </template>
-            <div
-                v-if="
-                    showField(
-                        species_community.distribution.number_of_iucn_locations
-                    )
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-5 control-label"
-                    >Number of IUCN Locations:</label
-                >
-                <div class="col-sm-4">
-                    <input
-                        id="no_of_iucn_locations"
-                        v-model="
+                </template>
+                <div
+                    v-if="
+                        showField(
                             species_community.distribution
                                 .number_of_iucn_locations
-                        "
-                        :disabled="isReadOnly"
-                        type="number"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div
-                v-if="
-                    showField(
-                        species_community.distribution.community_original_area
-                    )
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-5 control-label"
-                    >Community Original Area (ha):</label
+                        )
+                    "
+                    class="row mb-3"
                 >
-                <div class="col-sm-4">
-                    <input
-                        id="community_original_area"
-                        v-model="
+                    <label for="" class="col-sm-5 control-label"
+                        >Number of IUCN Locations:</label
+                    >
+                    <div class="col-sm-4">
+                        <input
+                            id="no_of_iucn_locations"
+                            v-model="
+                                species_community.distribution
+                                    .number_of_iucn_locations
+                            "
+                            :disabled="isReadOnly"
+                            type="number"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
+                </div>
+                <div
+                    v-if="
+                        showField(
                             species_community.distribution
                                 .community_original_area
-                        "
-                        :disabled="isReadOnly"
-                        type="number"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div
-                v-if="
-                    showField(
-                        species_community.distribution
-                            .community_original_area_accuracy
-                    )
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-5 control-label"
-                    >Community Original Area (+/- ha) Accuracy:</label
+                        )
+                    "
+                    class="row mb-3"
                 >
-                <div class="col-sm-4">
-                    <input
-                        id="community_original_area_accuracy"
-                        v-model="
+                    <label for="" class="col-sm-5 control-label"
+                        >Community Original Area (ha):</label
+                    >
+                    <div class="col-sm-4">
+                        <input
+                            id="community_original_area"
+                            v-model="
+                                species_community.distribution
+                                    .community_original_area
+                            "
+                            :disabled="isReadOnly"
+                            type="number"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
+                </div>
+                <div
+                    v-if="
+                        showField(
                             species_community.distribution
                                 .community_original_area_accuracy
-                        "
-                        :disabled="isReadOnly"
-                        type="number"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div
-                v-if="
-                    showField(
-                        species_community.distribution
-                            .community_original_area_reference
-                    )
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-5 control-label"
-                    >Community Original Area (ha) Reference:</label
+                        )
+                    "
+                    class="row mb-3"
                 >
-                <div class="col-sm-4">
-                    <input
-                        id="community_original_area_reference"
-                        v-model="
+                    <label for="" class="col-sm-5 control-label"
+                        >Community Original Area (+/- ha) Accuracy:</label
+                    >
+                    <div class="col-sm-4">
+                        <input
+                            id="community_original_area_accuracy"
+                            v-model="
+                                species_community.distribution
+                                    .community_original_area_accuracy
+                            "
+                            :disabled="isReadOnly"
+                            type="number"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
+                </div>
+                <div
+                    v-if="
+                        showField(
                             species_community.distribution
                                 .community_original_area_reference
-                        "
-                        :disabled="isReadOnly"
-                        type="text"
-                        class="form-control"
-                        placeholder=""
-                    />
+                        )
+                    "
+                    class="row mb-3"
+                >
+                    <label for="" class="col-sm-5 control-label"
+                        >Community Original Area (ha) Reference:</label
+                    >
+                    <div class="col-sm-4">
+                        <input
+                            id="community_original_area_reference"
+                            v-model="
+                                species_community.distribution
+                                    .community_original_area_reference
+                            "
+                            :disabled="isReadOnly"
+                            type="text"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-        </FormSection>
-        <BasicConservationStatus
-            v-if="
-                species_community.conservation_status &&
-                (conservation_status_public || is_internal)
-            "
-            :conservation_status="species_community.conservation_status"
-            :is_internal="is_internal"
-        />
-        <!-- <FormSection v-if="conservation_attributes_public || is_internal" :formCollapse="false"
+            </FormSection>
+            <BasicConservationStatus
+                v-if="
+                    species_community.conservation_status &&
+                    (conservation_status_public || is_internal)
+                "
+                :conservation_status="species_community.conservation_status"
+                :is_internal="is_internal"
+            />
+            <!-- <FormSection v-if="conservation_attributes_public || is_internal" :formCollapse="false"
             label="Conservation Attributes" Index="conservation_attributes">
             <div class="row mb-3">
                 <label for="" class="col-sm-3 control-label">Pollinator Information:</label>
@@ -720,192 +753,197 @@
                 </div>
             </div>
         </FormSection> -->
-        <FormSection
-            v-if="is_internal"
-            :form-collapse="false"
-            label="General"
-            Index="general"
-        >
-            <div class="row mb-3">
-                <label for="" class="col-sm-3 control-label"
-                    >Department File Numbers:</label
-                >
-                <div class="col-sm-9">
-                    <input
-                        id="department_file_numbers"
-                        v-model="species_community.department_file_numbers"
-                        :disabled="isReadOnly"
-                        type="text"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div class="row mb-3">
-                <label
-                    for="last_data_curration_date"
-                    class="col-sm-3 control-label"
-                    >Last data curation date:
-                </label>
-                <div class="col-sm-9">
-                    <input
-                        ref="last_data_curration_date"
-                        v-model="species_community.last_data_curration_date"
-                        :disabled="isReadOnly"
-                        type="date"
-                        class="form-control"
-                        name="last_data_curration_date"
-                        @change="checkDate()"
-                    />
-                </div>
-            </div>
-            <div class="row mb-3">
-                <label
-                    for="conservation_plan_exists"
-                    class="col-sm-3 control-label"
-                    >Conservation Plan Exists:
-                </label>
-                <div class="col-sm-9">
-                    <label for="conservation_plan_exists" class="me-2"
-                        >No</label
-                    >
-                    <input
-                        id="conservation_plan_exists"
-                        v-model="species_community.conservation_plan_exists"
-                        :disabled="isReadOnly"
-                        type="radio"
-                        :value="false"
-                        class="form-check-input me-2"
-                    />
-                    <label for="conservation_plan_exists" class="me-2"
-                        >Yes</label
+            <FormSection
+                v-if="is_internal"
+                :form-collapse="false"
+                label="General"
+                Index="general"
+            >
+                <div class="row mb-3">
+                    <label for="" class="col-sm-3 control-label"
+                        >Department File Numbers:</label
                     >
-                    <input
-                        id="conservation_plan_exists"
-                        v-model="species_community.conservation_plan_exists"
-                        :disabled="isReadOnly"
-                        type="radio"
-                        :value="true"
-                        class="form-check-input"
-                    />
+                    <div class="col-sm-9">
+                        <input
+                            id="department_file_numbers"
+                            v-model="species_community.department_file_numbers"
+                            :disabled="isReadOnly"
+                            type="text"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <div
-                v-if="species_community.conservation_plan_exists"
-                class="row mb-3"
-            >
-                <label
-                    for="conservation_plan_reference"
-                    class="col-sm-3 control-label"
-                    >Conservation Plan Reference / Location:
-                </label>
-                <div class="col-sm-9">
-                    <input
-                        ref="conservation_plan_reference"
-                        v-model="species_community.conservation_plan_reference"
-                        :disabled="isReadOnly"
-                        type="text"
-                        class="form-control"
-                        name="conservation_plan_reference"
-                        @change="checkDate()"
-                    />
+                <div class="row mb-3">
+                    <label
+                        for="last_data_curation_date"
+                        class="col-sm-3 control-label"
+                        >Last data curation date:
+                    </label>
+                    <div class="col-sm-9">
+                        <input
+                            ref="last_data_curation_date"
+                            v-model="species_community.last_data_curation_date"
+                            :disabled="isReadOnly"
+                            type="date"
+                            class="form-control"
+                            name="last_data_curation_date"
+                            :max="new Date().toISOString().split('T')[0]"
+                            @change="checkDate()"
+                        />
+                    </div>
                 </div>
-            </div>
-            <div class="row mb-3">
-                <label for="" class="col-sm-3 control-label">Comment:</label>
-                <div class="col-sm-9">
-                    <textarea
-                        id="comment"
-                        v-model="species_community.comment"
-                        :disabled="isReadOnly"
-                        class="form-control"
-                        rows="3"
-                        placeholder=""
-                    />
+                <div class="row mb-3">
+                    <label
+                        for="conservation_plan_exists"
+                        class="col-sm-3 control-label"
+                        >Conservation Plan Exists:
+                    </label>
+                    <div class="col-sm-9">
+                        <label for="conservation_plan_exists" class="me-2"
+                            >No</label
+                        >
+                        <input
+                            id="conservation_plan_exists"
+                            v-model="species_community.conservation_plan_exists"
+                            :disabled="isReadOnly"
+                            type="radio"
+                            :value="false"
+                            class="form-check-input me-2"
+                        />
+                        <label for="conservation_plan_exists" class="me-2"
+                            >Yes</label
+                        >
+                        <input
+                            id="conservation_plan_exists"
+                            v-model="species_community.conservation_plan_exists"
+                            :disabled="isReadOnly"
+                            type="radio"
+                            :value="true"
+                            class="form-check-input"
+                        />
+                    </div>
                 </div>
-            </div>
-        </FormSection>
-        <FormSection
-            v-if="is_internal"
-            :form-collapse="false"
-            label="Publishing"
-            Index="publishing"
-        >
-            <div class="row mb-3">
-                <label
-                    for="distribution_publishing"
-                    class="col-sm-3 control-label"
-                    >Distribution:
-                </label>
-                <div class="col-sm-9">
-                    <label for="distribution_publishing" class="me-2"
-                        >Private</label
-                    >
-                    <input
-                        id="distribution_publishing"
-                        v-model="
-                            species_community.publishing_status
-                                .distribution_public
-                        "
-                        :disabled="isReadOnly || !isPublic || !isActive"
-                        type="radio"
-                        :value="false"
-                        class="form-check-input me-2"
-                    />
-                    <label for="distribution_publishing" class="me-2"
-                        >Public</label
-                    >
-                    <input
-                        id="distribution_publishing"
-                        v-model="
-                            species_community.publishing_status
-                                .distribution_public
-                        "
-                        :disabled="isReadOnly || !isPublic || !isActive"
-                        type="radio"
-                        :value="true"
-                        class="form-check-input"
-                    />
+                <div
+                    v-if="species_community.conservation_plan_exists"
+                    class="row mb-3"
+                >
+                    <label
+                        for="conservation_plan_reference"
+                        class="col-sm-3 control-label"
+                        >Conservation Plan Reference / Location:
+                    </label>
+                    <div class="col-sm-9">
+                        <input
+                            ref="conservation_plan_reference"
+                            v-model="
+                                species_community.conservation_plan_reference
+                            "
+                            :disabled="isReadOnly"
+                            type="text"
+                            class="form-control"
+                            name="conservation_plan_reference"
+                            @change="checkDate()"
+                        />
+                    </div>
                 </div>
-            </div>
-            <div class="row mb-3">
-                <label
-                    for="conservation_status_publishing"
-                    class="col-sm-3 control-label"
-                    >Conservation Status:
-                </label>
-                <div class="col-sm-9">
-                    <label for="conservation_status_publishing" class="me-2"
-                        >Private</label
-                    >
-                    <input
-                        id="conservation_status_publishing"
-                        v-model="
-                            species_community.publishing_status
-                                .conservation_status_public
-                        "
-                        :disabled="isReadOnly || !isPublic || !isActive"
-                        type="radio"
-                        :value="false"
-                        class="form-check-input me-2"
-                    />
-                    <label for="conservation_status_publishing" class="me-2"
-                        >Public</label
+                <div class="row mb-3">
+                    <label for="" class="col-sm-3 control-label"
+                        >Comment:</label
                     >
-                    <input
-                        id="conservation_status_publishing"
-                        v-model="
-                            species_community.publishing_status
-                                .conservation_status_public
-                        "
-                        :disabled="isReadOnly || !isPublic || !isActive"
-                        type="radio"
-                        :value="true"
-                        class="form-check-input"
-                    />
+                    <div class="col-sm-9">
+                        <textarea
+                            id="comment"
+                            v-model="species_community.comment"
+                            :disabled="isReadOnly"
+                            class="form-control"
+                            rows="3"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <!-- <div class="row mb-3">
+            </FormSection>
+            <FormSection
+                v-if="is_internal"
+                :form-collapse="false"
+                label="Publishing"
+                Index="publishing"
+            >
+                <div class="row mb-3">
+                    <label
+                        for="distribution_publishing"
+                        class="col-sm-3 control-label"
+                        >Distribution:
+                    </label>
+                    <div class="col-sm-9">
+                        <label for="distribution_publishing" class="me-2"
+                            >Private</label
+                        >
+                        <input
+                            id="distribution_publishing"
+                            v-model="
+                                species_community.publishing_status
+                                    .distribution_public
+                            "
+                            :disabled="isReadOnly || !isPublic || !isActive"
+                            type="radio"
+                            :value="false"
+                            class="form-check-input me-2"
+                        />
+                        <label for="distribution_publishing" class="me-2"
+                            >Public</label
+                        >
+                        <input
+                            id="distribution_publishing"
+                            v-model="
+                                species_community.publishing_status
+                                    .distribution_public
+                            "
+                            :disabled="isReadOnly || !isPublic || !isActive"
+                            type="radio"
+                            :value="true"
+                            class="form-check-input"
+                        />
+                    </div>
+                </div>
+                <div class="row mb-3">
+                    <label
+                        for="conservation_status_publishing"
+                        class="col-sm-3 control-label"
+                        >Conservation Status:
+                    </label>
+                    <div class="col-sm-9">
+                        <label for="conservation_status_publishing" class="me-2"
+                            >Private</label
+                        >
+                        <input
+                            id="conservation_status_publishing"
+                            v-model="
+                                species_community.publishing_status
+                                    .conservation_status_public
+                            "
+                            :disabled="isReadOnly || !isPublic || !isActive"
+                            type="radio"
+                            :value="false"
+                            class="form-check-input me-2"
+                        />
+                        <label for="conservation_status_publishing" class="me-2"
+                            >Public</label
+                        >
+                        <input
+                            id="conservation_status_publishing"
+                            v-model="
+                                species_community.publishing_status
+                                    .conservation_status_public
+                            "
+                            :disabled="isReadOnly || !isPublic || !isActive"
+                            type="radio"
+                            :value="true"
+                            class="form-check-input"
+                        />
+                    </div>
+                </div>
+                <!-- <div class="row mb-3">
                 <label for="conservation_attributes_publishing" class="col-sm-3 control-label">Conservation Attributes:
                 </label>
                 <div class="col-sm-9">
@@ -919,57 +957,70 @@
                         v-model="species_community.publishing_status.conservation_attributes_public">
                 </div>
             </div> -->
-            <div class="row mb-3">
-                <label for="threats_publishing" class="col-sm-3 control-label"
-                    >Threats:
-                </label>
-                <div class="col-sm-9">
-                    <label for="threats_publishing" class="me-2">Private</label>
-                    <input
-                        id="threats_publishing"
-                        v-model="
-                            species_community.publishing_status.threats_public
-                        "
-                        :disabled="isReadOnly || !isPublic || !isActive"
-                        type="radio"
-                        :value="false"
-                        class="form-check-input me-2"
-                    />
-                    <label for="threats_publishing" class="me-2">Public</label>
-                    <input
-                        id="threats_publishing"
-                        v-model="
-                            species_community.publishing_status.threats_public
-                        "
-                        :disabled="isReadOnly || !isPublic || !isActive"
-                        type="radio"
-                        :value="true"
-                        class="form-check-input"
-                    />
+                <div class="row mb-3">
+                    <label
+                        for="threats_publishing"
+                        class="col-sm-3 control-label"
+                        >Threats:
+                    </label>
+                    <div class="col-sm-9">
+                        <label for="threats_publishing" class="me-2"
+                            >Private</label
+                        >
+                        <input
+                            id="threats_publishing"
+                            v-model="
+                                species_community.publishing_status
+                                    .threats_public
+                            "
+                            :disabled="isReadOnly || !isPublic || !isActive"
+                            type="radio"
+                            :value="false"
+                            class="form-check-input me-2"
+                        />
+                        <label for="threats_publishing" class="me-2"
+                            >Public</label
+                        >
+                        <input
+                            id="threats_publishing"
+                            v-model="
+                                species_community.publishing_status
+                                    .threats_public
+                            "
+                            :disabled="isReadOnly || !isPublic || !isActive"
+                            type="radio"
+                            :value="true"
+                            class="form-check-input"
+                        />
+                    </div>
                 </div>
-            </div>
-            <div class="row mb-3">
-                <div class="col-sm-12">
-                    <button
-                        v-if="!updatingPublishing"
-                        :disabled="isReadOnly || !isPublic || !isActive"
-                        class="btn btn-primary btn-sm float-end"
-                        @click.prevent="updatePublishingDetails()"
-                    >
-                        Update
-                    </button>
-                    <button v-else disabled class="float-end btn btn-primary">
-                        Updating
-                        <span
-                            class="spinner-border spinner-border-sm"
-                            role="status"
-                            aria-hidden="true"
-                        ></span>
-                        <span class="visually-hidden">Loading...</span>
-                    </button>
+                <div class="row mb-3">
+                    <div class="col-sm-12">
+                        <button
+                            v-if="!updatingPublishing"
+                            :disabled="isReadOnly || !isPublic || !isActive"
+                            class="btn btn-primary btn-sm float-end"
+                            @click.prevent="updatePublishingDetails()"
+                        >
+                            Update
+                        </button>
+                        <button
+                            v-else
+                            disabled
+                            class="float-end btn btn-primary"
+                        >
+                            Updating
+                            <span
+                                class="spinner-border spinner-border-sm"
+                                role="status"
+                                aria-hidden="true"
+                            ></span>
+                            <span class="visually-hidden">Loading...</span>
+                        </button>
+                    </div>
                 </div>
-            </div>
-        </FormSection>
+            </FormSection>
+        </fieldset>
     </div>
 </template>
 
@@ -1051,7 +1102,9 @@ export default {
                 return true;
             }
             let action = this.$route.query.action;
-            if (
+            if (action === 'view') {
+                return true;
+            } else if (
                 action === 'edit' &&
                 this.species_community &&
                 this.species_community.user_edit_mode
@@ -1357,7 +1410,15 @@ export default {
         chainedSelectDistricts: function (regions, action) {
             let vm = this;
             if (action != 'fetch') {
-                vm.species_community.districts = []; //-----to remove the previous selection
+                // Remove any districts that are not in the selected regions
+                var selected_districts = vm.species_community.districts;
+                for (var i = 0; i < selected_districts.length; i++) {
+                    var district = selected_districts[i];
+                    var region = vm.searchList(district, vm.region_list);
+                    if (region == []) {
+                        vm.species_community.districts.splice(i, 1);
+                    }
+                }
             }
             vm.district_list = [];
             if (regions) {
@@ -1367,7 +1428,7 @@ export default {
                         vm.region_list
                     ).districts;
                     if (api_districts.length > 0) {
-                        for (var i = 0; i < api_districts.length; i++) {
+                        for (let i = 0; i < api_districts.length; i++) {
                             this.district_list.push({
                                 text: api_districts[i].name,
                                 value: api_districts[i].id,
@@ -1393,6 +1454,7 @@ export default {
                         vm.species_community.regions,
                         'select'
                     );
+                    this.$emit('save-species-community');
                 })
                 .on('select2:unselect', function (e) {
                     var selected = $(e.currentTarget);
@@ -1401,6 +1463,7 @@ export default {
                         vm.species_community.regions,
                         'deselect'
                     );
+                    this.$emit('save-species-community');
                 });
         },
         initialiseDistrictSelect: function () {
@@ -1415,19 +1478,21 @@ export default {
                 .on('select2:select', function (e) {
                     var selected = $(e.currentTarget);
                     vm.species_community.districts = selected.val();
+                    this.$emit('save-species-community');
                 })
                 .on('select2:unselect', function (e) {
                     var selected = $(e.currentTarget);
                     vm.species_community.districts = selected.val();
+                    this.$emit('save-species-community');
                 });
         },
         checkDate: function () {
             let vm = this;
-            if (vm.$refs.last_data_curration_date.value) {
-                vm.species_community.last_data_curration_date =
-                    vm.$refs.last_data_curration_date.value;
+            if (vm.$refs.last_data_curation_date.value) {
+                vm.species_community.last_data_curation_date =
+                    vm.$refs.last_data_curation_date.value;
             } else {
-                vm.species_community.last_data_curration_date = null;
+                vm.species_community.last_data_curation_date = null;
             }
         },
         handleMinimumFireIntervalRange: function () {
@@ -1612,6 +1677,12 @@ export default {
                 });
             }
         },
+        saveSpeciesCommunity: function (e) {
+            // For the select2 we emit after the select/unselect event as otherwise the value is not yet updated
+            if (!e.target.className.includes('select2-')) {
+                this.$emit('save-species-community');
+            }
+        },
     },
 };
 </script>
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/species_combine/species_combine_profile.vue b/boranga/frontend/boranga/src/components/common/species_communities/species_combine/species_combine_profile.vue
index c445f399..8722246b 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/species_combine/species_combine_profile.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/species_combine/species_combine_profile.vue
@@ -1622,16 +1622,17 @@
 
             <div class="row mb-3">
                 <label for="" class="col-sm-3 control-label"
-                    >Last data curration date:
+                    >Last data curation date:
                 </label>
                 <div class="col-sm-8">
                     <input
-                        ref="last_data_curration_date"
-                        v-model="species_community.last_data_curration_date"
+                        ref="last_data_curation_date"
+                        v-model="species_community.last_data_curation_date"
                         :disabled="isReadOnly"
                         type="date"
                         class="form-control"
-                        name="last_data_curration_date"
+                        name="last_data_curation_date"
+                        :max="new Date().toISOString().split('T')[0]"
                         @change="checkDate()"
                     />
                 </div>
@@ -1943,11 +1944,11 @@ export default {
         },
         checkDate: function () {
             let vm = this;
-            if (vm.$refs.last_data_curration_date.value) {
-                vm.species_community.last_data_curration_date =
-                    vm.$refs.last_data_curration_date.value;
+            if (vm.$refs.last_data_curation_date.value) {
+                vm.species_community.last_data_curation_date =
+                    vm.$refs.last_data_curation_date.value;
             } else {
-                vm.species_community.last_data_curration_date = null;
+                vm.species_community.last_data_curation_date = null;
             }
         },
         initialiseScientificNameLookup: function () {
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/species_profile.vue b/boranga/frontend/boranga/src/components/common/species_communities/species_profile.vue
index 4d6355bc..747f1fe8 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/species_profile.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/species_profile.vue
@@ -1,568 +1,589 @@
 <template lang="html">
     <div id="species">
-        <FormSection :form-collapse="false" label="Taxonomy" :Index="taxonBody">
-            <div class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 col-form-label"
-                    :class="rename_species || !isReadOnly ? 'fw-bold' : ''"
-                    >Scientific Name:
-                    <span
-                        v-if="rename_species || !isReadOnly"
-                        class="text-danger"
-                        >*</span
-                    ></label
-                >
-                <div :id="select_scientific_name" class="col-sm-9">
-                    <select
-                        v-if="rename_species || !isReadOnly"
-                        :id="scientific_name_lookup"
-                        :ref="scientific_name_lookup"
-                        :name="scientific_name_lookup"
-                        class="form-select"
-                    />
-                    <input
-                        v-else
-                        id="taxon_name_id"
-                        v-model="
-                            species_community.taxonomy_details.scientific_name
-                        "
-                        :disabled="true"
-                        type="text"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div
-                v-if="species_community.scientific_name != species_display"
-                class="row mb-3"
+        <fieldset id="species-profile-fieldset" @change="saveSpeciesCommunity">
+            <FormSection
+                :form-collapse="false"
+                label="Taxonomy"
+                :Index="taxonBody"
             >
-                <label for="" class="col-sm-3 col-form-label"></label>
-                <div class="col-sm-9">
-                    <textarea
-                        id="species_display"
-                        v-model="species_display"
-                        disabled
-                        class="form-control"
-                        rows="2"
-                    />
-                </div>
-            </div>
-            <div v-if="showField(common_name)" class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label"
-                    >Common Name:</label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="common_name"
-                        v-model="common_name"
-                        :disabled="true"
-                        class="form-control"
-                        rows="2"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label"
-                    >Taxon Name ID:</label
-                >
-                <div class="col-sm-9">
-                    <input
-                        id="taxon_name_id"
-                        v-model="taxon_name_id"
-                        :disabled="true"
-                        type="text"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div v-if="showField(taxon_previous_name)" class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label"
-                    >Previous Name:</label
-                >
-                <div class="col-sm-9">
-                    <input
-                        id="previous_name"
-                        v-model="taxon_previous_name"
-                        :disabled="true"
-                        type="text"
-                        class="form-control"
-                        placeholder=""
-                    />
+                <div class="row mb-3">
+                    <label
+                        for=""
+                        class="col-sm-3 col-form-label"
+                        :class="!scientificNameIsReadOnly ? 'fw-bold' : ''"
+                        >Scientific Name:
+                        <span
+                            v-if="!scientificNameIsReadOnly"
+                            class="text-danger"
+                            >*</span
+                        ></label
+                    >
+                    <div :id="select_scientific_name" class="col-sm-9">
+                        <select
+                            v-if="!scientificNameIsReadOnly"
+                            :id="scientific_name_lookup"
+                            :ref="scientific_name_lookup"
+                            :name="scientific_name_lookup"
+                            class="form-select"
+                        />
+                        <input
+                            v-else
+                            id="taxon_name_id"
+                            v-model="
+                                species_community.taxonomy_details
+                                    .scientific_name
+                            "
+                            :disabled="true"
+                            type="text"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <div v-if="showField(phylogenetic_group)" class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label"
-                    >Phylogenetic Group:</label
+                <div
+                    v-if="species_community.scientific_name != species_display"
+                    class="row mb-3"
                 >
-                <div class="col-sm-9">
-                    <textarea
-                        id="phylogenetic_group"
-                        v-model="phylogenetic_group"
-                        :disabled="true"
-                        class="form-control"
-                        rows="1"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div v-if="showField(family)" class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label">Family:</label>
-                <div class="col-sm-9">
-                    <textarea
-                        id="family"
-                        v-model="family"
-                        :disabled="true"
-                        rows="1"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div v-if="showField(genus)" class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label">Genus:</label>
-                <div class="col-sm-9">
-                    <textarea
-                        id="genus"
-                        v-model="genus"
-                        :disabled="true"
-                        rows="1"
-                        class="form-control"
-                        placeholder=""
-                    />
+                    <label for="" class="col-sm-3 col-form-label"></label>
+                    <div class="col-sm-9">
+                        <textarea
+                            id="species_display"
+                            v-model="species_display"
+                            disabled
+                            class="form-control"
+                            rows="2"
+                        />
+                    </div>
                 </div>
-            </div>
-            <div v-if="showField(name_authority)" class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label"
-                    >Name Authority:</label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="name_authority"
-                        v-model="name_authority"
-                        :disabled="true"
-                        rows="1"
-                        class="form-control"
-                        placeholder=""
-                    />
+                <div v-if="showField(common_name)" class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Common Name:</label
+                    >
+                    <div class="col-sm-9">
+                        <textarea
+                            id="common_name"
+                            v-model="common_name"
+                            :disabled="true"
+                            class="form-control"
+                            rows="2"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <div v-if="showField(name_comments)" class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label"
-                    >NOMOS names comments:</label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="name_comments"
-                        v-model="name_comments"
-                        :disabled="true"
-                        class="form-control"
-                        rows="3"
-                        placeholder=""
-                    />
+                <div class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Taxon Name ID:</label
+                    >
+                    <div class="col-sm-9">
+                        <input
+                            id="taxon_name_id"
+                            v-model="taxon_name_id"
+                            :disabled="true"
+                            type="text"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-        </FormSection>
-        <FormSection
-            v-if="distribution_public || is_internal"
-            :form-collapse="false"
-            label="Distribution"
-            :Index="distributionBody"
-        >
-            <div class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 col-form-label"
-                    :class="isReadOnly ? '' : 'fw-bold'"
-                    >Distribution:
-                    <span v-if="!isReadOnly" class="text-danger">*</span></label
-                >
-                <div class="col-sm-9">
-                    <textarea
-                        id="distribution"
-                        v-model="species_community.distribution.distribution"
-                        :disabled="isReadOnly"
-                        class="form-control"
-                        rows="1"
-                        placeholder=""
-                    />
+                <div v-if="showField(taxon_previous_name)" class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Previous Name:</label
+                    >
+                    <div class="col-sm-9">
+                        <input
+                            id="previous_name"
+                            v-model="taxon_previous_name"
+                            :disabled="true"
+                            type="text"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <div class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 col-form-label"
-                    :class="isReadOnly ? '' : 'fw-bold'"
-                    >Region:
-                    <span v-if="!isReadOnly" class="text-danger">*</span></label
-                >
-                <div class="col-sm-9">
-                    <select
-                        ref="regions_select"
-                        v-model="species_community.regions"
-                        :disabled="isReadOnly"
-                        class="form-select"
+                <div v-if="showField(phylogenetic_group)" class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Phylogenetic Group:</label
                     >
-                        <option value="" selected disabled>
-                            Select region
-                        </option>
-                        <option
-                            v-for="option in region_list"
-                            :key="option.value"
-                            :value="option.value"
-                        >
-                            {{ option.text }}
-                        </option>
-                    </select>
+                    <div class="col-sm-9">
+                        <textarea
+                            id="phylogenetic_group"
+                            v-model="phylogenetic_group"
+                            :disabled="true"
+                            class="form-control"
+                            rows="1"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <div v-if="species_community.regions" class="row mb-3">
-                <label
-                    for=""
-                    class="col-sm-3 col-form-label"
-                    :class="isReadOnly ? '' : 'fw-bold'"
-                    >District:
-                    <span v-if="!isReadOnly" class="text-danger">*</span></label
-                >
-                <div class="col-sm-9">
-                    <select
-                        ref="districts_select"
-                        v-model="species_community.districts"
-                        :disabled="isReadOnly"
-                        class="form-select"
+                <div v-if="showField(family)" class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Family:</label
                     >
-                        <option value="" selected disabled>
-                            Select district
-                        </option>
-                        <option
-                            v-for="option in district_list"
-                            :key="option.value"
-                            :value="option.value"
-                        >
-                            {{ option.text }}
-                        </option>
-                    </select>
+                    <div class="col-sm-9">
+                        <textarea
+                            id="family"
+                            v-model="family"
+                            :disabled="true"
+                            rows="1"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <template v-if="show_calculated_distribution_fields">
-                <div class="row mb-3 pt-3">
-                    <label for="" class="col-sm-4 col-form-label"
-                        >Number of Occurrences:</label
+                <div v-if="showField(genus)" class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label">Genus:</label>
+                    <div class="col-sm-9">
+                        <textarea
+                            id="genus"
+                            v-model="genus"
+                            :disabled="true"
+                            rows="1"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
+                </div>
+                <div v-if="showField(name_authority)" class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Name Authority:</label
                     >
-                    <div
-                        v-if="
-                            showField(
-                                species_community.distribution
-                                    .number_of_occurrences
-                            )
-                        "
-                        class="col-sm-4"
+                    <div class="col-sm-9">
+                        <textarea
+                            id="name_authority"
+                            v-model="name_authority"
+                            :disabled="true"
+                            rows="1"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
+                </div>
+                <div v-if="showField(name_comments)" class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >NOMOS names comments:</label
                     >
-                        <input
-                            v-if="species_community.distribution.noo_auto"
-                            id="no_of_occurrences"
-                            v-model="species_community.occurrence_count"
-                            :disabled="isNOOReadOnly"
-                            type="number"
+                    <div class="col-sm-9">
+                        <textarea
+                            id="name_comments"
+                            v-model="name_comments"
+                            :disabled="true"
                             class="form-control"
+                            rows="3"
                             placeholder=""
                         />
-                        <input
-                            v-else
-                            id="no_of_occurrences"
-                            ref="number_of_occurrences"
+                    </div>
+                </div>
+            </FormSection>
+            <FormSection
+                v-if="distribution_public || is_internal"
+                :form-collapse="false"
+                label="Distribution"
+                :Index="distributionBody"
+            >
+                <div class="row mb-3">
+                    <label
+                        for=""
+                        class="col-sm-3 col-form-label"
+                        :class="isReadOnly ? '' : 'fw-bold'"
+                        >Distribution:
+                        <span v-if="!isReadOnly" class="text-danger"
+                            >*</span
+                        ></label
+                    >
+                    <div class="col-sm-9">
+                        <textarea
+                            id="distribution"
                             v-model="
-                                species_community.distribution
-                                    .number_of_occurrences
+                                species_community.distribution.distribution
                             "
-                            :disabled="isNOOReadOnly"
-                            type="number"
+                            :disabled="isReadOnly"
                             class="form-control"
+                            rows="1"
                             placeholder=""
                         />
                     </div>
-                    <div
-                        v-if="!isReadOnly"
-                        class="col-sm-3 d-flex align-items-center"
-                    >
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="noo_auto"
-                                v-model="
-                                    species_community.distribution.noo_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="true"
-                                class="form-check-input"
-                                @click="switchNOO('true')"
-                            />
-                            <label class="form-check-label">auto</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="noo_manual"
-                                v-model="
-                                    species_community.distribution.noo_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="false"
-                                class="form-check-input"
-                                @click="switchNOO('false')"
-                            />
-                            <label class="form-check-label">manual</label>
-                        </div>
-                    </div>
                 </div>
                 <div class="row mb-3">
-                    <label for="" class="col-sm-4 col-form-label"
-                        >Extent of Occurrences:
-                        <HelpText
-                            v-if="species_community.distribution.eoo_auto"
-                            section_id="species_extent_of_occurrences"
-                    /></label>
-                    <div class="col-sm-4">
-                        <div class="input-group">
-                            <input
-                                v-if="species_community.distribution.eoo_auto"
-                                id="extent_of_occurrence"
-                                v-model="
-                                    species_community.area_occurrence_convex_hull_km2
-                                "
-                                :disabled="isEOOReadOnly"
-                                type="number"
-                                class="form-control"
-                                placeholder=""
-                            />
-                            <input
-                                v-else
-                                id="extent_of_occurrence"
-                                ref="extent_of_occurrence"
-                                v-model="
-                                    species_community.distribution
-                                        .extent_of_occurrences
-                                "
-                                :disabled="isEOOReadOnly"
-                                type="number"
-                                class="form-control"
-                                placeholder=""
-                            />
-                            <span
-                                id="area_of_occupancy_km2-addon"
-                                class="input-group-text"
-                                >km&#xb2;</span
-                            >
-                        </div>
-                    </div>
-                    <div
-                        v-if="!isReadOnly"
-                        class="col-sm-3 d-flex align-items-center"
+                    <label
+                        for=""
+                        class="col-sm-3 col-form-label"
+                        :class="isReadOnly ? '' : 'fw-bold'"
+                        >Region:
+                        <span v-if="!isReadOnly" class="text-danger"
+                            >*</span
+                        ></label
                     >
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="eoo_auto"
-                                v-model="
-                                    species_community.distribution.eoo_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="true"
-                                class="form-check-input"
-                                @click="switchEOO('true')"
-                            />
-                            <label class="form-check-label">auto</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="eoo_manual"
-                                v-model="
-                                    species_community.distribution.eoo_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="false"
-                                class="form-check-input"
-                                @click="switchEOO('false')"
-                            />
-                            <label class="form-check-label">manual</label>
-                        </div>
+                    <div class="col-sm-9">
+                        <select
+                            ref="regions_select"
+                            v-model="species_community.regions"
+                            :disabled="isReadOnly"
+                            class="form-select"
+                        >
+                            <option value="" selected disabled>
+                                Select region
+                            </option>
+                            <option
+                                v-for="option in region_list"
+                                :key="option.value"
+                                :value="option.value"
+                            >
+                                {{ option.text }}
+                            </option>
+                        </select>
                     </div>
                 </div>
-                <div class="row mb-3">
-                    <label for="" class="col-sm-4 col-form-label"
-                        >Area of Occupancy:</label
+                <div v-if="species_community.regions" class="row mb-3">
+                    <label
+                        for=""
+                        class="col-sm-3 col-form-label"
+                        :class="isReadOnly ? '' : 'fw-bold'"
+                        >District:
+                        <span v-if="!isReadOnly" class="text-danger"
+                            >*</span
+                        ></label
                     >
-                    <div class="col-sm-4">
-                        <div class="input-group">
-                            <input
-                                id="area_of_occupany"
-                                v-model="
-                                    species_community.distribution
-                                        .area_of_occupancy
-                                "
-                                :disabled="isReadOnly"
-                                type="number"
-                                class="form-control"
-                                placeholder=""
-                            />
-                            <span
-                                id="area_of_occupancy-addon"
-                                class="input-group-text"
-                                >2km x 2km</span
+                    <div class="col-sm-9">
+                        <select
+                            ref="districts_select"
+                            v-model="species_community.districts"
+                            :disabled="isReadOnly"
+                            class="form-select"
+                        >
+                            <option value="" selected disabled>
+                                Select district
+                            </option>
+                            <option
+                                v-for="option in district_list"
+                                :key="option.value"
+                                :value="option.value"
                             >
-                        </div>
+                                {{ option.text }}
+                            </option>
+                        </select>
                     </div>
                 </div>
-                <div class="row mb-3">
-                    <label for="" class="col-sm-4 col-form-label"
-                        >Actual Area of Occupancy:
-                        <HelpText
+                <template v-if="show_calculated_distribution_fields">
+                    <div class="row mb-3 pt-3">
+                        <label for="" class="col-sm-4 col-form-label"
+                            >Number of Occurrences:</label
+                        >
+                        <div
                             v-if="
-                                species_community.distribution.aoo_actual_auto
+                                showField(
+                                    species_community.distribution
+                                        .number_of_occurrences
+                                )
                             "
-                            section_id="species_actual_area_of_occupancy"
-                    /></label>
-                    <div class="col-sm-4">
-                        <div class="input-group">
+                            class="col-sm-4"
+                        >
                             <input
-                                v-if="
-                                    species_community.distribution
-                                        .aoo_actual_auto
-                                "
-                                id="area_of_occupancy_actual"
-                                v-model="
-                                    species_community.area_of_occupancy_km2
-                                "
-                                :disabled="isAOOActualReadOnly"
+                                v-if="species_community.distribution.noo_auto"
+                                id="no_of_occurrences"
+                                v-model="species_community.occurrence_count"
+                                :disabled="isNOOReadOnly"
                                 type="number"
-                                step="any"
                                 class="form-control"
                                 placeholder=""
-                                area-describedby=""
                             />
                             <input
                                 v-else
-                                id="area_of_occupancy_actual"
-                                ref="area_of_occupancy_actual"
+                                id="no_of_occurrences"
+                                ref="number_of_occurrences"
                                 v-model="
                                     species_community.distribution
-                                        .area_of_occupancy_actual
+                                        .number_of_occurrences
                                 "
-                                :disabled="isAOOActualReadOnly"
+                                :disabled="isNOOReadOnly"
                                 type="number"
-                                step="any"
                                 class="form-control"
                                 placeholder=""
                             />
-                            <span
-                                id="area_of_occupancy_km2-addon"
-                                class="input-group-text"
-                                >km&#xb2;</span
-                            >
+                        </div>
+                        <div
+                            v-if="!isReadOnly"
+                            class="col-sm-3 d-flex align-items-center"
+                        >
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="noo_auto"
+                                    v-model="
+                                        species_community.distribution.noo_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="true"
+                                    class="form-check-input"
+                                    @click="switchNOO('true')"
+                                />
+                                <label class="form-check-label">auto</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="noo_manual"
+                                    v-model="
+                                        species_community.distribution.noo_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="false"
+                                    class="form-check-input"
+                                    @click="switchNOO('false')"
+                                />
+                                <label class="form-check-label">manual</label>
+                            </div>
                         </div>
                     </div>
-                    <div
-                        v-if="!isReadOnly"
-                        class="col-sm-3 d-flex align-items-center"
-                    >
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="aoo_actual_auto"
-                                v-model="
-                                    species_community.distribution
-                                        .aoo_actual_auto
-                                "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="true"
-                                class="form-check-input"
-                                @click="switchAOOActual('true')"
-                            />
-                            <label class="form-check-label">auto</label>
+                    <div class="row mb-3">
+                        <label for="" class="col-sm-4 col-form-label"
+                            >Extent of Occurrences:
+                            <HelpText
+                                v-if="species_community.distribution.eoo_auto"
+                                section_id="species_extent_of_occurrences"
+                        /></label>
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <input
+                                    v-if="
+                                        species_community.distribution.eoo_auto
+                                    "
+                                    id="extent_of_occurrence"
+                                    v-model="
+                                        species_community.area_occurrence_convex_hull_km2
+                                    "
+                                    :disabled="isEOOReadOnly"
+                                    type="number"
+                                    class="form-control"
+                                    placeholder=""
+                                />
+                                <input
+                                    v-else
+                                    id="extent_of_occurrence"
+                                    ref="extent_of_occurrence"
+                                    v-model="
+                                        species_community.distribution
+                                            .extent_of_occurrences
+                                    "
+                                    :disabled="isEOOReadOnly"
+                                    type="number"
+                                    class="form-control"
+                                    placeholder=""
+                                />
+                                <span
+                                    id="area_of_occupancy_km2-addon"
+                                    class="input-group-text"
+                                    >km&#xb2;</span
+                                >
+                            </div>
                         </div>
-                        <div class="form-check form-check-inline">
-                            <input
-                                id="aoo_actual_manual"
-                                v-model="
+                        <div
+                            v-if="!isReadOnly"
+                            class="col-sm-3 d-flex align-items-center"
+                        >
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="eoo_auto"
+                                    v-model="
+                                        species_community.distribution.eoo_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="true"
+                                    class="form-check-input"
+                                    @click="switchEOO('true')"
+                                />
+                                <label class="form-check-label">auto</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="eoo_manual"
+                                    v-model="
+                                        species_community.distribution.eoo_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="false"
+                                    class="form-check-input"
+                                    @click="switchEOO('false')"
+                                />
+                                <label class="form-check-label">manual</label>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mb-3">
+                        <label for="" class="col-sm-4 col-form-label"
+                            >Area of Occupancy:</label
+                        >
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <input
+                                    id="area_of_occupany"
+                                    v-model="
+                                        species_community.distribution
+                                            .area_of_occupancy
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="number"
+                                    class="form-control"
+                                    placeholder=""
+                                />
+                                <span
+                                    id="area_of_occupancy-addon"
+                                    class="input-group-text"
+                                    >2km x 2km</span
+                                >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mb-3">
+                        <label for="" class="col-sm-4 col-form-label"
+                            >Actual Area of Occupancy:
+                            <HelpText
+                                v-if="
                                     species_community.distribution
                                         .aoo_actual_auto
                                 "
-                                :disabled="isReadOnly"
-                                type="radio"
-                                :value="false"
-                                class="form-check-input"
-                                @click="switchAOOActual('false')"
-                            />
-                            <label class="form-check-label">manual</label>
+                                section_id="species_actual_area_of_occupancy"
+                        /></label>
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <input
+                                    v-if="
+                                        species_community.distribution
+                                            .aoo_actual_auto
+                                    "
+                                    id="area_of_occupancy_actual"
+                                    v-model="
+                                        species_community.area_of_occupancy_km2
+                                    "
+                                    :disabled="isAOOActualReadOnly"
+                                    type="number"
+                                    step="any"
+                                    class="form-control"
+                                    placeholder=""
+                                    area-describedby=""
+                                />
+                                <input
+                                    v-else
+                                    id="area_of_occupancy_actual"
+                                    ref="area_of_occupancy_actual"
+                                    v-model="
+                                        species_community.distribution
+                                            .area_of_occupancy_actual
+                                    "
+                                    :disabled="isAOOActualReadOnly"
+                                    type="number"
+                                    step="any"
+                                    class="form-control"
+                                    placeholder=""
+                                />
+                                <span
+                                    id="area_of_occupancy_km2-addon"
+                                    class="input-group-text"
+                                    >km&#xb2;</span
+                                >
+                            </div>
+                        </div>
+                        <div
+                            v-if="!isReadOnly"
+                            class="col-sm-3 d-flex align-items-center"
+                        >
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="aoo_actual_auto"
+                                    v-model="
+                                        species_community.distribution
+                                            .aoo_actual_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="true"
+                                    class="form-check-input"
+                                    @click="switchAOOActual('true')"
+                                />
+                                <label class="form-check-label">auto</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                                <input
+                                    id="aoo_actual_manual"
+                                    v-model="
+                                        species_community.distribution
+                                            .aoo_actual_auto
+                                    "
+                                    :disabled="isReadOnly"
+                                    type="radio"
+                                    :value="false"
+                                    class="form-check-input"
+                                    @click="switchAOOActual('false')"
+                                />
+                                <label class="form-check-label">manual</label>
+                            </div>
                         </div>
                     </div>
-                </div>
-            </template>
-            <div
-                v-if="
-                    showField(
-                        species_community.distribution.number_of_iucn_locations
-                    )
-                "
-                class="row mb-3"
-            >
-                <label for="" class="col-sm-4 col-form-label"
-                    >Number of IUCN Locations:</label
-                >
-                <div class="col-sm-4">
-                    <input
-                        id="no_of_iucn_locations"
-                        v-model="
+                </template>
+                <div
+                    v-if="
+                        showField(
                             species_community.distribution
                                 .number_of_iucn_locations
-                        "
-                        :disabled="isReadOnly"
-                        type="number"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div
-                v-if="
-                    showField(
-                        species_community.distribution
-                            .number_of_iucn_subpopulations
-                    )
-                "
-                class="row mb-1"
-            >
-                <label for="" class="col-sm-4 col-form-label"
-                    >Number of IUCN Sub-populations:</label
+                        )
+                    "
+                    class="row mb-3"
                 >
-                <div class="col-sm-4">
-                    <input
-                        id="number_of_iucn_subpopulations"
-                        v-model="
+                    <label for="" class="col-sm-4 col-form-label"
+                        >Number of IUCN Locations:</label
+                    >
+                    <div class="col-sm-4">
+                        <input
+                            id="no_of_iucn_locations"
+                            v-model="
+                                species_community.distribution
+                                    .number_of_iucn_locations
+                            "
+                            :disabled="isReadOnly"
+                            type="number"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
+                </div>
+                <div
+                    v-if="
+                        showField(
                             species_community.distribution
                                 .number_of_iucn_subpopulations
-                        "
-                        :disabled="isReadOnly"
-                        type="number"
-                        class="form-control"
-                        placeholder=""
-                    />
+                        )
+                    "
+                    class="row mb-1"
+                >
+                    <label for="" class="col-sm-4 col-form-label"
+                        >Number of IUCN Sub-populations:</label
+                    >
+                    <div class="col-sm-4">
+                        <input
+                            id="number_of_iucn_subpopulations"
+                            v-model="
+                                species_community.distribution
+                                    .number_of_iucn_subpopulations
+                            "
+                            :disabled="isReadOnly"
+                            type="number"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-        </FormSection>
-        <BasicConservationStatus
-            v-if="
-                species_community.conservation_status &&
-                (conservation_status_public || is_internal)
-            "
-            :conservation_status="species_community.conservation_status"
-            :is_internal="is_internal"
-        />
-        <!-- <FormSection v-if="conservation_attributes_public || is_internal" :formCollapse="false"
+            </FormSection>
+
+            <BasicConservationStatus
+                v-if="
+                    species_community.conservation_status &&
+                    (conservation_status_public || is_internal)
+                "
+                :conservation_status="species_community.conservation_status"
+                :is_internal="is_internal"
+            />
+            <!-- <FormSection v-if="conservation_attributes_public || is_internal" :formCollapse="false"
             label="Conservation Attributes" :Index="conservationBody">
             <div class="row mb-3">
                 <label for="" class="col-sm-3 col-form-label">Habitat/Growth Form:</label>
@@ -975,195 +996,200 @@
                 </div>
             </div>
         </FormSection> -->
-        <FormSection
-            v-if="is_internal"
-            :form-collapse="false"
-            label="General"
-            :Index="generalBody"
-        >
-            <div class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label"
-                    >Department File Numbers:</label
-                >
-                <div class="col-sm-9">
-                    <input
-                        id="department_file_numbers"
-                        v-model="species_community.department_file_numbers"
-                        :disabled="isReadOnly"
-                        type="text"
-                        class="form-control"
-                        placeholder=""
-                    />
-                </div>
-            </div>
-            <div class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label"
-                    >Last data curation date:
-                </label>
-                <div class="col-sm-9">
-                    <input
-                        ref="last_data_curration_date"
-                        v-model="species_community.last_data_curration_date"
-                        :disabled="isReadOnly"
-                        type="date"
-                        class="form-control"
-                        name="last_data_curration_date"
-                        @change="checkDate()"
-                    />
-                </div>
-            </div>
-            <div class="row mb-3">
-                <label
-                    for="conservation_plan_exists"
-                    class="col-sm-3 col-form-label"
-                    >Conservation Plan Exists:
-                </label>
-                <div class="col-sm-9">
-                    <label for="conservation_plan_exists" class="me-2"
-                        >No</label
-                    >
-                    <input
-                        id="conservation_plan_exists"
-                        v-model="species_community.conservation_plan_exists"
-                        :disabled="isReadOnly"
-                        type="radio"
-                        :value="false"
-                        class="form-check-input me-2"
-                    />
-                    <label for="conservation_plan_exists" class="me-2"
-                        >Yes</label
-                    >
-                    <input
-                        id="conservation_plan_exists"
-                        v-model="species_community.conservation_plan_exists"
-                        :disabled="isReadOnly"
-                        type="radio"
-                        :value="true"
-                        class="form-check-input"
-                        @change="focusConservationPlanReference"
-                    />
-                </div>
-            </div>
-            <div
-                v-if="species_community.conservation_plan_exists"
-                class="row mb-3"
+            <FormSection
+                v-if="is_internal"
+                :form-collapse="false"
+                label="General"
+                :Index="generalBody"
             >
-                <label
-                    for="conservation_plan_reference"
-                    class="col-sm-3 col-form-label"
-                    >Conservation Plan Reference / Location:
-                </label>
-                <div class="col-sm-9">
-                    <input
-                        ref="conservation_plan_reference"
-                        v-model="species_community.conservation_plan_reference"
-                        :disabled="isReadOnly"
-                        type="text"
-                        class="form-control"
-                        name="conservation_plan_reference"
-                        @change="checkDate()"
-                    />
+                <div class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Department File Numbers:</label
+                    >
+                    <div class="col-sm-9">
+                        <input
+                            id="department_file_numbers"
+                            v-model="species_community.department_file_numbers"
+                            :disabled="isReadOnly"
+                            type="text"
+                            class="form-control"
+                            placeholder=""
+                        />
+                    </div>
                 </div>
-            </div>
-            <div class="row mb-3">
-                <label for="" class="col-sm-3 col-form-label">Comment:</label>
-                <div class="col-sm-9">
-                    <textarea
-                        id="comment"
-                        v-model="species_community.comment"
-                        :disabled="isReadOnly"
-                        class="form-control"
-                        rows="3"
-                        placeholder=""
-                    />
+                <div class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Last data curation date:
+                    </label>
+                    <div class="col-sm-9">
+                        <input
+                            ref="last_data_curation_date"
+                            v-model="species_community.last_data_curation_date"
+                            :disabled="isReadOnly"
+                            type="date"
+                            class="form-control"
+                            name="last_data_curation_date"
+                            :max="new Date().toISOString().split('T')[0]"
+                            @change="checkDate()"
+                        />
+                    </div>
                 </div>
-            </div>
-        </FormSection>
-        <FormSection
-            v-if="is_internal"
-            :form-collapse="false"
-            label="Publishing"
-            Index="publishing"
-        >
-            <div class="row mb-3">
-                <label
-                    for="distribution_publishing"
-                    class="col-sm-3 col-form-label"
-                    >Distribution:
-                </label>
-                <div class="col-sm-9">
-                    <div class="form-check form-check-inline">
-                        <label for="distribution_publishing">Private</label>
+                <div class="row mb-3">
+                    <label
+                        for="conservation_plan_exists"
+                        class="col-sm-3 col-form-label"
+                        >Conservation Plan Exists:
+                    </label>
+                    <div class="col-sm-9">
+                        <label for="conservation_plan_exists" class="me-2"
+                            >No</label
+                        >
                         <input
-                            id="distribution_publishing"
-                            v-model="
-                                species_community.publishing_status
-                                    .distribution_public
-                            "
-                            :disabled="isReadOnly || !isPublic || !isActive"
+                            id="conservation_plan_exists"
+                            v-model="species_community.conservation_plan_exists"
+                            :disabled="isReadOnly"
                             type="radio"
                             :value="false"
                             class="form-check-input me-2"
                         />
-                    </div>
-                    <div class="form-check form-check-inline">
-                        <label for="distribution_publishing">Public</label>
+                        <label for="conservation_plan_exists" class="me-2"
+                            >Yes</label
+                        >
                         <input
-                            id="distribution_publishing"
-                            v-model="
-                                species_community.publishing_status
-                                    .distribution_public
-                            "
-                            :disabled="isReadOnly || !isPublic || !isActive"
+                            id="conservation_plan_exists"
+                            v-model="species_community.conservation_plan_exists"
+                            :disabled="isReadOnly"
                             type="radio"
                             :value="true"
                             class="form-check-input"
+                            @change="focusConservationPlanReference"
                         />
                     </div>
                 </div>
-            </div>
-            <div class="row mb-3">
-                <label
-                    for="conservation_status_publishing"
-                    class="col-sm-3 col-form-label"
-                    >Conservation Status:
-                </label>
-                <div class="col-sm-9">
-                    <div class="form-check form-check-inline">
-                        <label for="conservation_status_publishing"
-                            >Private</label
-                        >
+                <div
+                    v-if="species_community.conservation_plan_exists"
+                    class="row mb-3"
+                >
+                    <label
+                        for="conservation_plan_reference"
+                        class="col-sm-3 col-form-label"
+                        >Conservation Plan Reference / Location:
+                    </label>
+                    <div class="col-sm-9">
                         <input
-                            id="conservation_status_publishing"
+                            ref="conservation_plan_reference"
                             v-model="
-                                species_community.publishing_status
-                                    .conservation_status_public
+                                species_community.conservation_plan_reference
                             "
-                            :disabled="isReadOnly || !isPublic || !isActive"
-                            type="radio"
-                            :value="false"
-                            class="form-check-input me-2"
+                            :disabled="isReadOnly"
+                            type="text"
+                            class="form-control"
+                            name="conservation_plan_reference"
+                            @change="checkDate()"
                         />
                     </div>
-                    <div class="form-check form-check-inline">
-                        <label for="conservation_status_publishing"
-                            >Public</label
-                        >
-                        <input
-                            id="conservation_status_publishing"
-                            v-model="
-                                species_community.publishing_status
-                                    .conservation_status_public
-                            "
-                            :disabled="isReadOnly || !isPublic || !isActive"
-                            type="radio"
-                            :value="true"
-                            class="form-check-input"
+                </div>
+                <div class="row mb-3">
+                    <label for="" class="col-sm-3 col-form-label"
+                        >Comment:</label
+                    >
+                    <div class="col-sm-9">
+                        <textarea
+                            id="comment"
+                            v-model="species_community.comment"
+                            :disabled="isReadOnly"
+                            class="form-control"
+                            rows="3"
+                            placeholder=""
                         />
                     </div>
                 </div>
-            </div>
-            <!-- <div class="row mb-3">
+            </FormSection>
+            <FormSection
+                v-if="is_internal"
+                :form-collapse="false"
+                label="Publishing"
+                Index="publishing"
+            >
+                <div class="row mb-3">
+                    <label
+                        for="distribution_publishing"
+                        class="col-sm-3 col-form-label"
+                        >Distribution:
+                    </label>
+                    <div class="col-sm-9">
+                        <div class="form-check form-check-inline">
+                            <label for="distribution_publishing">Private</label>
+                            <input
+                                id="distribution_publishing"
+                                v-model="
+                                    species_community.publishing_status
+                                        .distribution_public
+                                "
+                                :disabled="isReadOnly || !isPublic || !isActive"
+                                type="radio"
+                                :value="false"
+                                class="form-check-input me-2"
+                            />
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <label for="distribution_publishing">Public</label>
+                            <input
+                                id="distribution_publishing"
+                                v-model="
+                                    species_community.publishing_status
+                                        .distribution_public
+                                "
+                                :disabled="isReadOnly || !isPublic || !isActive"
+                                type="radio"
+                                :value="true"
+                                class="form-check-input"
+                            />
+                        </div>
+                    </div>
+                </div>
+                <div class="row mb-3">
+                    <label
+                        for="conservation_status_publishing"
+                        class="col-sm-3 col-form-label"
+                        >Conservation Status:
+                    </label>
+                    <div class="col-sm-9">
+                        <div class="form-check form-check-inline">
+                            <label for="conservation_status_publishing"
+                                >Private</label
+                            >
+                            <input
+                                id="conservation_status_publishing"
+                                v-model="
+                                    species_community.publishing_status
+                                        .conservation_status_public
+                                "
+                                :disabled="isReadOnly || !isPublic || !isActive"
+                                type="radio"
+                                :value="false"
+                                class="form-check-input me-2"
+                            />
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <label for="conservation_status_publishing"
+                                >Public</label
+                            >
+                            <input
+                                id="conservation_status_publishing"
+                                v-model="
+                                    species_community.publishing_status
+                                        .conservation_status_public
+                                "
+                                :disabled="isReadOnly || !isPublic || !isActive"
+                                type="radio"
+                                :value="true"
+                                class="form-check-input"
+                            />
+                        </div>
+                    </div>
+                </div>
+                <!-- <div class="row mb-3">
                 <label for="conservation_attributes_publishing" class="col-sm-3 col-form-label">Conservation Attributes:
                 </label>
                 <div class="col-sm-9">
@@ -1181,63 +1207,70 @@
                     </div>
                 </div>
             </div> -->
-            <div class="row mb-3">
-                <label for="threats_publishing" class="col-sm-3 col-form-label"
-                    >Threats:
-                </label>
-                <div class="col-sm-9">
-                    <div class="form-check form-check-inline">
-                        <label for="threats_publishing">Private</label>
-                        <input
-                            id="threats_publishing"
-                            v-model="
-                                species_community.publishing_status
-                                    .threats_public
-                            "
-                            :disabled="isReadOnly || !isPublic || !isActive"
-                            type="radio"
-                            :value="false"
-                            class="form-check-input me-2"
-                        />
+                <div class="row mb-3">
+                    <label
+                        for="threats_publishing"
+                        class="col-sm-3 col-form-label"
+                        >Threats:
+                    </label>
+                    <div class="col-sm-9">
+                        <div class="form-check form-check-inline">
+                            <label for="threats_publishing">Private</label>
+                            <input
+                                id="threats_publishing"
+                                v-model="
+                                    species_community.publishing_status
+                                        .threats_public
+                                "
+                                :disabled="isReadOnly || !isPublic || !isActive"
+                                type="radio"
+                                :value="false"
+                                class="form-check-input me-2"
+                            />
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <label for="threats_publishing">Public</label>
+                            <input
+                                id="threats_publishing"
+                                v-model="
+                                    species_community.publishing_status
+                                        .threats_public
+                                "
+                                :disabled="isReadOnly || !isPublic || !isActive"
+                                type="radio"
+                                :value="true"
+                                class="form-check-input"
+                            />
+                        </div>
                     </div>
-                    <div class="form-check form-check-inline">
-                        <label for="threats_publishing">Public</label>
-                        <input
-                            id="threats_publishing"
-                            v-model="
-                                species_community.publishing_status
-                                    .threats_public
-                            "
+                </div>
+                <div class="row mb-3">
+                    <div class="col-sm-12">
+                        <button
+                            v-if="!updatingPublishing"
                             :disabled="isReadOnly || !isPublic || !isActive"
-                            type="radio"
-                            :value="true"
-                            class="form-check-input"
-                        />
+                            class="btn btn-primary btn-sm float-end"
+                            @click.prevent="updatePublishingDetails()"
+                        >
+                            Update
+                        </button>
+                        <button
+                            v-else
+                            disabled
+                            class="float-end btn btn-primary"
+                        >
+                            Updating
+                            <span
+                                class="spinner-border spinner-border-sm"
+                                role="status"
+                                aria-hidden="true"
+                            ></span>
+                            <span class="visually-hidden">Loading...</span>
+                        </button>
                     </div>
                 </div>
-            </div>
-            <div class="row mb-3">
-                <div class="col-sm-12">
-                    <button
-                        v-if="!updatingPublishing"
-                        :disabled="isReadOnly || !isPublic || !isActive"
-                        class="btn btn-primary btn-sm float-end"
-                        @click.prevent="updatePublishingDetails()"
-                    >
-                        Update
-                    </button>
-                    <button v-else disabled class="float-end btn btn-primary">
-                        Updating
-                        <span
-                            class="spinner-border spinner-border-sm"
-                            role="status"
-                            aria-hidden="true"
-                        ></span>
-                        <span class="visually-hidden">Loading...</span>
-                    </button>
-                </div>
-            </div>
-        </FormSection>
+            </FormSection>
+        </fieldset>
     </div>
 </template>
 
@@ -1255,6 +1288,7 @@ export default {
         BasicConservationStatus,
         HelpText,
     },
+    emits: ['save-species-community'],
     props: {
         species_community: {
             type: Object,
@@ -1381,7 +1415,9 @@ export default {
             //---else the normal serializer value
             else {
                 let action = this.$route.query.action;
-                if (
+                if (action === 'view') {
+                    return true;
+                } else if (
                     action === 'edit' &&
                     this.species_community &&
                     this.species_community.user_edit_mode
@@ -1392,6 +1428,13 @@ export default {
                 }
             }
         },
+        scientificNameIsReadOnly: function () {
+            return (
+                (this.isReadOnly ||
+                    this.species_community.processing_status === 'Active') &&
+                !this.rename_species
+            );
+        },
         isActive: function () {
             return this.species_community.processing_status === 'Active'
                 ? true
@@ -1809,11 +1852,11 @@ export default {
         },
         checkDate: function () {
             let vm = this;
-            if (vm.$refs.last_data_curration_date.value) {
-                vm.species_community.last_data_curration_date =
-                    vm.$refs.last_data_curration_date.value;
+            if (vm.$refs.last_data_curation_date.value) {
+                vm.species_community.last_data_curation_date =
+                    vm.$refs.last_data_curation_date.value;
             } else {
-                vm.species_community.last_data_curration_date = null;
+                vm.species_community.last_data_curation_date = null;
             }
         },
         initialiseScientificNameLookup: function () {
@@ -1865,11 +1908,10 @@ export default {
                     vm.genus = e.params.data.genera_name;
                     vm.name_authority = e.params.data.name_authority;
                     vm.name_comments = e.params.data.name_comments;
-                    // vm.filterFloraScientificName = data;
-                    // sessionStorage.setItem("filterFloraScientificNameText", e.params.data.text);
+                    vm.$emit('save-species-community');
                 })
                 .on('select2:unselect', function () {
-                    vm.species_community.taxonomy_id = '';
+                    vm.species_community.taxonomy_id = null;
                     vm.species_display = '';
                     vm.conservation_category = '';
                     vm.conservation_criteria = '';
@@ -1880,6 +1922,7 @@ export default {
                     vm.phylogenetic_group = '';
                     (vm.family = ''), (vm.genus = ''), (vm.name_authority = '');
                     vm.name_comments = '';
+                    vm.$emit('save-species-community');
                 })
                 .on('select2:open', function () {
                     const searchField = $(
@@ -1893,7 +1936,6 @@ export default {
         },
         loadTaxonomydetails: function () {
             let vm = this;
-            //console.log(vm.taxon_names);
 
             if (vm.species_community.taxonomy_details != null) {
                 var newOption = new Option(
@@ -2089,7 +2131,15 @@ export default {
         chainedSelectDistricts: function (regions, action) {
             let vm = this;
             if (action != 'fetch') {
-                vm.species_community.districts = []; //-----to remove the previous selection
+                // Remove any districts that are not in the selected regions
+                var selected_districts = vm.species_community.districts;
+                for (let i = 0; i < selected_districts.length; i++) {
+                    var district = selected_districts[i];
+                    var region = vm.searchList(district, vm.region_list);
+                    if (region == []) {
+                        vm.species_community.districts.splice(i, 1);
+                    }
+                }
             }
             vm.district_list = [];
             if (regions) {
@@ -2099,7 +2149,7 @@ export default {
                         vm.region_list
                     ).districts;
                     if (api_districts.length > 0) {
-                        for (var i = 0; i < api_districts.length; i++) {
+                        for (let i = 0; i < api_districts.length; i++) {
                             this.district_list.push({
                                 text: api_districts[i].name,
                                 value: api_districts[i].id,
@@ -2125,6 +2175,7 @@ export default {
                         vm.species_community.regions,
                         'select'
                     );
+                    vm.$emit('save-species-community');
                 })
                 .on('select2:unselect', function (e) {
                     var selected = $(e.currentTarget);
@@ -2133,6 +2184,7 @@ export default {
                         vm.species_community.regions,
                         'deselect'
                     );
+                    vm.$emit('save-species-community');
                 });
         },
         initialiseDistrictSelect: function () {
@@ -2147,10 +2199,12 @@ export default {
                 .on('select2:select', function (e) {
                     var selected = $(e.currentTarget);
                     vm.species_community.districts = selected.val();
+                    vm.$emit('save-species-community');
                 })
                 .on('select2:unselect', function (e) {
                     var selected = $(e.currentTarget);
                     vm.species_community.districts = selected.val();
+                    vm.$emit('save-species-community');
                 });
         },
         enablePopovers: function () {
@@ -2161,6 +2215,12 @@ export default {
                 return new bootstrap.Popover(popoverTriggerEl);
             });
         },
+        saveSpeciesCommunity: function (e) {
+            // For the select2 we emit after the select/unselect event as otherwise the value is not yet updated
+            if (!e.target.className.includes('select2-')) {
+                this.$emit('save-species-community');
+            }
+        },
     },
 };
 </script>
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/species_split/species_split_profile.vue b/boranga/frontend/boranga/src/components/common/species_communities/species_split/species_split_profile.vue
index 3c2991ac..84a29468 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/species_split/species_split_profile.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/species_split/species_split_profile.vue
@@ -1585,16 +1585,17 @@
 
             <div class="row mb-3">
                 <label for="" class="col-sm-3 control-label"
-                    >Last data curration date:
+                    >Last data curation date:
                 </label>
                 <div class="col-sm-8">
                     <input
-                        ref="last_data_curration_date"
-                        v-model="species_community.last_data_curration_date"
+                        ref="last_data_curation_date"
+                        v-model="species_community.last_data_curation_date"
                         :disabled="isReadOnly"
                         type="date"
                         class="form-control"
-                        name="last_data_curration_date"
+                        name="last_data_curation_date"
+                        :max="new Date().toISOString().split('T')[0]"
                         @change="checkDate()"
                     />
                 </div>
@@ -1999,11 +2000,11 @@ export default {
         },
         checkDate: function () {
             let vm = this;
-            if (vm.$refs.last_data_curration_date.value) {
-                vm.species_community.last_data_curration_date =
-                    vm.$refs.last_data_curration_date.value;
+            if (vm.$refs.last_data_curation_date.value) {
+                vm.species_community.last_data_curation_date =
+                    vm.$refs.last_data_curation_date.value;
             } else {
-                vm.species_community.last_data_curration_date = null;
+                vm.species_community.last_data_curation_date = null;
             }
         },
         initialiseScientificNameLookup: function () {
diff --git a/boranga/frontend/boranga/src/components/form_species_communities.vue b/boranga/frontend/boranga/src/components/form_species_communities.vue
index 085ec23e..4028df45 100755
--- a/boranga/frontend/boranga/src/components/form_species_communities.vue
+++ b/boranga/frontend/boranga/src/components/form_species_communities.vue
@@ -79,6 +79,7 @@
                         :species_community="species_community"
                         :species_community_original="species_community_original"
                         :is_readonly="is_readonly"
+                        @save-species-community="saveSpeciesCommunity()"
                     >
                     </Community>
                     <Species
@@ -90,6 +91,7 @@
                         :species_community_original="species_community_original"
                         :is_readonly="is_readonly"
                         :rename_species="rename_species"
+                        @save-species-community="saveSpeciesCommunity()"
                     >
                     </Species>
                 </div>
@@ -216,6 +218,7 @@ export default {
             default: false,
         },
     },
+    emits: ['save-species-community'],
     data: function () {
         return {
             profileBody: 'profileBody' + uuid(),
@@ -281,6 +284,9 @@ export default {
             let vm = this;
             vm.$parent.refreshSpeciesCommunity();
         },
+        saveSpeciesCommunity: function () {
+            this.$emit('save-species-community');
+        },
     },
 };
 </script>
diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue b/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
index 9e36ab33..7596dc6e 100755
--- a/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
+++ b/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
@@ -196,7 +196,31 @@
                             </div>
                         </div>
                     </div>
-                    <div v-if="hasUserEditMode" class="card-body border-top">
+                    <div v-if="inViewMode" class="card-body border-top">
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <div class="row mb-2">
+                                    <div class="col-sm-12">
+                                        <strong>Action</strong><br />
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-sm-12">
+                                        <button
+                                            class="btn btn-primary w-100"
+                                            @click.prevent="activateEditMode()"
+                                        >
+                                            Edit</button
+                                        ><br />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div
+                        v-else-if="hasUserEditMode"
+                        class="card-body border-top"
+                    >
                         <div class="row">
                             <div class="col-sm-12">
                                 <div class="row mb-2">
@@ -350,6 +374,8 @@
                                         species_community.processing_status ==
                                             'Discarded'
                                     "
+                                    @save-species-community="save_wo()"
+                                    :key="formKey"
                                 >
                                 </ProposalSpeciesCommunities>
                                 <input
@@ -631,6 +657,7 @@ export default {
             species_community: null,
             species_community_original: null,
             form: null,
+            formKey: 0,
             savingSpeciesCommunity: false,
             saveExitSpeciesCommunity: false,
             submitSpeciesCommunity: false,
@@ -784,6 +811,9 @@ export default {
                 ? `Reinstate Image for ${this.display_name}`
                 : '';
         },
+        inViewMode: function () {
+            return this.$route.query.action === 'view';
+        },
     },
     created: function () {
         if (!this.species_community) {
@@ -1116,7 +1146,11 @@ export default {
         },
         save: async function () {
             let vm = this;
-            var missing_data = vm.can_submit('');
+            let check_action =
+                this.species_community.processing_status === 'Active'
+                    ? 'submit'
+                    : '';
+            var missing_data = vm.can_submit(check_action);
             vm.isSaved = false;
             if (missing_data != true) {
                 swal.fire({
@@ -1181,7 +1215,11 @@ export default {
         },
         save_exit: async function () {
             let vm = this;
-            var missing_data = vm.can_submit('');
+            let check_action =
+                this.species_community.processing_status === 'Active'
+                    ? 'submit'
+                    : '';
+            var missing_data = vm.can_submit(check_action);
             if (missing_data != true) {
                 swal.fire({
                     title: 'Please fix following errors before saving',
@@ -1206,7 +1244,6 @@ export default {
             });
         },
         save_before_submit: async function () {
-            //console.log('save before submit');
             let vm = this;
             vm.saveError = false;
 
@@ -1257,7 +1294,6 @@ export default {
 
                 sc_no_ps.publishing_status = undefined;
                 sco_no_ps.publishing_status = undefined;
-
                 if (helpers.checkForChange(sco_no_ps, sc_no_ps)) {
                     return ['No changes made'];
                 }
@@ -1383,9 +1419,6 @@ export default {
                                             helpers.copyObject(
                                                 vm.species_community
                                             );
-                                        vm.$router.push({
-                                            name: 'internal-species-communities-dash',
-                                        });
                                     },
                                     (err) => {
                                         swal.fire({
@@ -1414,14 +1447,47 @@ export default {
         },
         save_wo: function () {
             let vm = this;
-            let formData = new FormData(vm.form);
-            fetch(vm.proposal_form_url, {
+            let check_action =
+                this.species_community.processing_status === 'Active'
+                    ? 'submit'
+                    : '';
+            var missing_data = vm.can_submit(check_action);
+            if (missing_data != true) {
+                swal.fire({
+                    title: 'Please fix following errors before saving',
+                    text: missing_data,
+                    icon: 'error',
+                    customClass: {
+                        confirmButton: 'btn btn-primary',
+                    },
+                });
+                //vm.paySubmitting=false;
+                return false;
+            }
+            fetch(vm.species_community_form_url, {
                 method: 'POST',
-                body: formData,
+                body: JSON.stringify(vm.species_community),
                 headers: {
                     'Content-Type': 'application/json',
                 },
-            });
+            }).then(
+                () => {
+                    vm.species_community_original = helpers.copyObject(
+                        vm.species_community
+                    ); //update original after save
+                },
+                (err) => {
+                    var errorText = helpers.apiVueResourceError(err);
+                    swal.fire({
+                        title: 'Save Error',
+                        text: errorText,
+                        icon: 'error',
+                        customClass: {
+                            confirmButton: 'btn btn-primary',
+                        },
+                    });
+                }
+            );
         },
         refreshFromResponse: async function (response) {
             let vm = this;
@@ -1680,6 +1746,19 @@ export default {
         onImageLoad: function () {
             this.downloadingImage = false;
         },
+        activateEditMode: function () {
+            this.$router
+                .push({
+                    name: 'internal-species-communities',
+                    query: {
+                        group_type_name: this.$route.query.group_type_name,
+                        action: 'edit',
+                    },
+                })
+                .then(() => {
+                    this.formKey++;
+                });
+        },
     },
 };
 </script>
diff --git a/boranga/migrations/0504_rename_last_data_curration_date_community_last_data_curation_date_and_more.py b/boranga/migrations/0504_rename_last_data_curration_date_community_last_data_curation_date_and_more.py
new file mode 100644
index 00000000..a6dbe0f4
--- /dev/null
+++ b/boranga/migrations/0504_rename_last_data_curration_date_community_last_data_curation_date_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.10 on 2025-01-03 07:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0503_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="community",
+            old_name="last_data_curration_date",
+            new_name="last_data_curation_date",
+        ),
+        migrations.RenameField(
+            model_name="species",
+            old_name="last_data_curration_date",
+            new_name="last_data_curation_date",
+        ),
+    ]
diff --git a/boranga/migrations/0505_alter_communitydocument__file_and_more.py b/boranga/migrations/0505_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..bdde2dcd
--- /dev/null
+++ b/boranga/migrations/0505_alter_communitydocument__file_and_more.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.10 on 2025-01-03 08:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boranga', '0504_rename_last_data_curration_date_community_last_data_curation_date_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='conservationstatus',
+            name='comment',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/boranga/migrations/0506_otherconservationassessmentlist_and_more.py b/boranga/migrations/0506_otherconservationassessmentlist_and_more.py
new file mode 100644
index 00000000..4c44c8ab
--- /dev/null
+++ b/boranga/migrations/0506_otherconservationassessmentlist_and_more.py
@@ -0,0 +1,37 @@
+# Generated by Django 5.0.10 on 2025-01-06 06:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0505_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="OtherConservationAssessmentList",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("archived", models.BooleanField(default=False)),
+                ("code", models.CharField(max_length=64)),
+                ("label", models.CharField(max_length=512)),
+                ("applies_to_flora", models.BooleanField(default=False)),
+                ("applies_to_fauna", models.BooleanField(default=False)),
+                ("applies_to_communities", models.BooleanField(default=False)),
+            ],
+            options={
+                "verbose_name": "Other Conservation Assessment",
+                "ordering": ["code"],
+            },
+        ),
+    ]
diff --git a/boranga/migrations/0507_remove_conservationstatus_other_conservation_assessment_and_more.py b/boranga/migrations/0507_remove_conservationstatus_other_conservation_assessment_and_more.py
new file mode 100644
index 00000000..71b14ce6
--- /dev/null
+++ b/boranga/migrations/0507_remove_conservationstatus_other_conservation_assessment_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.10 on 2025-01-06 06:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0506_otherconservationassessmentlist_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="other_conservation_assessment",
+        ),
+    ]
diff --git a/boranga/migrations/0508_conservationstatus_other_conservation_assessment_and_more.py b/boranga/migrations/0508_conservationstatus_other_conservation_assessment_and_more.py
new file mode 100644
index 00000000..1668a784
--- /dev/null
+++ b/boranga/migrations/0508_conservationstatus_other_conservation_assessment_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.0.10 on 2025-01-06 06:45
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "boranga",
+            "0507_remove_conservationstatus_other_conservation_assessment_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="conservationstatus",
+            name="other_conservation_assessment",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="boranga.otherconservationassessmentlist",
+            ),
+        ),
+    ]