diff --git a/src/main/java/org/karnak/frontend/forwardnode/edit/destination/component/FilterBySOPClassesForm.java b/src/main/java/org/karnak/frontend/forwardnode/edit/destination/component/FilterBySOPClassesForm.java
index 6b533e682..11e6b357f 100644
--- a/src/main/java/org/karnak/frontend/forwardnode/edit/destination/component/FilterBySOPClassesForm.java
+++ b/src/main/java/org/karnak/frontend/forwardnode/edit/destination/component/FilterBySOPClassesForm.java
@@ -34,8 +34,9 @@ public void init(Binder<DestinationEntity> binder) {
   }
 
   private void setElements() {
-    filterBySOPClassesCheckbox.setMinWidth("25%");
-    sopFilter.setMinWidth("74%");
+    filterBySOPClassesCheckbox.setMinWidth("14%");
+    sopFilter.setMinWidth("80%");
+    sopFilter.getElement().getStyle().set("padding-left", "5%");
 
     filterBySOPClassesCheckbox.setValue(false);
     sopFilter.onEnabledStateChanged(false);
diff --git a/src/main/java/org/karnak/frontend/forwardnode/edit/destination/component/LayoutDesidentification.java b/src/main/java/org/karnak/frontend/forwardnode/edit/destination/component/LayoutDesidentification.java
index a90ab9be9..df1079667 100644
--- a/src/main/java/org/karnak/frontend/forwardnode/edit/destination/component/LayoutDesidentification.java
+++ b/src/main/java/org/karnak/frontend/forwardnode/edit/destination/component/LayoutDesidentification.java
@@ -88,9 +88,12 @@ private void setElements() {
     issuerOfPatientIDByDefault.setWidth("100%");
     issuerOfPatientIDByDefault.setPlaceholder(LABEL_DEFAULT_ISSUER);
     UIS.setTooltip(issuerOfPatientIDByDefault, LABEL_DEFAULT_ISSUER);
+
+    // Checkbox activate de-identification
     checkboxDesidentification = new Checkbox(LABEL_CHECKBOX_DESIDENTIFICATION);
     checkboxDesidentification.setValue(true);
-    checkboxDesidentification.setMinWidth("25%");
+    checkboxDesidentification.setMinWidth("19%");
+    checkboxDesidentification.getElement().getStyle().set("margin-block-end", "auto");
 
     labelDisclaimer = new Label(LABEL_DISCLAIMER_DEIDENTIFICATION);
     labelDisclaimer.getStyle().set("color", "red");
diff --git a/src/main/java/org/karnak/frontend/forwardnode/edit/source/component/FormSourceNode.java b/src/main/java/org/karnak/frontend/forwardnode/edit/source/component/FormSourceNode.java
index 0d52be400..3ac667f26 100644
--- a/src/main/java/org/karnak/frontend/forwardnode/edit/source/component/FormSourceNode.java
+++ b/src/main/java/org/karnak/frontend/forwardnode/edit/source/component/FormSourceNode.java
@@ -44,7 +44,7 @@ public FormSourceNode(
     add(
         UIS.setWidthFull(new HorizontalLayout(aeTitle, description)),
         UIS.setWidthFull(new HorizontalLayout(hostname)),
-        UIS.setWidthFull(checkHostname),
+        checkHostname,
         UIS.setWidthFull(buttonSaveDeleteCancel));
   }
 
diff --git a/src/main/java/org/karnak/frontend/kheops/SwitchingAlbumsView.java b/src/main/java/org/karnak/frontend/kheops/SwitchingAlbumsView.java
index 93fcc2b0e..1d260ed47 100644
--- a/src/main/java/org/karnak/frontend/kheops/SwitchingAlbumsView.java
+++ b/src/main/java/org/karnak/frontend/kheops/SwitchingAlbumsView.java
@@ -17,7 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.karnak.backend.data.entity.KheopsAlbumsEntity;
-import org.karnak.frontend.util.UIS;
 
 public class SwitchingAlbumsView extends CustomField<List<KheopsAlbumsEntity>> {
 
@@ -39,7 +38,7 @@ public SwitchingAlbumsView() {
     kheopsAlbumsEntityList = new ArrayList<>();
     layout = new VerticalLayout();
     checkboxSwitchingAlbums = new Checkbox("Switching in different KHEOPS albums");
-    add(UIS.setWidthFull(checkboxSwitchingAlbums), layout);
+    add(checkboxSwitchingAlbums, layout);
     setEventCheckBox();
     setEventButtonAdd();
   }