diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form
index f6841ce..0efb893 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.form
+++ b/src/main/java/ch/psi/mxsc/MainPanel.form
@@ -724,7 +724,7 @@
                 </Component>
                 <Component class="javax.swing.JLabel" name="jLabell21">
                   <Properties>
-                    <Property name="text" type="java.lang.String" value="Psys Safety"/>
+                    <Property name="text" type="java.lang.String" value="Door Safety"/>
                   </Properties>
                 </Component>
                 <Component class="ch.psi.pshell.swing.Led" name="ledPsysSafety">
@@ -1004,9 +1004,9 @@
                       <Group type="102" alignment="0" attributes="0">
                           <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
                           <Component id="devicesPanel" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace pref="28" max="32767" attributes="0"/>
+                          <EmptySpace pref="26" max="32767" attributes="0"/>
                           <Component id="panelExpert" min="-2" pref="93" max="-2" attributes="0"/>
-                          <EmptySpace pref="31" max="32767" attributes="0"/>
+                          <EmptySpace pref="30" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index 2365344..9de8b57 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -1054,7 +1054,7 @@ public class MainPanel extends Panel {
 
         jLabel26.setText("Local Safety");
 
-        jLabell21.setText("Psys Safety");
+        jLabell21.setText("Door Safety");
 
         buttonRelease.setText("Release");
         buttonRelease.addActionListener(new java.awt.event.ActionListener() {
@@ -1372,9 +1372,9 @@ public class MainPanel extends Panel {
             .addGroup(panelDevicesLayout.createSequentialGroup()
                 .addGap(0, 0, 0)
                 .addComponent(devicesPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 28, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 26, Short.MAX_VALUE)
                 .addComponent(panelExpert, javax.swing.GroupLayout.PREFERRED_SIZE, 93, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(31, Short.MAX_VALUE))
+                .addContainerGap(30, Short.MAX_VALUE))
         );
         panelDevicesLayout.setVerticalGroup(
             panelDevicesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)