diff --git a/manifest b/manifest
index 4e9205e..fef661d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixed\sexcessive\sminimum\ssize\sfor\scommit\smessage\shistory\scombo\sbox.\sAddresses\sticket\s[f48f1b9f7d]
-D 2015-06-02T16:07:01.615
+C Reorganized\sbranch\soptions\sin\scommit\sdialog.
+D 2015-06-02T16:19:59.488
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -210,7 +210,7 @@ F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
 F src/CloneDialog.cpp c341622b01d493387d6e4928018b3392d92471e8
 F src/CloneDialog.h 8813d91f893eb3eb86a4ea5e50f9a53a0ea07047
-F src/CommitDialog.cpp bbf5fe1c66d28068cc3fd061f4f9f1faa9e89196
+F src/CommitDialog.cpp 3d25ae2aa8af0ab417736a3f2d7f95a8dcb7480a
 F src/CommitDialog.h 921bf27c0c538ab9e9d6bdc750064337d346270b
 F src/CustomWebView.cpp b7dd0c41977c2cba005df07ed8967ba6f58d07d9
 F src/CustomWebView.h fbc8ee55812d1acb3c3b2bc31be7533e8a112822
@@ -245,14 +245,14 @@ F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
 F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
 F ui/BrowserWidget.ui 994ad9ea0e9f5815d6b1a27acc2f6f39164c507f
 F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
-F ui/CommitDialog.ui f496499f0948c885ef365d3827e8cc3c30e4d618
+F ui/CommitDialog.ui 1e5dafa742e9ae07ec937bcda8cda3297ddc6199
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/FslSettingsDialog.ui eb3d4cb764cab90b01e82922237d8c42d6ce1749
 F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 4c480cd595a32664d01c85bf74845c4282fc0068
-P 34f0879b8cf7507c43d0d36de0aae704151aa4f4
-R 487edb7b391ec536bb5b940027796b82
+P 4e621933a5ddf87127fab8cc0aa94a4a6fd8c964
+R 176bdc576cc4d16d2dc819b4b903879d
 U kostas
-Z 3c716124b97484a56510d667a38d86e1
+Z d1ca8b7e2dcce6bdcdbdb07bc1f60316
diff --git a/manifest.uuid b/manifest.uuid
index 3b1d7e7..67808eb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e621933a5ddf87127fab8cc0aa94a4a6fd8c964
\ No newline at end of file
+1954aea71218df9a36b6059fac19ab416ef470dc
\ No newline at end of file
diff --git a/src/CommitDialog.cpp b/src/CommitDialog.cpp
index 4d0de48..43da8a8 100644
--- a/src/CommitDialog.cpp
+++ b/src/CommitDialog.cpp
@@ -164,6 +164,7 @@ void CommitDialog::on_listView_clicked(const QModelIndex &)
 //------------------------------------------------------------------------------
 void CommitDialog::on_chkNewBranch_toggled(bool checked)
 {
+	ui->lblPrivateBranch->setEnabled(checked);
 	ui->chkPrivateBranch->setEnabled(checked);
 	ui->lineBranchName->setEnabled(checked);
 }
diff --git a/ui/CommitDialog.ui b/ui/CommitDialog.ui
index 666ddf8..27ddef5 100644
--- a/ui/CommitDialog.ui
+++ b/ui/CommitDialog.ui
@@ -67,7 +67,7 @@
    </item>
    <item>
     <widget class="QWidget" name="widgetBranchOptions" native="true">
-     <layout class="QFormLayout" name="formLayout">
+     <layout class="QFormLayout" name="formLayout_2">
       <property name="leftMargin">
        <number>0</number>
       </property>
@@ -83,45 +83,69 @@
       <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>New branch</string>
+         <string>Commit to new branch</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QCheckBox" name="chkNewBranch">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QCheckBox" name="chkNewBranch">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <layout class="QFormLayout" name="formLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="lblPrivateBranch">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Private branch</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="chkPrivateBranch">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
       </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="chkPrivateBranch">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="lineBranchName">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
+      <item row="1" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Branch name</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Private branch</string>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="lineBranchName">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
        </widget>
       </item>