diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37fc895a4805816d412f3e45df285796478ddad5..e5c075358643aa2d205d642b4f97ff7910c3fc70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,14 @@ CHANGELOG
 - [Documentation] Mise à jour de la documentation utilisateur.
 - [Accessibilité] Mise à jour du schéma pluriannuel et du plan d'actions 2024.
 - [Plan du site] Mise à jour des pages liées à l'accessibilité.
+- [Traitements] Déplacement des champs finalités et état.
+- [Traitements] Modification du champ finalités en sélecteur.
 - [Traitements] Déplacement du consentement demandé et du format du bloc détails au bloc informations générales.
-- [Traitements] Repositionnement des mesures de sécurité et confidentialité par ordre alphabétique.
+- [Traitements] Déplacement des critères spécifiques par ordre alphabétique.
+- [Traitements] Le critère « Croisement de données » est renommé en « Croisement d’ensemble de données ».
+- [Traitements] Le critère « Décisions automatisées avec effet » est renommé en « Décision automatique avec effet juridique ».
+- [Traitements] Le critère « Exclusion automatique d'un service » est renommé en « Exclusion du bénéfice d’un droit, d’un service ou contrat ».
+- [Traitements] Déplacement des mesures de sécurité et confidentialité par ordre alphabétique.
 - [Indice de maturité] Modification du bouton de modification pour s'afficher que s'il y a des préconisations dans la synthèse d'un indice de maturité.
 - [Bilan] Modification de l'affichage des données du dernier indice de maturité dans le bilan.
 - [AIPD] Modification des dates des avis des acteurs pour ne rien afficher par défaut dans le PDF d'une AIPD.
diff --git a/config/domain/registry/translations/messages.fr.yaml b/config/domain/registry/translations/messages.fr.yaml
index 97aa564286a4b2ebbab0057e8863c3e4b9d55975..82a5aa5882448a734d64c933cd469b30ee4596b3 100644
--- a/config/domain/registry/translations/messages.fr.yaml
+++ b/config/domain/registry/translations/messages.fr.yaml
@@ -49,13 +49,13 @@ registry:
             data_category_other: Autres catégories
             recipient_category: Catégorie de destinataires
             exempt_AIPD: Est exempté d'AIPD
-            systematic_monitoring: Surveillance systématique
             large_scale_collection: Collecte à large échelle
-            vulnerable_people: Personnes vulnérables
-            data_crossing: Croisement de données
+            data_crossing: Croisement d’ensemble de données
+            automated_decisions_with_legal_effect: Décision automatique avec effet juridique
             evaluation_or_rating: Évaluation ou notation
-            automated_decisions_with_legal_effect: Décisions automatisées avec effet
-            automatic_exclusion_service : Exclusion automatique d'un service
+            automatic_exclusion_service : Exclusion du bénéfice d’un droit, d’un service ou contrat
+            vulnerable_people: Personnes vulnérables
+            systematic_monitoring: Surveillance systématique
             innovative_use: Usage innovant
             concerned_people: Personnes concernées
             concerned_people_particular: Particuliers
diff --git a/docs/docutilisateur.md b/docs/docutilisateur.md
index c817466b820e2cb3faec3e2a1a9cdabc5287d9b0..35f415e6d5c52237cb80b0b43486a511af2622b6 100644
--- a/docs/docutilisateur.md
+++ b/docs/docutilisateur.md
@@ -226,13 +226,13 @@ Dans la destination, il est possible de renseigner les éléments suivants :
 
 Un ou plusieurs traitements spécifiques vont peut-être conditionner une analyse d’impact, notamment s'ils sont croisés avec des données sensibles. Il est possible de renseigner les éléments suivants :
 * **Est exempté d'AIPD** : Si le traitement est exempté, il n'y aura pas d'indication alertant de la nécessité de réaliser une AIPD. Il est cependant toujours possible d'en réaliser une si souhaité ;
-* **Surveillance systématique de personnes** : Par exemple, télésurveillance... ;
 * **Collecte à large échelle** : Vise à traiter un volume considérable de données à caractère personnel, par exemple au niveau régional... ;
-* **Personnes vulnérables** : Personnes âgées, enfant de moins de 15 ans, personne en situation de handicap, patients, employés... ;
-* **Croisement de données** : Croisement ou combinaison d’ensemble de données ;
+* **Croisement d’ensemble de données** : Croisement ou combinaison d’ensemble de données ;
+* **Décision automatique avec effet juridique** : Décision automatique sans supervision humaine pouvant par exemple, exclure ou discriminer une personne d'un droit ;
 * **Évaluation ou notation** : Possibilité d'utiliser des données pour évaluer, noter, prédire ou établir le profil d'une personne sur des aspects concernant le rendement au travail, la santé, la situation économique, les préférences, le comportement... ;
-* **Décisions automatisées avec effet** : Décision automatique sans supervision humaine pouvant par exemple, exclure ou discriminer une personne d'un droit ;
-* **Exclusion automatique d'un service** : Décision automatique sans supervision humaine excluant l'accès à un service ou à un contrat ;
+* **Exclusion du bénéfice d’un droit, d’un service ou contrat** : Décision automatique sans supervision humaine excluant l'accès à un service ou à un contrat ;
+* **Personnes vulnérables** : Personnes âgées, enfant de moins de 15 ans, personne en situation de handicap, patients, employés... ;
+* **Surveillance systématique de personnes** : Par exemple, télésurveillance... ;
 * **Usage innovant** : Les conséquences de l'utilisation de cette nouvelle technologie ne sont pas toutes connues et peuvent à l'avenir devenir une nouvelle source de collecte de données personnelles pouvant porter atteinte aux droits et libertés individuelles.
 
 #### Détails
diff --git a/src/Domain/Admin/Cloner/TreatmentCloner.php b/src/Domain/Admin/Cloner/TreatmentCloner.php
index 2f1ba108b03bdf9626f0ebf88086c65ad46688a2..482dc1ef0825e242a392294eb7ed46ec19cce5ab 100644
--- a/src/Domain/Admin/Cloner/TreatmentCloner.php
+++ b/src/Domain/Admin/Cloner/TreatmentCloner.php
@@ -101,14 +101,14 @@ class TreatmentCloner extends AbstractCloner
         if (null !== $referent->getSecurityOther()) {
             $treatment->setSecurityOther($referent->getSecurityOther());
         }
-        $treatment->setSystematicMonitoring($referent->isSystematicMonitoring());
         $treatment->setStatut($referent->getStatut());
         $treatment->setLargeScaleCollection($referent->isLargeScaleCollection());
-        $treatment->setVulnerablePeople($referent->isVulnerablePeople());
         $treatment->setDataCrossing($referent->isDataCrossing());
-        $treatment->setEvaluationOrRating($referent->isEvaluationOrRating());
         $treatment->setAutomatedDecisionsWithLegalEffect($referent->isAutomatedDecisionsWithLegalEffect());
+        $treatment->setEvaluationOrRating($referent->isEvaluationOrRating());
         $treatment->setAutomaticExclusionService($referent->isAutomaticExclusionService());
+        $treatment->setVulnerablePeople($referent->isVulnerablePeople());
+        $treatment->setSystematicMonitoring($referent->isSystematicMonitoring());
         $treatment->setActive($referent->isActive());
         $treatment->setSecurityEntitledPersons($referent->isSecurityEntitledPersons());
         $treatment->setSecurityOpenAccounts($referent->isSecurityOpenAccounts());
diff --git a/src/Domain/Notification/Command/NotificationsGenerateCommand.php b/src/Domain/Notification/Command/NotificationsGenerateCommand.php
index 310b5de674e8cd7f86cf9dcbe202e7c172470d3b..783f1364839066e820db645250d4867a7d3210d8 100644
--- a/src/Domain/Notification/Command/NotificationsGenerateCommand.php
+++ b/src/Domain/Notification/Command/NotificationsGenerateCommand.php
@@ -176,25 +176,25 @@ class NotificationsGenerateCommand extends Command
 
         $t = $conformite->getTraitement();
 
-        if ($t && $t->isSystematicMonitoring()) {
-            ++$counter;
-        }
         if ($t && $t->isLargeScaleCollection()) {
             ++$counter;
         }
-        if ($t && $t->isVulnerablePeople()) {
+        if ($t && $t->isDataCrossing()) {
             ++$counter;
         }
-        if ($t && $t->isDataCrossing()) {
+        if ($t && $t->isAutomatedDecisionsWithLegalEffect()) {
             ++$counter;
         }
         if ($t && $t->isEvaluationOrRating()) {
             ++$counter;
         }
-        if ($t && $t->isAutomatedDecisionsWithLegalEffect()) {
+        if ($t && $t->isAutomaticExclusionService()) {
             ++$counter;
         }
-        if ($t && $t->isAutomaticExclusionService()) {
+        if ($t && $t->isVulnerablePeople()) {
+            ++$counter;
+        }
+        if ($t && $t->isSystematicMonitoring()) {
             ++$counter;
         }
         if ($t && $t->isInnovativeUse()) {
diff --git a/src/Domain/Registry/Controller/TreatmentController.php b/src/Domain/Registry/Controller/TreatmentController.php
index 0d7723165d6c8b02f90a0d8ff3b07d52c4e860ff..212f1dee66f309594b058721af5d3e8d59672fd0 100644
--- a/src/Domain/Registry/Controller/TreatmentController.php
+++ b/src/Domain/Registry/Controller/TreatmentController.php
@@ -480,27 +480,27 @@ class TreatmentController extends CRUDController
     {
         $user   = $this->userProvider->getAuthenticatedUser();
         $values = [];
-        if ($treatment->isSystematicMonitoring()) {
-            array_push($values, $this->translator->trans('registry.treatment.label.systematic_monitoring'));
-        }
         if ($treatment->isLargeScaleCollection()) {
             array_push($values, $this->translator->trans('registry.treatment.label.large_scale_collection'));
         }
-        if ($treatment->isVulnerablePeople()) {
-            array_push($values, $this->translator->trans('registry.treatment.label.vulnerable_people'));
-        }
         if ($treatment->isDataCrossing()) {
             array_push($values, $this->translator->trans('registry.treatment.label.data_crossing'));
         }
-        if ($treatment->isEvaluationOrRating()) {
-            array_push($values, $this->translator->trans('registry.treatment.label.evaluation_or_rating'));
-        }
         if ($treatment->isAutomatedDecisionsWithLegalEffect()) {
             array_push($values, $this->translator->trans('registry.treatment.label.automated_decisions_with_legal_effect'));
         }
+        if ($treatment->isEvaluationOrRating()) {
+            array_push($values, $this->translator->trans('registry.treatment.label.evaluation_or_rating'));
+        }
         if ($treatment->isAutomaticExclusionService()) {
             array_push($values, $this->translator->trans('registry.treatment.label.automatic_exclusion_service'));
         }
+        if ($treatment->isVulnerablePeople()) {
+            array_push($values, $this->translator->trans('registry.treatment.label.vulnerable_people'));
+        }
+        if ($treatment->isSystematicMonitoring()) {
+            array_push($values, $this->translator->trans('registry.treatment.label.systematic_monitoring'));
+        }
         if ($treatment->isInnovativeUse()) {
             array_push($values, $this->translator->trans('registry.treatment.label.innovative_use'));
         }
diff --git a/src/Domain/Registry/Dictionary/TreatmentSpecificDictionary.php b/src/Domain/Registry/Dictionary/TreatmentSpecificDictionary.php
index ea848c575de49819e584c6173c505f7d372edd06..4160c317db6c27640a0770c88ecd21634bc9ead0 100644
--- a/src/Domain/Registry/Dictionary/TreatmentSpecificDictionary.php
+++ b/src/Domain/Registry/Dictionary/TreatmentSpecificDictionary.php
@@ -27,13 +27,13 @@ use App\Application\Dictionary\SimpleDictionary;
 
 class TreatmentSpecificDictionary extends SimpleDictionary
 {
-    public const SYSTEMATIC_MONITORING                = 'systematic_monitoring';
     public const LARGE_SCALE_COLLECTION               = 'large_scale_collection';
-    public const VULNERABLE_PEOPLE                    = 'vulnerable_people';
     public const DATA_CROSSING                        = 'data_crossing';
-    public const EVALUATION_OR_RATING                 = 'evaluation_or_rating';
     public const AUTOMATED_DECISION_WITH_LEGAL_EFFECT = 'automated_decisions_with_legal_effect';
+    public const EVALUATION_OR_RATING                 = 'evaluation_or_rating';
     public const AUTOMATIC_EXCLUSION_SERVICE          = 'automatic_exclusion_service';
+    public const VULNERABLE_PEOPLE                    = 'vulnerable_people';
+    public const SYSTEMATIC_MONITORING                = 'systematic_monitoring';
     public const INNOVATE_USE                         = 'innovative_use';
 
     public function __construct()
@@ -49,13 +49,13 @@ class TreatmentSpecificDictionary extends SimpleDictionary
     public static function getSpecificTreatment()
     {
         return [
-            self::SYSTEMATIC_MONITORING                => 'Surveillance systématique',
             self::LARGE_SCALE_COLLECTION               => 'Collecte à large échelle',
-            self::VULNERABLE_PEOPLE                    => 'Personnes vulnérables',
-            self::DATA_CROSSING                        => 'Croisement de données',
+            self::DATA_CROSSING                        => 'Croisement d\'ensemble de données',
+            self::AUTOMATED_DECISION_WITH_LEGAL_EFFECT => 'Décision automatique avec effet juridique',
             self::EVALUATION_OR_RATING                 => 'Évaluation ou notation',
-            self::AUTOMATED_DECISION_WITH_LEGAL_EFFECT => 'Décisions automatisées avec effet',
-            self::AUTOMATIC_EXCLUSION_SERVICE          => 'Exclusion automatique d\'un service',
+            self::AUTOMATIC_EXCLUSION_SERVICE          => 'Exclusion du bénéfice d\'un droit, d’un service ou contrat',
+            self::VULNERABLE_PEOPLE                    => 'Personnes vulnérables',
+            self::SYSTEMATIC_MONITORING                => 'Surveillance systématique',
             self::INNOVATE_USE                         => 'Usage innovant',
         ];
     }
diff --git a/src/Domain/Registry/Form/Type/TreatmentType.php b/src/Domain/Registry/Form/Type/TreatmentType.php
index 833a6a9969996ee2d1704f02b7c55f556533bf73..82e65bc74b6c9fce89288637bac51a8554f36aae 100644
--- a/src/Domain/Registry/Form/Type/TreatmentType.php
+++ b/src/Domain/Registry/Form/Type/TreatmentType.php
@@ -127,8 +127,6 @@ class TreatmentType extends LinkableType
                 'label'    => 'registry.treatment.label.legal_basis',
                 'name'     => 'registry_treatment_legal_basis',
                 'required' => true,
-                'expanded' => true,
-                'multiple' => false,
             ])
             ->add('legalBasisJustification', TextareaType::class, [
                 'label'       => 'registry.treatment.label.legal_basis_justification',
diff --git a/src/Domain/Registry/Model/ConformiteTraitement/ConformiteTraitement.php b/src/Domain/Registry/Model/ConformiteTraitement/ConformiteTraitement.php
index ed779966ed83afc2039e36e18d4b2a484547e428..94501aff4efcd422a12cf30a7ae9cd0f3e94834a 100644
--- a/src/Domain/Registry/Model/ConformiteTraitement/ConformiteTraitement.php
+++ b/src/Domain/Registry/Model/ConformiteTraitement/ConformiteTraitement.php
@@ -229,36 +229,36 @@ class ConformiteTraitement implements LoggableSubject
             return false;
         }
         if (
-            $treatment->isSystematicMonitoring()
-            || $treatment->isLargeScaleCollection()
-            || $treatment->isVulnerablePeople()
+            $treatment->isLargeScaleCollection()
             || $treatment->isDataCrossing()
-            || $treatment->isEvaluationOrRating()
             || $treatment->isAutomatedDecisionsWithLegalEffect()
+            || $treatment->isEvaluationOrRating()
             || $treatment->isAutomaticExclusionService()
+            || $treatment->isVulnerablePeople()
+            || $treatment->isSystematicMonitoring()
             || $treatment->isInnovativeUse()
         ) {
             $sensitiveCount = 0;
             $specificCount  = 0;
-            if ($treatment->isSystematicMonitoring()) {
-                ++$specificCount;
-            }
             if ($treatment->isLargeScaleCollection()) {
                 ++$specificCount;
             }
-            if ($treatment->isVulnerablePeople()) {
+            if ($treatment->isDataCrossing()) {
                 ++$specificCount;
             }
-            if ($treatment->isDataCrossing()) {
+            if ($treatment->isAutomatedDecisionsWithLegalEffect()) {
                 ++$specificCount;
             }
             if ($treatment->isEvaluationOrRating()) {
                 ++$specificCount;
             }
-            if ($treatment->isAutomatedDecisionsWithLegalEffect()) {
+            if ($treatment->isAutomaticExclusionService()) {
                 ++$specificCount;
             }
-            if ($treatment->isAutomaticExclusionService()) {
+            if ($treatment->isVulnerablePeople()) {
+                ++$specificCount;
+            }
+            if ($treatment->isSystematicMonitoring()) {
                 ++$specificCount;
             }
             if ($treatment->isInnovativeUse()) {
diff --git a/src/Domain/Registry/Model/Treatment.php b/src/Domain/Registry/Model/Treatment.php
index 49052fead9543a43261ff39fd5eb9b358473f3d9..8c31504e93e0a676be7b1656b1fdb68f76f079df 100644
--- a/src/Domain/Registry/Model/Treatment.php
+++ b/src/Domain/Registry/Model/Treatment.php
@@ -198,53 +198,53 @@ class Treatment implements LoggableSubject, CollectivityRelated
     private $securitySpecificitiesDelivered;
 
     /**
-     * FR: Surveillance systématique (traitement spécifique).
+     * FR: Collecte à large échelle (traitement spécifique).
      *
      * @var bool
      */
-    private $systematicMonitoring;
+    private $largeScaleCollection;
 
     /**
-     * FR: Collecte à grande échelle (traitement spécifique).
+     * FR: Croisement d’ensemble de données (traitement spécifique).
      *
      * @var bool
      */
-    private $largeScaleCollection;
+    private $dataCrossing;
 
     /**
-     * FR: Personnes vulnérables (traitement spécifique).
+     * FR: Décisions automatisées avec effet juridique (traitement spécifique).
      *
      * @var bool
      */
-    private $vulnerablePeople;
+    private $automatedDecisionsWithLegalEffect;
 
     /**
-     * FR: Croisement de données (traitement spécifique).
+     * FR: Évaluation ou notation (traitement spécifique).
      *
      * @var bool
      */
-    private $dataCrossing;
+    private $evaluationOrRating;
 
     /**
-     * FR: Évaluation ou notation (traitement spécifique).
+     * FR: Exclusion du bénéfice d’un droit, d’un service ou contrat (traitement spécifique).
      *
      * @var bool
      */
-    private $evaluationOrRating;
+    private $automaticExclusionService;
 
     /**
-     * FR: Décisions automatisées  avec  effet  juridique (traitement spécifique).
+     * FR: Personnes vulnérables (traitement spécifique).
      *
      * @var bool
      */
-    private $automatedDecisionsWithLegalEffect;
+    private $vulnerablePeople;
 
     /**
-     * FR: Exclusion automatique d'un service (traitement spécifique).
+     * FR: Surveillance systématique (traitement spécifique).
      *
      * @var bool
      */
-    private $automaticExclusionService;
+    private $systematicMonitoring;
 
     /**
      * FR: Usage innovant (traitement spécifique).
@@ -737,24 +737,54 @@ class Treatment implements LoggableSubject, CollectivityRelated
         $this->securityOther = $securityOther;
     }
 
-    public function isSystematicMonitoring(): bool
+    public function isLargeScaleCollection(): bool
     {
-        return $this->systematicMonitoring;
+        return $this->largeScaleCollection;
     }
 
-    public function setSystematicMonitoring(bool $systematicMonitoring): void
+    public function setLargeScaleCollection(bool $largeScaleCollection): void
     {
-        $this->systematicMonitoring = $systematicMonitoring;
+        $this->largeScaleCollection = $largeScaleCollection;
     }
 
-    public function isLargeScaleCollection(): bool
+    public function isDataCrossing(): bool
     {
-        return $this->largeScaleCollection;
+        return $this->dataCrossing;
     }
 
-    public function setLargeScaleCollection(bool $largeScaleCollection): void
+    public function setDataCrossing(bool $dataCrossing): void
     {
-        $this->largeScaleCollection = $largeScaleCollection;
+        $this->dataCrossing = $dataCrossing;
+    }
+
+    public function isAutomatedDecisionsWithLegalEffect(): bool
+    {
+        return $this->automatedDecisionsWithLegalEffect;
+    }
+
+    public function setAutomatedDecisionsWithLegalEffect(bool $automatedDecisionsWithLegalEffect): void
+    {
+        $this->automatedDecisionsWithLegalEffect = $automatedDecisionsWithLegalEffect;
+    }
+
+    public function isEvaluationOrRating(): bool
+    {
+        return $this->evaluationOrRating;
+    }
+
+    public function setEvaluationOrRating(bool $evaluationOrRating): void
+    {
+        $this->evaluationOrRating = $evaluationOrRating;
+    }
+
+    public function isAutomaticExclusionService(): bool
+    {
+        return $this->automaticExclusionService;
+    }
+
+    public function setAutomaticExclusionService(bool $automaticExclusionService): void
+    {
+        $this->automaticExclusionService = $automaticExclusionService;
     }
 
     public function isVulnerablePeople(): bool
@@ -767,14 +797,24 @@ class Treatment implements LoggableSubject, CollectivityRelated
         $this->vulnerablePeople = $vulnerablePeople;
     }
 
-    public function isDataCrossing(): bool
+    public function isSystematicMonitoring(): bool
     {
-        return $this->dataCrossing;
+        return $this->systematicMonitoring;
     }
 
-    public function setDataCrossing(bool $dataCrossing): void
+    public function setSystematicMonitoring(bool $systematicMonitoring): void
     {
-        $this->dataCrossing = $dataCrossing;
+        $this->systematicMonitoring = $systematicMonitoring;
+    }
+
+    public function isInnovativeUse(): bool
+    {
+        return $this->innovativeUse;
+    }
+
+    public function setInnovativeUse(bool $innovativeUse): void
+    {
+        $this->innovativeUse = $innovativeUse;
     }
 
     public function isActive(): bool
@@ -827,26 +867,6 @@ class Treatment implements LoggableSubject, CollectivityRelated
         $this->clonedFrom = $clonedFrom;
     }
 
-    public function isEvaluationOrRating(): bool
-    {
-        return $this->evaluationOrRating;
-    }
-
-    public function setEvaluationOrRating(bool $evaluationOrRating): void
-    {
-        $this->evaluationOrRating = $evaluationOrRating;
-    }
-
-    public function isAutomatedDecisionsWithLegalEffect(): bool
-    {
-        return $this->automatedDecisionsWithLegalEffect;
-    }
-
-    public function setAutomatedDecisionsWithLegalEffect(bool $automatedDecisionsWithLegalEffect): void
-    {
-        $this->automatedDecisionsWithLegalEffect = $automatedDecisionsWithLegalEffect;
-    }
-
     public function getSoftware(): ?string
     {
         return $this->software;
@@ -857,16 +877,6 @@ class Treatment implements LoggableSubject, CollectivityRelated
         $this->software = $software;
     }
 
-    public function isAutomaticExclusionService(): bool
-    {
-        return $this->automaticExclusionService;
-    }
-
-    public function setAutomaticExclusionService(bool $automaticExclusionService): void
-    {
-        $this->automaticExclusionService = $automaticExclusionService;
-    }
-
     public function getConcernedPeopleParticular(): ComplexChoice
     {
         return $this->concernedPeopleParticular;
@@ -1017,16 +1027,6 @@ class Treatment implements LoggableSubject, CollectivityRelated
         $this->securitySpecificitiesDelivered = $securitySpecificitiesDelivered;
     }
 
-    public function isInnovativeUse(): bool
-    {
-        return $this->innovativeUse;
-    }
-
-    public function setInnovativeUse(bool $innovativeUse): void
-    {
-        $this->innovativeUse = $innovativeUse;
-    }
-
     public function getConformiteTraitement(): ?ConformiteTraitement
     {
         return $this->conformiteTraitement;
diff --git a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
index 75169e99bfae794deefa84260f699d85ab5eb535..04724a5c0662217c89f080b3e12d63c2abaa5580 100644
--- a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
@@ -378,13 +378,13 @@ class TreatmentGenerator extends AbstractGenerator
         $specificTrans = $this->translator->trans('registry.treatment.tab.specific');
 
         return [
-            $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.systematic_monitoring'),
             $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.large_scale_collection'),
-            $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.vulnerable_people'),
             $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.data_crossing'),
-            $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.evaluation_or_rating'),
             $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.automated_decisions_with_legal_effect'),
+            $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.evaluation_or_rating'),
             $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.automatic_exclusion_service'),
+            $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.vulnerable_people'),
+            $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.systematic_monitoring'),
             $specificTrans . ' - ' . $this->translator->trans('registry.treatment.label.innovative_use'),
         ];
     }
@@ -395,13 +395,13 @@ class TreatmentGenerator extends AbstractGenerator
         $no  = $this->translator->trans('global.label.no');
 
         return [
-            $treatment->isSystematicMonitoring() ? $yes : $no,
             $treatment->isLargeScaleCollection() ? $yes : $no,
-            $treatment->isVulnerablePeople() ? $yes : $no,
             $treatment->isDataCrossing() ? $yes : $no,
-            $treatment->isEvaluationOrRating() ? $yes : $no,
             $treatment->isAutomatedDecisionsWithLegalEffect() ? $yes : $no,
+            $treatment->isEvaluationOrRating() ? $yes : $no,
             $treatment->isAutomaticExclusionService() ? $yes : $no,
+            $treatment->isVulnerablePeople() ? $yes : $no,
+            $treatment->isSystematicMonitoring() ? $yes : $no,
             $treatment->isInnovativeUse() ? $yes : $no,
         ];
     }
diff --git a/src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php b/src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php
index 1a375e8e779b5f2a5090bd62b7b73313779565b4..7d8002e3d117b9a4d1618dacd5d9bab84542b2d0 100644
--- a/src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php
@@ -214,13 +214,13 @@ class ConformiteTraitementGenerator extends AbstractGenerator implements Impress
             $cnt_sensible                                                             = 0;
             $sensibleDatas                                                            = [];
             $specificTreatments                                                       = [];
-            $treatment->isSystematicMonitoring() ? $specificTreatments[]              = 'Surveillance systématique' : null;
             $treatment->isLargeScaleCollection() ? $specificTreatments[]              = 'Collecte à large échelle' : null;
-            $treatment->isVulnerablePeople() ? $specificTreatments[]                  = 'Personnes vulnérables' : null;
-            $treatment->isDataCrossing() ? $specificTreatments[]                      = 'Croisement de données' : null;
+            $treatment->isDataCrossing() ? $specificTreatments[]                      = "Croisement d’ensemble de données" : null;
+            $treatment->isAutomatedDecisionsWithLegalEffect() ? $specificTreatments[] = 'Décision automatique avec effet juridique' : null;
             $treatment->isEvaluationOrRating() ? $specificTreatments[]                = 'Évaluation ou notation' : null;
-            $treatment->isAutomatedDecisionsWithLegalEffect() ? $specificTreatments[] = 'Décisions automatisées avec effet' : null;
-            $treatment->isAutomaticExclusionService() ? $specificTreatments[]         = "Exclusion automatique d'un service" : null;
+            $treatment->isAutomaticExclusionService() ? $specificTreatments[]         = "Exclusion du bénéfice d’un droit, d’un service ou contrat" : null;
+            $treatment->isVulnerablePeople() ? $specificTreatments[]                  = 'Personnes vulnérables' : null;
+            $treatment->isSystematicMonitoring() ? $specificTreatments[]              = 'Surveillance systématique' : null;
             $treatment->isInnovativeUse() ? $specificTreatments[]                     = 'Usage innovant' : null;
 
             foreach ($treatment->getDataCategories() as $category) {
diff --git a/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
index e2f7bb821f7f74526f75cf2418967649e8314b80..7360ea0cd6558df88e526d41639c1fd07bee7258 100644
--- a/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
@@ -470,33 +470,33 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
                     'Est exempté d\'AIPD',
                     $treatment->isExemptAIPD() ? 'Oui' : 'Non',
                 ],
-                [
-                    'Surveillance systématique',
-                    $treatment->isSystematicMonitoring() ? 'Oui' : 'Non',
-                ],
                 [
                     'Collecte à large échelle',
                     $treatment->isLargeScaleCollection() ? 'Oui' : 'Non',
                 ],
                 [
-                    'Personnes vulnérables',
-                    $treatment->isVulnerablePeople() ? 'Oui' : 'Non',
+                    'Croisement d\'ensemble de données',
+                    $treatment->isDataCrossing() ? 'Oui' : 'Non',
                 ],
                 [
-                    'Croisement de données',
-                    $treatment->isDataCrossing() ? 'Oui' : 'Non',
+                    'Décision automatique avec effet juridique',
+                    $treatment->isAutomatedDecisionsWithLegalEffect() ? 'Oui' : 'Non',
                 ],
                 [
                     'Évaluation ou notation',
                     $treatment->isEvaluationOrRating() ? 'Oui' : 'Non',
                 ],
                 [
-                    'Décisions automatisées avec effet',
-                    $treatment->isAutomatedDecisionsWithLegalEffect() ? 'Oui' : 'Non',
+                    'Exclusion du bénéfice d\'un droit, d’un service ou contrat',
+                    $treatment->isAutomaticExclusionService() ? 'Oui' : 'Non',
                 ],
                 [
-                    'Exclusion automatique d\'un service',
-                    $treatment->isAutomaticExclusionService() ? 'Oui' : 'Non',
+                    'Personnes vulnérables',
+                    $treatment->isVulnerablePeople() ? 'Oui' : 'Non',
+                ],
+                [
+                    'Surveillance systématique',
+                    $treatment->isSystematicMonitoring() ? 'Oui' : 'Non',
                 ],
                 [
                     'Usage innovant',
@@ -614,13 +614,13 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
         $cell->addText('Type de données', $this->textHeadStyle);
 
         $titles = ['Données sensibles',
-            'Surveillance systématique',
             'Collecte à large échelle',
-            'Personnes vulnérables',
-            'Croisement de données',
+            'Croisement d\'ensemble de données',
+            'Décision automatique avec effet juridique',
             'Évaluation ou notation',
-            'Décisions automatisées avec effet',
-            'Exclusion automatique d\'un service',
+            'Exclusion du bénéfice d\'un droit, d’un service ou contrat',
+            'Personnes vulnérables',
+            'Surveillance systématique',
             'Usage innovant',
             'CNIL AIPD exemptée',
             '',
@@ -645,13 +645,13 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
             $cnt_sensible                                                        = 0;
             $sensibleDatas                                                       = [];
             $specificTreatments                                                  = [];
-            $item->isSystematicMonitoring() ? $specificTreatments[]              = 'Surveillance systématique' : null;
             $item->isLargeScaleCollection() ? $specificTreatments[]              = 'Collecte à large échelle' : null;
-            $item->isVulnerablePeople() ? $specificTreatments[]                  = 'Personnes vulnérables' : null;
-            $item->isDataCrossing() ? $specificTreatments[]                      = 'Croisement de données' : null;
+            $item->isDataCrossing() ? $specificTreatments[]                      = 'Croisement d’ensemble de données' : null;
+            $item->isAutomatedDecisionsWithLegalEffect() ? $specificTreatments[] = 'Décision automatique avec effet juridique' : null;
             $item->isEvaluationOrRating() ? $specificTreatments[]                = 'Évaluation ou notation' : null;
-            $item->isAutomatedDecisionsWithLegalEffect() ? $specificTreatments[] = 'Décisions automatisées avec effet' : null;
-            $item->isAutomaticExclusionService() ? $specificTreatments[]         = "Exclusion automatique d'un service" : null;
+            $item->isAutomaticExclusionService() ? $specificTreatments[]         = "Exclusion du bénéfice d’un droit, d’un service ou contrat" : null;
+            $item->isVulnerablePeople() ? $specificTreatments[]                  = 'Personnes vulnérables' : null;
+            $item->isSystematicMonitoring() ? $specificTreatments[]              = 'Surveillance systématique' : null;
             $item->isInnovativeUse() ? $specificTreatments[]                     = 'Usage innovant' : null;
 
             $cnt_categories = count(array_filter($specificTreatments));
@@ -677,20 +677,20 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
             }
             $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $cnt_sensible > 0 ? 'ffa7a7' : null, 'valign' => 'center']);
             $cell->addText($cnt_sensible > 0 ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
-            $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isSystematicMonitoring() ? 'ffa7a7' : null, 'valign' => 'center']);
-            $cell->addText($item->isSystematicMonitoring() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
             $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isLargeScaleCollection() ? 'ffa7a7' : null, 'valign' => 'center']);
             $cell->addText($item->isLargeScaleCollection() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
-            $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isVulnerablePeople() ? 'ffa7a7' : null, 'valign' => 'center']);
-            $cell->addText($item->isVulnerablePeople() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
             $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isDataCrossing() ? 'ffa7a7' : null, 'valign' => 'center']);
             $cell->addText($item->isDataCrossing() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
-            $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isEvaluationOrRating() ? 'ffa7a7' : null, 'valign' => 'center']);
-            $cell->addText($item->isEvaluationOrRating() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
             $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isAutomatedDecisionsWithLegalEffect() ? 'ffa7a7' : null, 'valign' => 'center']);
             $cell->addText($item->isAutomatedDecisionsWithLegalEffect() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
+            $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isEvaluationOrRating() ? 'ffa7a7' : null, 'valign' => 'center']);
+            $cell->addText($item->isEvaluationOrRating() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
             $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isAutomaticExclusionService() ? 'ffa7a7' : null, 'valign' => 'center']);
             $cell->addText($item->isAutomaticExclusionService() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
+            $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isVulnerablePeople() ? 'ffa7a7' : null, 'valign' => 'center']);
+            $cell->addText($item->isVulnerablePeople() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
+            $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isSystematicMonitoring() ? 'ffa7a7' : null, 'valign' => 'center']);
+            $cell->addText($item->isSystematicMonitoring() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
             $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isInnovativeUse() ? 'ffa7a7' : null, 'valign' => 'center']);
             $cell->addText($item->isInnovativeUse() ? 'Oui' : '', ['size' => 8, 'bold' => true], ['alignment' => 'center']);
             $cell = $RiskTreatmentAnnexListTable->addCell(null, ['bgColor' => $item->isExemptAIPD() ? 'bce292' : 'ffa7a7', 'valign' => 'center']);
diff --git a/templates/Aipd/Analyse_impact/pdf.html.twig b/templates/Aipd/Analyse_impact/pdf.html.twig
index 88455be6a0ee74faa1177e49edd7a275436dbb60..6ce45e661c53c7e0877fe4d6b9f48adb38a5dc08 100644
--- a/templates/Aipd/Analyse_impact/pdf.html.twig
+++ b/templates/Aipd/Analyse_impact/pdf.html.twig
@@ -809,10 +809,6 @@
                                 <td>{{ traitement.service }}</td>
                             </tr>
                         {% endif %}
-                        <tr>
-                            <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
-                            <td>{{ traitement.goal|nl2br }}</td>
-                        </tr>
                         <tr>
                             <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
                             <td>
@@ -832,14 +828,8 @@
                             <td>{{ traitement.manager }}</td>
                         </tr>
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
-                            <td>
-                                {% if traitement.active %}
-                                    <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                                {% else %}
-                                    <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                                {% endif %}
-                            </td>
+                            <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
+                            <td>{{ traitement.goal|nl2br }}</td>
                         </tr>
                         <tr>
                             <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
@@ -869,6 +859,16 @@
                             <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
                             <td>{{ traitement.observation|nl2br }}</td>
                         </tr>
+                        <tr>
+                            <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
+                            <td>
+                                {% if traitement.active %}
+                                    <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+                                {% else %}
+                                    <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
                         <tr>
                             <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
                             <td>
@@ -955,9 +955,9 @@
                             </td>
                         </tr>
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
+                            <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
                             <td>
-                                {% if traitement.systematicMonitoring %}
+                                {% if traitement.largeScaleCollection %}
                                     <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                 {% else %}
                                     <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -965,9 +965,9 @@
                             </td>
                         </tr>
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
+                            <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
                             <td>
-                                {% if traitement.largeScaleCollection %}
+                                {% if traitement.dataCrossing %}
                                     <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                 {% else %}
                                     <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -975,9 +975,9 @@
                             </td>
                         </tr>
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
+                            <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
                             <td>
-                                {% if traitement.vulnerablePeople %}
+                                {% if traitement.automatedDecisionsWithLegalEffect %}
                                     <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                 {% else %}
                                     <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -985,9 +985,9 @@
                             </td>
                         </tr>
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
+                            <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
                             <td>
-                                {% if traitement.dataCrossing %}
+                                {% if traitement.evaluationOrRating %}
                                     <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                 {% else %}
                                     <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -995,9 +995,9 @@
                             </td>
                         </tr>
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
+                            <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
                             <td>
-                                {% if traitement.evaluationOrRating %}
+                                {% if traitement.automaticExclusionService %}
                                     <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                 {% else %}
                                     <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -1005,9 +1005,9 @@
                             </td>
                         </tr>
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
+                            <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
                             <td>
-                                {% if traitement.automatedDecisionsWithLegalEffect %}
+                                {% if traitement.vulnerablePeople %}
                                     <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                 {% else %}
                                     <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -1015,9 +1015,9 @@
                             </td>
                         </tr>
                         <tr>
-                            <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
+                            <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
                             <td>
-                                {% if traitement.automaticExclusionService %}
+                                {% if traitement.systematicMonitoring %}
                                     <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                 {% else %}
                                     <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
diff --git a/templates/Registry/Treatment/_form.html.twig b/templates/Registry/Treatment/_form.html.twig
index 0c47318d82366ea4013b879dc2158f1bbeb93147..ea9bd5bfae4b0470e30f56576d02b39e63df4cf5 100644
--- a/templates/Registry/Treatment/_form.html.twig
+++ b/templates/Registry/Treatment/_form.html.twig
@@ -66,18 +66,18 @@
                 {% if serviceEnabled is defined and serviceEnabled %}
                     {{ form_row(form.service) }}
                 {% endif %}
-                {{ form_row(form.goal) }}
                 <div id="author_group">
                     {{ form_row(form.author) }}
                     {{ form_row(form.coordonneesResponsableTraitement) }}
                 </div>
                 {{ form_row(form.manager) }}
-                {{ form_row(form.active) }}
+                {{ form_row(form.goal) }}
                 {{ form_row(form.legalBasis) }}
                 {{ form_row(form.legalBasisJustification) }}
                 {{ form_row(form.consentRequest) }}
                 {{ form_row(form.consentRequestFormat) }}
                 {{ form_row(form.observation) }}
+                {{ form_row(form.active) }}
                 {{ form_row(form.public) }}
             </div>
         </div>
@@ -105,13 +105,13 @@
             <div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
             <div class="box-body">
                 {{ form_row(form.exempt_AIPD) }}
-                {{ form_row(form.systematicMonitoring) }}
                 {{ form_row(form.largeScaleCollection) }}
-                {{ form_row(form.vulnerablePeople) }}
                 {{ form_row(form.dataCrossing) }}
-                {{ form_row(form.evaluationOrRating) }}
                 {{ form_row(form.automatedDecisionsWithLegalEffect) }}
+                {{ form_row(form.evaluationOrRating) }}
                 {{ form_row(form.automaticExclusionService) }}
+                {{ form_row(form.vulnerablePeople) }}
+                {{ form_row(form.systematicMonitoring) }}
                 {{ form_row(form.innovativeUse) }}
             </div>
         </div>
diff --git a/templates/Registry/Treatment/_form_render.html.twig b/templates/Registry/Treatment/_form_render.html.twig
index 9685eb15200f5331b91da42ff6fb2ae4dd6b010d..c40c3ade5eb5214cfb0ee237478b9cbcf5e9fff5 100644
--- a/templates/Registry/Treatment/_form_render.html.twig
+++ b/templates/Registry/Treatment/_form_render.html.twig
@@ -1,30 +1,28 @@
-
 {% if form.vars.value.createdAt.timestamp is defined %}
     {% set submitValue = submitValue|default('registry.treatment.action.edit_submit'|trans) %}
 {% else %}
     {% set submitValue = submitValue|default('registry.treatment.action.new_submit'|trans) %}
 {% endif %}
 
-
 {{ form_start(form) }}
 
-{{ include('Registry/Treatment/_form.html.twig') }}
-
-<div class="row">
-    <div class="col-md-12">
-        <div class="box box-solid">
-            <div class="box-body text-center">
-                <a href="{{ path('registry_treatment_list') }}" class="btn btn-default">
-                    {{ 'global.action.back_to_list'|trans }}
-                </a>
-                {% if not is_granted('ROLE_ADMIN') and not is_granted('ROLE_REFERENT') %}
-                    <input type="submit" class="btn btn-info draft" value="{{ ('global.action.draft'|trans) }}">
-                {% endif %}
-                <input type="submit" class="btn btn-primary" value="{{ submitValue }}">
+    {{ include('Registry/Treatment/_form.html.twig') }}
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-solid">
+                <div class="box-body text-center">
+                    <a href="{{ path('registry_treatment_list') }}" class="btn btn-default">
+                        {{ 'global.action.back_to_list'|trans }}
+                    </a>
+                    {% if not is_granted('ROLE_ADMIN') and not is_granted('ROLE_REFERENT') %}
+                        <input type="submit" class="btn btn-info draft" value="{{ ('global.action.draft'|trans) }}">
+                    {% endif %}
+                    <input type="submit" class="btn btn-primary" value="{{ submitValue }}">
+                </div>
             </div>
         </div>
     </div>
-</div>
 
 {{ form_end(form) }}
 
@@ -36,16 +34,8 @@
             $('#treatment_statut').val('draft');
         })
 
-        if (!$("input[id='treatment_legalBasis_1']").is(':checked')){
-            $("label[for='treatment_consentRequest']").parents('.form-group').hide();
-            $("label[for='treatment_consentRequestFormat']").parents('.form-group').hide();
-            $("#treatment_consentRequestFormat").hide();
-            $("#treatment_consentRequestFormat").val('');
-            $("#treatment_consentRequest").prop('checked',false);
-        }
-
-        $("input[name='treatment[legalBasis]']").on('change',function(){
-            if($(this).val() === 'consent'){
+        function toggleConsentFields() {
+            if ($('#treatment_legalBasis').val() === 'consent') {
                 $("label[for='treatment_consentRequest']").parents('.form-group').show();
                 $("label[for='treatment_consentRequestFormat']").parents('.form-group').show();
                 $("#treatment_consentRequestFormat").show();
@@ -54,8 +44,16 @@
                 $("label[for='treatment_consentRequestFormat']").parents('.form-group').hide();
                 $("#treatment_consentRequestFormat").hide();
                 $("#treatment_consentRequestFormat").val('');
-                $("#treatment_consentRequest").prop('checked',false);
+                $("#treatment_consentRequest").prop('checked', false);
             }
-        })
+        }
+
+        // Initial check on page load
+        toggleConsentFields();
+
+        // Event listener for change
+        $('#treatment_legalBasis').on('change', function(){
+            toggleConsentFields();
+        });
     });
 </script>
diff --git a/templates/Registry/Treatment/configuration.html.twig b/templates/Registry/Treatment/configuration.html.twig
index 8322ecfb1b234ec7f512d45fbae4a0d40e37a0d3..cdeed2c7d4709e002ba0694dc2e5b0ee7b07e06f 100644
--- a/templates/Registry/Treatment/configuration.html.twig
+++ b/templates/Registry/Treatment/configuration.html.twig
@@ -49,11 +49,10 @@
                 <div class="box-body">
                     {{ form_row(form.name) }}
                     {{ form_row(form.service, {'label': 'registry.label.service'}) }}
-                    {{ form_row(form.goal) }}
                     {{ form_row(form.author) }}
                     {{ form_row(form.coordonneesResponsableTraitement) }}
                     {{ form_row(form.manager) }}
-                    {{ form_row(form.active) }}
+                    {{ form_row(form.goal) }}
                     {{ form_row(form.legalBasis) }}
                     {{ form_row(form.legalBasisJustification) }}
                     {{ form_row(form.consentRequest) }}
@@ -91,13 +90,13 @@
                 </div>
                 <div class="box-body">
                     {{ form_row(form.exempt_AIPD, {'label': 'registry.treatment.label.exempt_AIPD'}) }}
-                    {{ form_row(form.systematicMonitoring) }}
                     {{ form_row(form.largeScaleCollection) }}
-                    {{ form_row(form.vulnerablePeople) }}
                     {{ form_row(form.dataCrossing) }}
-                    {{ form_row(form.evaluationOrRating) }}
                     {{ form_row(form.automatedDecisionsWithLegalEffect) }}
+                    {{ form_row(form.evaluationOrRating) }}
                     {{ form_row(form.automaticExclusionService) }}
+                    {{ form_row(form.vulnerablePeople) }}
+                    {{ form_row(form.systematicMonitoring) }}
                     {{ form_row(form.innovativeUse) }}
                 </div>
             </div>
diff --git a/templates/Registry/Treatment/pdf.html.twig b/templates/Registry/Treatment/pdf.html.twig
index 1913f8cea32ca82e36e878d0126b4bee69c78df0..7e142c4e1f3e93fd70c31be414aa12c64e5e7b1d 100644
--- a/templates/Registry/Treatment/pdf.html.twig
+++ b/templates/Registry/Treatment/pdf.html.twig
@@ -50,10 +50,6 @@
                             <td>{{ object.service }}</td>
                         </tr>
                     {% endif %}
-                    <tr>
-                        <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
-                        <td>{{ object.goal|nl2br }}</td>
-                    </tr>
                     <tr>
                         <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
                         <td>{% if object.author is not null %}{{ object.author|dictionary('registry_treatment_author') }}{% endif %}</td>
@@ -69,14 +65,8 @@
                         <td>{{ object.manager }}</td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
-                        <td>
-                            {% if object.active %}
-                                <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                            {% else %}
-                                <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                            {% endif %}
-                        </td>
+                        <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
+                        <td>{{ object.goal|nl2br }}</td>
                     </tr>
                     <tr>
                         <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
@@ -106,6 +96,16 @@
                         <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
                         <td>{{ object.observation|nl2br }}</td>
                     </tr>
+                    <tr>
+                        <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
+                        <td>
+                            {% if object.active %}
+                                <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+                            {% else %}
+                                <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
+                            {% endif %}
+                        </td>
+                    </tr>
                     <tr>
                         <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
                         <td>
@@ -192,9 +192,9 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
+                        <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
                         <td>
-                            {% if object.systematicMonitoring %}
+                            {% if object.largeScaleCollection %}
                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                             {% else %}
                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -202,9 +202,9 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
+                        <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
                         <td>
-                            {% if object.largeScaleCollection %}
+                            {% if object.dataCrossing %}
                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                             {% else %}
                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -212,9 +212,9 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
+                        <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
                         <td>
-                            {% if object.vulnerablePeople %}
+                            {% if object.automatedDecisionsWithLegalEffect %}
                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                             {% else %}
                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -222,9 +222,9 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
+                        <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
                         <td>
-                            {% if object.dataCrossing %}
+                            {% if object.evaluationOrRating %}
                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                             {% else %}
                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -232,9 +232,9 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
+                        <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
                         <td>
-                            {% if object.evaluationOrRating %}
+                            {% if object.automaticExclusionService %}
                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                             {% else %}
                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -242,9 +242,9 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
+                        <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
                         <td>
-                            {% if object.automatedDecisionsWithLegalEffect %}
+                            {% if object.vulnerablePeople %}
                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                             {% else %}
                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -252,9 +252,9 @@
                         </td>
                     </tr>
                     <tr>
-                        <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
+                        <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
                         <td>
-                            {% if object.automaticExclusionService %}
+                            {% if object.systematicMonitoring %}
                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                             {% else %}
                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
diff --git a/templates/Registry/Treatment/pdf_all.html.twig b/templates/Registry/Treatment/pdf_all.html.twig
index 99acc3e9a69b0c9ae7bea6d43e03580fb70bf32e..68c94439eb599871b4077ccda294f8142f65ff87 100644
--- a/templates/Registry/Treatment/pdf_all.html.twig
+++ b/templates/Registry/Treatment/pdf_all.html.twig
@@ -52,10 +52,6 @@
                                         <td>{{ object.service }}</td>
                                     </tr>
                                 {% endif %}
-                                <tr>
-                                    <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
-                                    <td>{{ object.goal|nl2br }}</td>
-                                </tr>
                                 <tr>
                                     <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
                                     <td>{% if object.author is not null %}{{ object.author|dictionary('registry_treatment_author') }}{% endif %}</td>
@@ -71,14 +67,8 @@
                                     <td>{{ object.manager }}</td>
                                 </tr>
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
-                                    <td>
-                                        {% if object.active %}
-                                            <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                                        {% else %}
-                                            <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                                        {% endif %}
-                                    </td>
+                                    <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
+                                    <td>{{ object.goal|nl2br }}</td>
                                 </tr>
                                 <tr>
                                     <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
@@ -108,6 +98,16 @@
                                     <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
                                     <td>{{ object.observation|nl2br }}</td>
                                 </tr>
+                                <tr>
+                                    <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
+                                    <td>
+                                        {% if object.active %}
+                                            <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+                                        {% else %}
+                                            <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
                                 <tr>
                                     <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
                                     <td>
@@ -194,9 +194,9 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
+                                    <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
                                     <td>
-                                        {% if object.systematicMonitoring %}
+                                        {% if object.largeScaleCollection %}
                                             <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                         {% else %}
                                             <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -204,9 +204,9 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
+                                    <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
                                     <td>
-                                        {% if object.largeScaleCollection %}
+                                        {% if object.dataCrossing %}
                                             <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                         {% else %}
                                             <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -214,9 +214,9 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
+                                    <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
                                     <td>
-                                        {% if object.vulnerablePeople %}
+                                        {% if object.automatedDecisionsWithLegalEffect %}
                                             <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                         {% else %}
                                             <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -224,9 +224,9 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
+                                    <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
                                     <td>
-                                        {% if object.dataCrossing %}
+                                        {% if object.evaluationOrRating %}
                                             <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                         {% else %}
                                             <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -234,9 +234,9 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
+                                    <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
                                     <td>
-                                        {% if object.evaluationOrRating %}
+                                        {% if object.automaticExclusionService %}
                                             <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                         {% else %}
                                             <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -244,9 +244,9 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
+                                    <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
                                     <td>
-                                        {% if object.automatedDecisionsWithLegalEffect %}
+                                        {% if object.vulnerablePeople %}
                                             <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                         {% else %}
                                             <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -254,9 +254,9 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
+                                    <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
                                     <td>
-                                        {% if object.automaticExclusionService %}
+                                        {% if object.systematicMonitoring %}
                                             <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                         {% else %}
                                             <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
diff --git a/templates/Registry/Treatment/public_show.html.twig b/templates/Registry/Treatment/public_show.html.twig
index 51bc589d2d7b1cf15b07e6da90c786ece24eb9f9..7fca02950cec214d4bfc39d88c6b8f96b00702ea 100644
--- a/templates/Registry/Treatment/public_show.html.twig
+++ b/templates/Registry/Treatment/public_show.html.twig
@@ -37,11 +37,10 @@
             {% if (
                 (object.name and config.name == true)
                 or (object.service and config.service == true)
-                or (object.goal and config.goal == true)
                 or (object.author and config.author == true)
                 or (object.author == "processing_manager" and object.coordonneesResponsableTraitement and config.coordonneesResponsableTraitement == true)
                 or (object.manager and config.manager == true)
-                or (object.active and config.active == true)
+                or (object.goal and config.goal == true)
                 or (object.legalBasis and config.legalBasis == true)
                 or (object.legalBasisJustification and config.legalBasisJustification == true)
                 or (object.consentRequest and config.consentRequest == true)
@@ -71,15 +70,6 @@
                                         <td>{{ object.service }}</td>
                                     </tr>
                                 {% endif %}
-
-                                {% if (object.goal and config.goal == true) %}
-                                    <tr>
-                                        <td>
-                                            <strong>{{ 'registry.treatment.label.goal'|trans }}</strong>
-                                        </td>
-                                        <td>{{ object.goal|nl2br }}</td>
-                                    </tr>
-                                {% endif %}
                                 {% if (object.author and config.author == true) %}
                                     <tr>
                                         <td>
@@ -108,18 +98,12 @@
                                         <td>{{ object.manager }}</td>
                                     </tr>
                                 {% endif %}
-                                {% if (object.active and config.active == true) %}
+                                {% if (object.goal and config.goal == true) %}
                                     <tr>
                                         <td>
-                                            <strong>{{ 'registry.treatment.label.active'|trans }}</strong>
-                                        </td>
-                                        <td>
-                                            {% if object.active %}
-                                                <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                                            {% else %}
-                                                <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                                            {% endif %}
+                                            <strong>{{ 'registry.treatment.label.goal'|trans }}</strong>
                                         </td>
+                                        <td>{{ object.goal|nl2br }}</td>
                                     </tr>
                                 {% endif %}
                                 {% if (object.legalBasis and config.legalBasis == true) %}
@@ -265,13 +249,13 @@
             {# SPECIFIC #}
             {% if (
                 (config.exempt_AIPD == true)
-                or (config.systematicMonitoring == true)
                 or (config.largeScaleCollection == true)
-                or (config.vulnerablePeople == true)
                 or (config.dataCrossing == true)
-                or (config.evaluationOrRating == true)
                 or (config.automatedDecisionsWithLegalEffect == true)
+                or (config.evaluationOrRating == true)
                 or (config.automaticExclusionService == true)
+                or (config.vulnerablePeople == true)
+                or (config.systematicMonitoring == true)
                 or (config.innovativeUse == true)
             ) %}
                 <div class="box box-solid box-info">
@@ -295,13 +279,13 @@
                                         </td>
                                     </tr>
                                 {% endif %}
-                                {% if (config.systematicMonitoring == true) %}
+                                {% if (config.largeScaleCollection == true) %}
                                     <tr>
                                         <td>
-                                            <strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong>
+                                            <strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% if object.systematicMonitoring %}
+                                            {% if object.largeScaleCollection %}
                                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                             {% else %}
                                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -309,13 +293,13 @@
                                         </td>
                                     </tr>
                                 {% endif %}
-                                {% if (config.largeScaleCollection == true) %}
+                                {% if (config.dataCrossing == true) %}
                                     <tr>
                                         <td>
-                                            <strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong>
+                                            <strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% if object.largeScaleCollection %}
+                                            {% if object.dataCrossing %}
                                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                             {% else %}
                                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -323,13 +307,13 @@
                                         </td>
                                     </tr>
                                 {% endif %}
-                                {% if (config.vulnerablePeople == true) %}
+                                {% if (config.automatedDecisionsWithLegalEffect == true) %}
                                     <tr>
                                         <td>
-                                            <strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong>
+                                            <strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% if object.vulnerablePeople %}
+                                            {% if object.automatedDecisionsWithLegalEffect %}
                                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                             {% else %}
                                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -337,13 +321,13 @@
                                         </td>
                                     </tr>
                                 {% endif %}
-                                {% if (config.dataCrossing == true) %}
+                                {% if (config.evaluationOrRating == true) %}
                                     <tr>
                                         <td>
-                                            <strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong>
+                                            <strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% if object.dataCrossing %}
+                                            {% if object.evaluationOrRating %}
                                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                             {% else %}
                                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -351,13 +335,13 @@
                                         </td>
                                     </tr>
                                 {% endif %}
-                                {% if (config.evaluationOrRating == true) %}
+                                {% if (config.automaticExclusionService == true) %}
                                     <tr>
                                         <td>
-                                            <strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong>
+                                            <strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% if object.evaluationOrRating %}
+                                            {% if object.automaticExclusionService %}
                                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                             {% else %}
                                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -365,13 +349,13 @@
                                         </td>
                                     </tr>
                                 {% endif %}
-                                {% if (config.automatedDecisionsWithLegalEffect == true) %}
+                                {% if (config.vulnerablePeople == true) %}
                                     <tr>
                                         <td>
-                                            <strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong>
+                                            <strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% if object.automatedDecisionsWithLegalEffect %}
+                                            {% if object.vulnerablePeople %}
                                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                             {% else %}
                                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -379,13 +363,13 @@
                                         </td>
                                     </tr>
                                 {% endif %}
-                                {% if (config.automaticExclusionService == true) %}
+                                {% if (config.systematicMonitoring == true) %}
                                     <tr>
                                         <td>
-                                            <strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong>
+                                            <strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong>
                                         </td>
                                         <td>
-                                            {% if object.automaticExclusionService %}
+                                            {% if object.systematicMonitoring %}
                                                 <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                             {% else %}
                                                 <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
diff --git a/templates/Registry/Treatment/show.html.twig b/templates/Registry/Treatment/show.html.twig
index 41992c9bdc69d4f6bdce65f4e1492620b56dd33d..5c40bbb3435c7e83c14a6468a43144450fd6444a 100644
--- a/templates/Registry/Treatment/show.html.twig
+++ b/templates/Registry/Treatment/show.html.twig
@@ -88,10 +88,6 @@
                                     <td>{{ object.service }}</td>
                                 </tr>
                             {% endif %}
-                            <tr>
-                                <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
-                                <td>{{ object.goal|nl2br }}</td>
-                            </tr>
                             <tr>
                                 <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
                                 <td>{% if object.author is not null %}{{ object.author|dictionary('registry_treatment_author') }}{% endif %}</td>
@@ -107,14 +103,8 @@
                                 <td>{{ object.manager }}</td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
-                                <td>
-                                    {% if object.active %}
-                                        <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
-                                    {% else %}
-                                        <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
-                                    {% endif %}
-                                </td>
+                                <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
+                                <td>{{ object.goal|nl2br }}</td>
                             </tr>
                             <tr>
                                 <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
@@ -144,6 +134,16 @@
                                 <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
                                 <td>{{ object.observation|nl2br }}</td>
                             </tr>
+                            <tr>
+                                <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
+                                <td>
+                                    {% if object.active %}
+                                        <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+                                    {% else %}
+                                        <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
                             <tr>
                                 <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
                                 <td>
@@ -230,9 +230,9 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
                                 <td>
-                                    {% if object.systematicMonitoring %}
+                                    {% if object.largeScaleCollection %}
                                         <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                     {% else %}
                                         <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -240,9 +240,9 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
                                 <td>
-                                    {% if object.largeScaleCollection %}
+                                    {% if object.dataCrossing %}
                                         <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                     {% else %}
                                         <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -250,9 +250,9 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
                                 <td>
-                                    {% if object.vulnerablePeople %}
+                                    {% if object.automatedDecisionsWithLegalEffect %}
                                         <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                     {% else %}
                                         <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -260,9 +260,9 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
                                 <td>
-                                    {% if object.dataCrossing %}
+                                    {% if object.evaluationOrRating %}
                                         <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                     {% else %}
                                         <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -270,9 +270,9 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
                                 <td>
-                                    {% if object.evaluationOrRating %}
+                                    {% if object.automaticExclusionService %}
                                         <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                     {% else %}
                                         <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -280,9 +280,9 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
                                 <td>
-                                    {% if object.automatedDecisionsWithLegalEffect %}
+                                    {% if object.vulnerablePeople %}
                                         <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                     {% else %}
                                         <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
@@ -290,9 +290,9 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
+                                <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
                                 <td>
-                                    {% if object.automaticExclusionService %}
+                                    {% if object.systematicMonitoring %}
                                         <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
                                     {% else %}
                                         <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
diff --git a/tests/Domain/Admin/Cloner/TreatmentClonerTest.php b/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
index c6e4c7f88bd4615849076a52c767893b12f19c8e..cf7ad3151f30822bcb655e32d7c22173e60f78f8 100644
--- a/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
+++ b/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
@@ -110,10 +110,10 @@ class TreatmentClonerTest extends TestCase
         $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityOther);
         $this->assertFalse($securityOther->isCheck());
         $this->assertNull($securityOther->getComment());
-        $this->assertFalse($cloned->isSystematicMonitoring());
         $this->assertFalse($cloned->isLargeScaleCollection());
-        $this->assertFalse($cloned->isVulnerablePeople());
         $this->assertFalse($cloned->isDataCrossing());
+        $this->assertFalse($cloned->isVulnerablePeople());
+        $this->assertFalse($cloned->isSystematicMonitoring());
         $this->assertTrue($cloned->isActive());
         $this->assertFalse($cloned->isSecurityEntitledPersons());
         $this->assertFalse($cloned->isSecurityOpenAccounts());
@@ -167,10 +167,10 @@ class TreatmentClonerTest extends TestCase
         $securityOther = $referent->getSecurityOther();
         $securityOther->setCheck(true);
         $securityOther->setComment('comment');
-        $referent->setSystematicMonitoring(true);
         $referent->setLargeScaleCollection(true);
-        $referent->setVulnerablePeople(true);
         $referent->setDataCrossing(true);
+        $referent->setVulnerablePeople(true);
+        $referent->setSystematicMonitoring(true);
         $referent->setActive(false);
         $referent->setSecurityEntitledPersons(false);
         $referent->setSecurityOpenAccounts(true);
@@ -225,10 +225,10 @@ class TreatmentClonerTest extends TestCase
         $this->assertEquals($referentSecurityOther->isCheck(), $clonedSecurityOther->isCheck());
         $this->assertEquals($referentSecurityOther->getComment(), $clonedSecurityOther->getComment());
 
-        $this->assertEquals($referent->isSystematicMonitoring(), $cloned->isSystematicMonitoring());
         $this->assertEquals($referent->isLargeScaleCollection(), $cloned->isLargeScaleCollection());
-        $this->assertEquals($referent->isVulnerablePeople(), $cloned->isVulnerablePeople());
         $this->assertEquals($referent->isDataCrossing(), $cloned->isDataCrossing());
+        $this->assertEquals($referent->isVulnerablePeople(), $cloned->isVulnerablePeople());
+        $this->assertEquals($referent->isSystematicMonitoring(), $cloned->isSystematicMonitoring());
         $this->assertEquals($referent->isActive(), $cloned->isActive());
         $this->assertEquals($referent->isSecurityEntitledPersons(), $cloned->isSecurityEntitledPersons());
         $this->assertEquals($referent->isSecurityOpenAccounts(), $cloned->isSecurityOpenAccounts());
diff --git a/tests/Domain/Registry/Model/TreatmentTest.php b/tests/Domain/Registry/Model/TreatmentTest.php
index 3e07fa182fa885b7450821b29ceb63bd5299bfff..23bb5bae3822ba3ae4d9c96036e49d632b77191d 100644
--- a/tests/Domain/Registry/Model/TreatmentTest.php
+++ b/tests/Domain/Registry/Model/TreatmentTest.php
@@ -55,10 +55,10 @@ class TreatmentTest extends TestCase
         $this->assertInstanceOf(ComplexChoice::class, $model->getSecuritySaving());
         $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityTracability());
         $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityOther());
-        $this->assertFalse($model->isSystematicMonitoring());
         $this->assertFalse($model->isLargeScaleCollection());
-        $this->assertFalse($model->isVulnerablePeople());
         $this->assertFalse($model->isDataCrossing());
+        $this->assertFalse($model->isVulnerablePeople());
+        $this->assertFalse($model->isSystematicMonitoring());
         $this->assertTrue($model->isActive());
     }