diff --git a/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties b/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties
--- a/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties
+++ b/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties
@@ -42,7 +42,7 @@
 LBL_CreateBranchAction_PopupName=Create Branch...
 LBL_CreateBranch.OKButton.text=&Create
 LBL_CreateBranch.title=Create Branch
-CreateBranchPanel.jLabel1.text=&Branch Name:
+CreateBranchPanel.jLabel1.text=Branch &Name:
 CreateBranchPanel.branchNameField.text=
 MSG_CreateBranchAction.branchCreated = Branch created\n\
 Name: {0}\n\
@@ -60,5 +60,5 @@
 Do you still want to delete the branch?
 LBL_DeleteBranchAction.confirmation=Delete Branch
 MSG_DeleteBranchAction.confirmation=Do you really want to delete branch {0}
-CreateBranchPanel.cbCheckoutBranch.text=&Checkout Created Branch
+CreateBranchPanel.cbCheckoutBranch.text=Check&out Created Branch
 CreateBranchPanel.cbCheckoutBranch.TTtext=Checkout the branch right after it is created
diff --git a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form b/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form
--- a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form
+++ b/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form
@@ -16,10 +16,9 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
+          <Group type="102" alignment="1" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="revisionPickerDialog1" alignment="1" pref="0" max="32767" attributes="0"/>
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
@@ -33,6 +32,7 @@
               </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
+          <Component id="revisionPickerDialog1" alignment="0" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
diff --git a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java b/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java
--- a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java
+++ b/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java
@@ -91,10 +91,9 @@
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(revisionPickerDialog1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(jLabel1)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -104,6 +103,7 @@
                         .addGap(0, 0, Short.MAX_VALUE))
                     .addComponent(lblError, javax.swing.GroupLayout.DEFAULT_SIZE, 479, Short.MAX_VALUE))
                 .addContainerGap())
+            .addComponent(revisionPickerDialog1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
diff --git a/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties b/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties
--- a/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties
+++ b/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties
@@ -89,7 +89,7 @@
 RevisionListPanel.btnRefresh.text=&Refresh
 #RevisionDialog
 MSG_RevisionDialog.selectBranch = Select Branch
-RevisionDialog.lblRevision.text=Re&vision
-RevisionDialog.lblBranch.text=&Branch
+RevisionDialog.lblRevision.text=Re&vision:
+RevisionDialog.lblBranch.text=&Branch:
 RevisionListPanel.jLabel4.text=&Filter:
 RevisionListPanel.jLabel4.TTtext=Remove revisions from the list not complying to this criteria
diff --git a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.form b/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.form
--- a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.form
+++ b/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.4" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
@@ -17,23 +17,23 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="1" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="1" attributes="0">
-                  <Component id="revisionInfoPanel" alignment="0" pref="395" max="32767" attributes="0"/>
+                  <Component id="revisionInfoPanel" alignment="0" pref="399" max="32767" attributes="0"/>
                   <Group type="102" alignment="1" attributes="0">
                       <Component id="lblRevision" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
-                      <Component id="revisionField" pref="234" max="32767" attributes="0"/>
+                      <Component id="revisionField" max="32767" attributes="0"/>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="btnSelectRevision" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="lblBranch" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="cmbBranches" pref="334" max="32767" attributes="0"/>
+                      <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
+                      <Component id="cmbBranches" max="32767" attributes="0"/>
                   </Group>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -52,7 +52,7 @@
                   <Component id="cmbBranches" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="revisionInfoPanel" pref="146" max="32767" attributes="0"/>
+              <Component id="revisionInfoPanel" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
@@ -96,6 +96,9 @@
     </Component>
     <Component class="javax.swing.JLabel" name="lblBranch">
       <Properties>
+        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
+          <ComponentRef name="cmbBranches"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/git/ui/repository/Bundle.properties" key="RevisionDialog.lblBranch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java b/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java
--- a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java
+++ b/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java
@@ -82,6 +82,7 @@
 
         org.openide.awt.Mnemonics.setLocalizedText(btnSelectRevision, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.btnSelectRevision.text")); // NOI18N
 
+        lblBranch.setLabelFor(cmbBranches);
         org.openide.awt.Mnemonics.setLocalizedText(lblBranch, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.lblBranch.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -91,17 +92,17 @@
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(revisionInfoPanel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 395, Short.MAX_VALUE)
+                    .addComponent(revisionInfoPanel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 399, Short.MAX_VALUE)
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(lblRevision)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(revisionField, javax.swing.GroupLayout.DEFAULT_SIZE, 234, Short.MAX_VALUE)
+                        .addComponent(revisionField)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(btnSelectRevision))
                     .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
                         .addComponent(lblBranch)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(cmbBranches, 0, 334, Short.MAX_VALUE)))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(cmbBranches, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
@@ -117,7 +118,7 @@
                     .addComponent(lblBranch)
                     .addComponent(cmbBranches, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(revisionInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)
+                .addComponent(revisionInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
diff --git a/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form b/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form
--- a/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form
+++ b/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>