diff --git a/app/src/main/java/io/xpipe/app/comp/storage/store/DenseStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/storage/store/DenseStoreEntryComp.java
index af74ace7..829fa3d3 100644
--- a/app/src/main/java/io/xpipe/app/comp/storage/store/DenseStoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/storage/store/DenseStoreEntryComp.java
@@ -22,14 +22,13 @@ public class DenseStoreEntryComp extends StoreEntryComp {
         var grid = new GridPane();
         grid.setHgap(8);
 
+        int index = 0;
         if (showIcon) {
             var storeIcon = createIcon(26, 21);
             grid.getColumnConstraints().add(new ColumnConstraints(26));
             grid.add(storeIcon, 0, 0);
             GridPane.setHalignment(storeIcon, HPos.CENTER);
-        } else {
-            grid.add(new Region(), 0, 0);
-            grid.getColumnConstraints().add(new ColumnConstraints(0));
+            index++;
         }
 
         var customSize = content != null ? 300 : 0;
@@ -44,9 +43,9 @@ public class DenseStoreEntryComp extends StoreEntryComp {
         nameCC.setMinWidth(100);
         nameCC.setHgrow(Priority.ALWAYS);
         grid.getColumnConstraints().addAll(nameCC);
-        grid.add(name, 1, 0);
+        grid.addRow(0, name);
 
-        grid.add(createInformation(), 2, 0);
+        grid.addRow(0, createInformation());
         grid.getColumnConstraints().addAll(info, custom);
 
         var cr = content != null ? content.createRegion() : new Region();
@@ -57,7 +56,7 @@ public class DenseStoreEntryComp extends StoreEntryComp {
         controls.setSpacing(10);
         controls.setPadding(new Insets(0, 0, 0, 10));
         HBox.setHgrow(cr, Priority.ALWAYS);
-        grid.add(controls, 3, 0);
+        grid.addRow(0, controls);
 
         GrowAugment.create(true, false).augment(grid);
 
diff --git a/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoicePaneComp.java b/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoicePaneComp.java
index f1cf8591..f6b036d3 100644
--- a/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoicePaneComp.java
+++ b/app/src/main/java/io/xpipe/app/fxcomps/impl/ChoicePaneComp.java
@@ -8,7 +8,6 @@ import io.xpipe.app.fxcomps.util.SimpleChangeListener;
 import javafx.beans.property.Property;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
-import javafx.geometry.Insets;
 import javafx.scene.control.ComboBox;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
@@ -59,7 +58,6 @@ public class ChoicePaneComp extends Comp<CompStructure<VBox>> {
                 }
             } else {
                 var region = n.comp().createRegion();
-                region.setPadding(new Insets(0, 0, 0, 10));
                 if (vbox.getChildren().size() == 1) {
                     vbox.getChildren().add(region);
                 } else {
diff --git a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java
index 21609677..2431297a 100644
--- a/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategyHelper.java
@@ -21,7 +21,6 @@ public class SecretRetrievalStrategyHelper {
         var secretProperty =
                 new SimpleObjectProperty<>(p.getValue() != null ? p.getValue().getValue() : null);
         return new OptionsBuilder()
-                .name("password")
                 .addComp(new SecretFieldComp(secretProperty), secretProperty)
                 .bind(
                         () -> {