diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
index 598796a5672..20105df8fd0 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
@@ -93,9 +93,7 @@
 
 import javax.annotation.Nullable;
 
-import static bisq.desktop.util.FormBuilder.addInputTextField;
-import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
-import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
+import static bisq.desktop.util.FormBuilder.*;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 @SuppressWarnings("ConstantConditions")
@@ -113,7 +111,6 @@ public class ProposalDisplay {
     @Nullable
     private TextField proposalFeeTextField, comboBoxValueTextField, requiredBondForRoleTextField;
     private TextField proposalTypeTextField, myVoteTextField, voteResultTextField;
-    private Label myVoteLabel, voteResultLabel;
     public InputTextField nameTextField;
     public InputTextField linkInputTextField;
     @Nullable
@@ -142,8 +139,7 @@ public class ProposalDisplay {
     private ChangeListener<BondedRoleType> requiredBondForRoleListener;
     private TitledGroupBg titledGroupBg;
     private int titledGroupBgRowSpan;
-    private VBox linkWithIconContainer;
-    private VBox comboBoxValueContainer;
+    private VBox linkWithIconContainer, comboBoxValueContainer, myVoteBox, voteResultBox;
 
     public ProposalDisplay(GridPane gridPane, BsqFormatter bsqFormatter, DaoFacade daoFacade,
                            @Nullable ChangeParamValidator changeParamValidator, Navigation navigation) {
@@ -213,7 +209,7 @@ public void createAllFields(String title, int gridRowStartIndex, double top, Pro
             linkInputTextField.setValidator(new UrlInputValidator());
         inputControls.add(linkInputTextField);
 
-        Tuple3<Label, HyperlinkWithIcon, VBox> tuple = FormBuilder.addTopLabelHyperlinkWithIcon(gridPane, gridRow,
+        Tuple3<Label, HyperlinkWithIcon, VBox> tuple = addTopLabelHyperlinkWithIcon(gridPane, gridRow,
                 Res.get("dao.proposal.display.link"), "", "", 0);
         linkHyperlinkWithIcon = tuple.second;
         linkWithIconContainer = tuple.third;
@@ -370,7 +366,7 @@ public Asset fromString(String string) {
         }
 
         if (comboBoxValueTextFieldIndex > -1) {
-            Tuple3<Label, TextField, VBox> tuple3 = FormBuilder.addTopLabelReadOnlyTextField(gridPane, comboBoxValueTextFieldIndex,
+            Tuple3<Label, TextField, VBox> tuple3 = addTopLabelReadOnlyTextField(gridPane, comboBoxValueTextFieldIndex,
                     Res.get("dao.proposal.display.option"));
             comboBoxValueTextField = tuple3.second;
             comboBoxValueContainer = tuple3.third;
@@ -385,20 +381,20 @@ public Asset fromString(String string) {
         }
 
         Tuple3<Label, TextField, VBox> tuple3 = addTopLabelTextField(gridPane, ++gridRow, Res.get("dao.proposal.display.myVote"));
-        myVoteLabel = tuple3.first;
-        myVoteLabel.setVisible(false);
-        myVoteLabel.setManaged(false);
+
+        myVoteBox = tuple3.third;
+        myVoteBox.setVisible(false);
+        myVoteBox.setManaged(false);
+
         myVoteTextField = tuple3.second;
-        myVoteTextField.setVisible(false);
-        myVoteTextField.setManaged(false);
 
         tuple3 = addTopLabelTextField(gridPane, ++gridRow, Res.get("dao.proposal.display.voteResult"));
-        voteResultLabel = tuple3.first;
-        voteResultLabel.setVisible(false);
-        voteResultLabel.setManaged(false);
+
+        voteResultBox = tuple3.third;
+        voteResultBox.setVisible(false);
+        voteResultBox.setManaged(false);
+
         voteResultTextField = tuple3.second;
-        voteResultTextField.setVisible(false);
-        voteResultTextField.setManaged(false);
 
         addListeners();
     }
@@ -413,10 +409,8 @@ public void applyBallot(@Nullable Ballot ballot) {
         }
         myVoteTextField.setText(myVote);
 
-        myVoteLabel.setVisible(isNotNull);
-        myVoteLabel.setManaged(isNotNull);
-        myVoteTextField.setVisible(isNotNull);
-        myVoteTextField.setManaged(isNotNull);
+        myVoteBox.setVisible(isNotNull);
+        myVoteBox.setManaged(isNotNull);
     }
 
     public void applyEvaluatedProposal(@Nullable EvaluatedProposal evaluatedProposal) {
@@ -435,10 +429,8 @@ public void applyEvaluatedProposal(@Nullable EvaluatedProposal evaluatedProposal
                     threshold, requiredThreshold, quorum, requiredQuorum);
             voteResultTextField.setText(summary);
         }
-        voteResultLabel.setVisible(isEvaluatedProposalNotNull);
-        voteResultLabel.setManaged(isEvaluatedProposalNotNull);
-        voteResultTextField.setVisible(isEvaluatedProposalNotNull);
-        voteResultTextField.setManaged(isEvaluatedProposalNotNull);
+        voteResultBox.setVisible(isEvaluatedProposalNotNull);
+        voteResultBox.setManaged(isEvaluatedProposalNotNull);
     }
 
     public void applyBallotAndVoteWeight(@Nullable Ballot ballot, long merit, long stake) {
@@ -461,10 +453,8 @@ public void applyBallotAndVoteWeight(@Nullable Ballot ballot, long merit, long s
         }
 
         boolean show = ballotIsNotNull && hasVoted;
-        myVoteLabel.setVisible(show);
-        myVoteLabel.setManaged(show);
-        myVoteTextField.setVisible(show);
-        myVoteTextField.setManaged(show);
+        myVoteBox.setVisible(show);
+        myVoteBox.setManaged(show);
     }
 
     public void setIsVoteIncludedInResult(boolean isVoteIncludedInResult) {
@@ -639,10 +629,10 @@ public ScrollPane getView() {
 
         gridPane.getColumnConstraints().addAll(columnConstraints1);
 
-        AnchorPane.setBottomAnchor(gridPane, 20d);
+        AnchorPane.setBottomAnchor(gridPane, 10d);
         AnchorPane.setRightAnchor(gridPane, 10d);
         AnchorPane.setLeftAnchor(gridPane, 10d);
-        AnchorPane.setTopAnchor(gridPane, 20d);
+        AnchorPane.setTopAnchor(gridPane, 10d);
         anchorPane.getChildren().add(gridPane);
 
         return scrollPane;
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
index 9c4cd8b1ae1..47e22437626 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
@@ -90,7 +90,7 @@
 
 import javax.annotation.Nullable;
 
-import static bisq.desktop.util.FormBuilder.addButtonBusyAnimationLabel;
+import static bisq.desktop.util.FormBuilder.addButtonBusyAnimationLabelAfterGroup;
 import static bisq.desktop.util.FormBuilder.addComboBox;
 import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
 import static bisq.desktop.util.FormBuilder.addTopLabelReadOnlyTextField;
@@ -437,8 +437,8 @@ private void addProposalDisplay() {
             proposalDisplay.createAllFields(Res.get("dao.proposal.create.new"), alwaysVisibleGridRowIndex, Layout.GROUP_DISTANCE,
                     selectedProposalType, true);
 
-            final Tuple4<Button, BusyAnimation, Label, HBox> makeProposalTuple = addButtonBusyAnimationLabel(root,
-                    proposalDisplay.getGridRow(), 0, Res.get("dao.proposal.create.button"), 0);
+            final Tuple4<Button, BusyAnimation, Label, HBox> makeProposalTuple = addButtonBusyAnimationLabelAfterGroup(root,
+                    proposalDisplay.getGridRow(), 0, Res.get("dao.proposal.create.button"));
             makeProposalButton = makeProposalTuple.first;
 
             busyAnimation = makeProposalTuple.second;
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java
index a7d0881345a..c0748091064 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java
@@ -697,6 +697,7 @@ private void createVoteView() {
         meritTextField.setText(bsqFormatter.formatCoinWithCode(Coin.ZERO));
         voteFields.add(meritLabel);
         voteFields.add(meritTextField);
+        voteFields.add(meritTuple.third);
 
         stakeInputTextField = addInputTextField(root, ++gridRow,
                 Res.get("dao.proposal.myVote.stake"));
@@ -721,6 +722,7 @@ private void createVoteView() {
                 Res.get("dao.proposal.myVote.button"));
         voteButton = voteButtonTuple.first;
         voteButtons.add(voteButton);
+        voteFields.add(voteButtonTuple.forth);
         voteButtonBusyAnimation = voteButtonTuple.second;
         voteButtonInfoLabel = voteButtonTuple.third;
     }