diff --git a/rhodecode/templates/base/vcs_settings.html b/rhodecode/templates/base/vcs_settings.html
--- a/rhodecode/templates/base/vcs_settings.html
+++ b/rhodecode/templates/base/vcs_settings.html
@@ -116,6 +116,26 @@
                 % endif
             </div>
         </div>
+        ## LABS for HG
+        % if c.labs_active:
+            <div class="panel panel-danger">
+                <div class="panel-heading">
+                    <h3 class="panel-title">${_('Mercurial Labs Settings')} (${_('These features are considered experimental and may not work as expected.')})</h3>
+                </div>
+                <div class="panel-body">
+
+                    <div class="checkbox">
+                        ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)}
+                        <label for="rhodecode_hg_use_rebase_for_merging{suffix}">${_('Use rebase as merge strategy')}</label>
+                    </div>
+                    <div class="label">
+                        <span class="help-block">${_('Use rebase instead of creating a merge commit when merging via web interface.')}</span>
+                    </div>
+
+                </div>
+            </div>
+        % endif
+
     % endif
 
     % if display_globals or repo_type in ['svn']:
@@ -143,7 +163,7 @@
                 </div>
                 <div class="field">
                     <div class="label">
-                        <span class="help-block">${_('e.g. http://localhost:8080/')}</span>
+                        <span class="help-block">${_('Url to Apache Proxy, e.g. http://localhost:8080/')}</span>
                     </div>
                  </div>
                 <div class="field">
@@ -236,31 +256,4 @@
         </div>
     % endif
 
-    ## This condition has to be adapted if we add more labs settings for
-    ## VCS types other than 'hg'
-    % if c.labs_active and (display_globals or repo_type in ['hg']):
-        <div class="panel panel-danger">
-            <div class="panel-heading">
-                <h3 class="panel-title">${_('Labs settings')}: ${_('These features are considered experimental and may not work as expected.')}</h3>
-            </div>
-            <div class="panel-body">
-              <div class="fields">
-
-                <div class="field">
-                  <div class="label">
-                    <label>${_('Mercurial server-side merge')}:</label>
-                  </div>
-                  <div class="checkboxes">
-                    <div class="checkbox">
-                      ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)}
-                      <label for="rhodecode_hg_use_rebase_for_merging${suffix}">${_('Use rebase instead of creating a merge commit when merging via web interface')}</label>
-                    </div>
-                    <!-- <p class="help-block">Help message here</p> -->
-                  </div>
-                </div>
-
-              </div>
-            </div>
-        </div>
-    % endif
 </%def>