diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 0d7756a6a..0108e9e76 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -215,49 +215,6 @@ class Branching {
 		$full_view = (int)$row_query_fv['full_view'] == 1 ? true : false;
 		$full_view = true;
 
-		echo '<div class="floatLeft">';
-		# skrčen / razširjen
-		if ($this->expanded) {
-			echo '<span title="'.$lang['srv_expanded_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=0"><span class="faicon expanded"></span>'.$lang['srv_expanded_0_short'].'</a></span> ';
-			$sqle = sisplet_query("SELECT count(*) AS c FROM srv_branching WHERE ank_id='$this->anketa'");
-			$rowe = mysqli_fetch_array($sqle);
-			if ($rowe['c'] > 15 && !isset($_COOKIE['expanded']))
-				echo '<span class="expanded-tooltip top">'.$lang['srv_expaned_text'].' <a href="#" onclick="$(this).closest(\'.expanded-tooltip\').hide(); var d = new Date(); d.setDate(d.getDate()+30); document.cookie=\'expanded=1;expires=\'+d.toUTCString(); return false;" class="close">'.$lang['srv_zapri'].'</a><span class="arrow"></span></span>';
-		} else {
-			echo '<span title="'.$lang['srv_expanded_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=1"><span class="faicon compress"></span>'.$lang['srv_expanded_0_short'].'</a></span> ';
-		}
-		echo Help::display('srv_branching_expanded');
-
-		echo '</div>';
-
-
-		echo '<div class="floatRight">';
-
-		# find & replace
-		if ($row['locked'] == 0) {
-			echo '<a href="#" onclick="find_replace(); return false;" title="'.$lang['srv_find_replace'].'" ><span class="faicon replace"></span></a>';
-		}
-
-		if ($row['locked'] == 0 && $full_view == true) {
-			echo '<a href="#" onclick="javascript:pagebreak_all(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span></a> '."\n";
-		}
-
-		# Hrošč je viden samo če imamo ife in razširjen pogled
-		if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0)
-			echo '<a href="#" onclick="check_pogoji(); return false;" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span></a> '."\n";
-		}
-
-		if ($row['locked'] == 0 && $full_view == true) {
-			echo '<a href="#" onclick="prestevilci(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span></a>' . Help :: display('srv_grupe_recount_branching')  ."\n";
-		}
-
-		if ($has_if == true && $full_view == true || ($has_if == true && $this->expanded == false)) {
-			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span></a>'."\n";
-			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span></a>'."\n";
-		}
-
-		echo '</div>';
-
 		// prikaz blokov kot zavihke
 		echo '<div class="blockSwitch">';
 		$sql = sisplet_query("SELECT i.* FROM srv_if i, srv_branching b WHERE i.tab='1' AND i.tip='1' AND i.id=b.element_if AND b.ank_id='$this->anketa' ORDER BY b.parent, b.vrstni_red");
@@ -1703,6 +1660,17 @@ class Branching {
 		echo '</div>';
 		
 		echo '<div id="top_napredne_dropdown" class="displayNone">';
+
+		#odpri vse - zapri vse
+		if ($has_if == true && $full_view == true || ($has_if == true && $this->expanded == false)) {
+			echo '<p class="segment_option">';
+			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); toggleSurveyTopSettings(); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span>'.$lang['srv_expand'].'</a>'."\n";
+			echo '</p>';
+			echo '<p class="segment_option">';
+			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); toggleSurveyTopSettings(); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span>'.$lang['srv_collapse'].'</a>'."\n";
+			echo '</p>';
+		}
+
 		# find & replace
 		if ($row['locked'] == 0) {
 			echo '<p class="segment_option">';
@@ -1710,6 +1678,7 @@ class Branching {
 			echo '</p>';
 		}
 
+		#prelom strani
 		if ($row['locked'] == 0 && $full_view == true) {
 			echo '<p class="segment_option">';
 			echo '<a href="#" onclick="javascript:pagebreak_all(); toggleSurveyTopSettings(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span>'.$lang['srv_pagebreak_all'].'</a> '."\n";
@@ -1723,11 +1692,13 @@ class Branching {
 			echo '</p>';
 		}
 
+		#prestevilci
 		if ($row['locked'] == 0 && $full_view == true) {
 			echo '<p class="segment_option">';
 			echo '<a href="#" onclick="prestevilci(); toggleSurveyTopSettings(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span>'.$lang['srv_grupe_recount_branching'].'</a>' . Help :: display('srv_grupe_recount_branching')  ."\n";
 			echo '</p>';
 		}
+
 		echo '</div>';
 
 		//Klik izven razprith nastavitev - zapremo okno