diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index 141781e5b..34d07996b 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -1903,17 +1903,8 @@ class SurveyAnalysis {
 			echo '<div class="anl_variable_type">&nbsp;&nbsp;<span>'.$lang['srv_analiza_opisne_variable_type'].': </span>'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</div>';
 		}
 
-		echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'">';
-        echo '  <a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">';
-        echo '      &nbsp;(<span class="blue active" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
-        echo '  </a>';
-        echo' </span>';
-		
-        echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'">';
-        echo '  <a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">';
-        echo '      &nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue active" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
-        echo '  </a>';
-        echo'  </span>';
+        // Preklop navedbe/enote
+        self::showEnoteNavedbe($spid, $status='1');
 		
         echo '</td>';
 
@@ -1936,10 +1927,8 @@ class SurveyAnalysis {
 		}
         
 		echo '<td class="cell_grid" colspan="'.($_clmn_cnt).'">';
-		echo $lang['srv_analiza_opisne_answers'].'&nbsp;';
-		echo '  <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
+		echo $lang['srv_analiza_opisne_answers'];
+        self::showFreqPercent($spid);
 		echo '</td>';
 
 		echo '<td class="cell_value">'.$lang['srv_analiza_opisne_valid'].'</td>';
@@ -2067,17 +2056,8 @@ class SurveyAnalysis {
 			echo '<div class="anl_variable_type">&nbsp;&nbsp;<span>'.$lang['srv_analiza_opisne_variable_type'].': </span>'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</div>';
 		}
 
-        echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'">';
-        echo '  <a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">';
-        echo '      &nbsp;(<span class="blue active" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
-        echo '  </a>';
-        echo' </span>';
-		
-        echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'">';
-        echo '  <a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">';
-        echo '      &nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue active" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
-        echo '  </a>';
-        echo'  </span>';
+        // Preklop navedbe/enote
+        self::showEnoteNavedbe($spid, $status='2');
 
         echo '</td>';
 
@@ -2100,11 +2080,9 @@ class SurveyAnalysis {
 		}
 
 		echo '<td class="cell_grid" colspan="'.($_clmn_cnt+1).'">';
-		echo $lang['srv_analiza_opisne_arguments'].'&nbsp;';
-		echo '  <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '</td>';
+		echo $lang['srv_analiza_opisne_arguments'];
+        self::showFreqPercent($spid);
+        echo '</td>';
 
 		echo '</tr>';
 
@@ -2310,11 +2288,11 @@ class SurveyAnalysis {
 			echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_expression'].'</td>';
 			echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_skala'].'</td>';
 		}
-		echo '<td class="cell_value" colspan="'.$_clmn_cnt.'">'.$lang['srv_analiza_opisne_answers'];
-		echo '  <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '</td>';
+		echo '<td class="cell_value" colspan="'.$_clmn_cnt.'">';
+        echo $lang['srv_analiza_opisne_answers'];
+        self::showFreqPercent($spid);
+        echo '</td>';
+        
 		echo '<td class="cell_value">'.$lang['srv_analiza_opisne_valid'].'</td>';
 		echo '<td class="cell_value">'.$lang['srv_analiza_num_units'].'</td>';
 		
@@ -2493,17 +2471,8 @@ class SurveyAnalysis {
 			echo '<div class="anl_variable_type">&nbsp;&nbsp;<span>'.$lang['srv_analiza_opisne_variable_type'].': </span>'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</div>';
 		}
 
-        echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'">';
-        echo '  <a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">';
-        echo '      &nbsp;(<span class="blue active" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
-        echo '  </a>';
-        echo' </span>';
-		
-        echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'">';
-        echo '  <a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">';
-        echo '      &nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue active" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
-        echo '  </a>';
-        echo'  </span>';	
+        // Preklop navedbe/enote
+        self::showEnoteNavedbe($spid, $status='1');
         	
         echo '</td>';
 
@@ -2651,17 +2620,8 @@ class SurveyAnalysis {
 			echo '<div class="anl_variable_type">&nbsp;&nbsp;<span>'.$lang['srv_analiza_opisne_variable_type'].': </span>'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</div>';
 		}
 
-		echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'">';
-        echo '  <a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">';
-        echo '      &nbsp;(<span class="blue active" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
-        echo '  </a>';
-        echo' </span>';
-		
-        echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'">';
-        echo '  <a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">';
-        echo '      &nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue active" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
-        echo '  </a>';
-        echo'  </span>';
+        // Preklop navedbe/enote
+        self::showEnoteNavedbe($spid, $status='2');
         
         echo '</td>';
 
@@ -2859,11 +2819,10 @@ class SurveyAnalysis {
 			echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_skala'].'</td>';
 		}
 
-		echo '<td class="cell_grid" colspan="'.($_clmn_cnt+1).'">'.$lang['srv_analiza_opisne_answers'];
-		echo '  <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '</td>';
+		echo '<td class="cell_grid" colspan="'.($_clmn_cnt+1).'">';
+        echo $lang['srv_analiza_opisne_answers'];
+        self::showFreqPercent($spid);
+        echo '</td>';
 
 		echo '<td class="cell_value">'.$lang['srv_analiza_opisne_valid'].'</td>';
 		echo '<td class="cell_value">'.$lang['srv_analiza_num_units'].'</td>';
@@ -3167,11 +3126,10 @@ class SurveyAnalysis {
 			echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_skala'].'</td>';
 		}
 
-		echo '<td class="cell_grid" colspan="'.($_clmn_cnt+6).'">'.$lang['srv_analiza_opisne_answers'];
-		echo '  <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
-		echo '  <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
-		echo '</td>';
+		echo '<td class="cell_grid" colspan="'.($_clmn_cnt+6).'">';
+        echo $lang['srv_analiza_opisne_answers'];
+        self::showFreqPercent($spid);
+        echo '</td>';
 
 		# št. enot
 		echo '<td  class="cell_value"></td>';
@@ -5501,7 +5459,6 @@ class SurveyAnalysis {
 		echo '</span>';
 	}
 
-
 	static public function showIcons($spid, $spremenljivka, $_from = 'freq', $additional=array()) {
 		global $lang;
 
@@ -5937,6 +5894,34 @@ class SurveyAnalysis {
 		} 
 	}
 
+    // Preklop enote navedbe
+    static private function showEnoteNavedbe($spid, $status){
+        global $lang;
+
+        echo '<div class="enote-navedbe_holder">';
+
+        echo '<button class="small '.($status=='1' ? 'active' : '').'" title="'.$lang['srv_enote_navedbe_1'].'" onClick="show_navedbe(\''.$spid.'\',\'1\');">'.$lang['srv_analiza_opisne_units'].'</button>';
+        echo '<button class="small '.($status=='2' ? 'active' : '').'" title="'.$lang['srv_enote_navedbe_2'].'" onClick="show_navedbe(\''.$spid.'\',\'2\');">'.$lang['srv_analiza_opisne_arguments'].'</button>';
+
+        echo'</div>';
+    }
+
+    // Preklop frekvence odstotki
+    static private function showFreqPercent($spid){
+        global $lang;
+
+        echo '<div class="freq-p_holder">';
+
+        /*echo '  <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
+		echo '  <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
+		echo '  <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
+*/
+
+        echo '<button id="freq-p_button_1_'.$spid.'" class="small active" title="'.$lang['srv_frequency'].'" onClick="show_single_percent(\''.$spid.'\', \'1\');">'.$lang['srv_frequency'].'</button>';
+        echo '<button id="freq-p_button_2_'.$spid.'" class="small active" title="'.$lang['srv_chart_percent'].'" onClick="show_single_percent(\''.$spid.'\', \'2\');">'.$lang['srv_chart_percent'].'</button>';
+
+        echo'</div>';
+    }
 
 
 	/** polovi opisne za vse spremenljivke
@@ -7737,30 +7722,8 @@ class SurveyAnalysis {
         echo '<div class="div_analiza_scale">';
 
 		if ($objectSkala->canChangeSkala()) {
-
-			if ($objectSkala->is(SpremenljivkaSkala::ORD)) {
-				echo '<a href="#" onclick="changeSpremenljivkaLestvica(\''.$spid.'\',\''.SpremenljivkaSkala::NOM.'\'); return false;">';
-				echo '<span class="semi-bold" title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::ORD].'">';
-				echo $lang['srv_skala_'.SpremenljivkaSkala::ORD];
-				echo '</span>';
-				echo ' / ';
-				echo '<span title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::NOM].'">';
-				echo $lang['srv_skala_'.SpremenljivkaSkala::NOM];
-				echo '</span>';
-				echo '</a>';
-			}
-
-			if ($objectSkala->is(SpremenljivkaSkala::NOM)) {
-				echo '<a href="#" onclick="changeSpremenljivkaLestvica(\''.$spid.'\',\''.SpremenljivkaSkala::ORD.'\'); return false;">';
-				echo '<span title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::ORD].'">';
-				echo $lang['srv_skala_'.SpremenljivkaSkala::ORD];
-				echo '</span>';
-				echo ' / ';
-				echo '<span class="semi-bold" title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::NOM].'">';
-				echo $lang['srv_skala_'.SpremenljivkaSkala::NOM];
-				echo '</span>';
-				echo '</a>';
-			}
+            echo '<button class="small '.($objectSkala->is(SpremenljivkaSkala::ORD) ? 'active' : '').'" title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::ORD].'"  onclick="changeSpremenljivkaLestvica(\''.$spid.'\',\''.SpremenljivkaSkala::ORD.'\'); return false;">'.$lang['srv_skala_'.SpremenljivkaSkala::ORD].'</button>';
+            echo '<button class="small '.($objectSkala->is(SpremenljivkaSkala::NOM) ? 'active' : '').'" title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::NOM].'"  onclick="changeSpremenljivkaLestvica(\''.$spid.'\',\''.SpremenljivkaSkala::NOM.'\'); return false;">'.$lang['srv_skala_'.SpremenljivkaSkala::NOM].'</button>';
 		} 
         else {
 			echo '<span title="'.$lang['srv_skala_long_'.$objectSkala->getSkala()].'">';
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php
index 216739c49..a262286da 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php
@@ -69,61 +69,67 @@ class SurveyAnalysisHelper {
 	function displayMissingLegend(){
 		global $lang;	
 		
-		echo '<div id="bottom_data_legend" class="floatLeft">';
-		echo '<div>';
-		echo '<div id="bdld1" class="as_link strong" onclick="$(\'#bottom_data_legend_detail, #bdld1, #bdld2\').toggle();"><span class="faicon plus"></span> '.$lang['srv_bottom_data_legend_note'].'</div>';
-		echo '<div id="bdld2" class="as_link strong" style="display:none" onclick="$(\'#bottom_data_legend_detail, #bdld1, #bdld2\').toggle();"><span class="faicon minus"></span> '.$lang['srv_bottom_data_legend_note'].'</div>';
+		echo '<div id="bottom_data_legend_missing" class="legend_box">';
+
+		echo '<div class="legend_title">';
+		echo '  <span onclick="$(\'#bottom_data_legend_detail_missing\').toggle(\'fast\');"><span class="faicon arrow2_r"></span>'.$lang['srv_bottom_data_legend_note'].'</span>';
 		echo '</div>';
-		echo '<div id="bottom_data_legend_detail" style="display:none">';
-		echo '<ul>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li1'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li2'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li3'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li4'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li5'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li99'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li98'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li97'].'</li>';
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li0'].'</li>';
-		echo '</ul>';
+
+		echo '<div id="bottom_data_legend_detail_missing" class="legend_details">';
+		echo '  <ul>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li1'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li2'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li3'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li4'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li5'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li99'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li98'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li97'].'</li>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li0'].'</li>';
+		echo '  </ul>';
 		echo '</div>';
+
 		echo '</div>';
 	}
 	
 	function displayStatusLegend(){
 		global $lang;
-		
-		echo '<div id="bottom_data_legend" class="floatLeft bg_blue">';
-		echo '<div>';
-		echo '<div id="bdlds1" class="as_link strong" onclick="$(\'#bottom_data_legend_detail_status, #bdlds1, #bdlds2\').toggle();"><span class="faicon plus"></span> '.$lang['srv_bottom_data_legend_status_note'].'</div>';
-		echo '<div id="bdlds2" class="as_link strong" style="display:none" onclick="$(\'#bottom_data_legend_detail_status, #bdlds1, #bdlds2\').toggle();"><span class="faicon minus"></span> '.$lang['srv_bottom_data_legend_status_note'].'</div>';
+
+		echo '<div id="bottom_data_legend_status" class="legend_box">';
+
+		echo '<div class="legend_title">';
+		echo '  <span onclick="$(\'#bottom_data_legend_detail_status\').toggle(\'fast\');"><span class="faicon arrow2_r"></span>'.$lang['srv_bottom_data_legend_status_note'].'</span>';
 		echo '</div>';
-		echo '<div id="bottom_data_legend_detail_status" style="display:none">';
-		echo '<ul>';
+
+		echo '<div id="bottom_data_legend_detail_status" class="legend_details">';
+		echo '  <ul>';
 		for ($i = 0; $i <= 6; $i++) {
-			echo '<li>'.$i.' - '.$lang['srv_userstatus_'.$i].'</li>';
+			echo '      <li>'.$i.' - '.$lang['srv_userstatus_'.$i].'</li>';
 		}
-		echo '<li>'.$lang['srv_bottom_data_legend_note_li0'].'</li>';
-		echo '</ul>';
+		echo '      <li>'.$lang['srv_bottom_data_legend_note_li0'].'</li>';
+		echo '  </ul>';
 		echo '</div>';
+
 		echo '</div>';
 	}
 	
 	function displayTestLegend(){
 		global $lang;
 		
-		echo '<div id="bottom_data_legend" class="floatLeft test">';
-		echo '<div>';
-		echo '<div id="bdldt1" class="as_link strong" onclick="$(\'#bottom_data_legend_detail_test, #bdldt1, #bdldt2\').toggle();"><span class="faicon plus"></span> '.$lang['srv_bottom_data_legend_test_note'].'</div>';
-		echo '<div id="bdldt2" class="as_link strong" style="display:none" onclick="$(\'#bottom_data_legend_detail_test, #bdldt1, #bdldt2\').toggle();"><span class="faicon minus"></span> '.$lang['srv_bottom_data_legend_test_note'].'</div>';
+		echo '<div id="bottom_data_legend_test" class="legend_box">';
+
+		echo '<div class="legend_title">';
+		echo '  <span onclick="$(\'#bottom_data_legend_detail_test\').toggle(\'fast\');"><span class="faicon arrow2_r"></span>'.$lang['srv_bottom_data_legend_test_note'].'</span>';
 		echo '</div>';
-		echo '<div id="bottom_data_legend_detail_test" style="display:none">';
-		echo '<ul>';
-		echo '<li>0 - '.$lang['srv_bottom_data_legend_test_note_li0'].'</li>';
-		echo '<li>1 - '.$lang['srv_bottom_data_legend_test_note_li1'].'</li>';
-		echo '<li>2 - '.$lang['srv_bottom_data_legend_test_note_li2'].'</li>';
-		echo '</ul>';
+
+		echo '<div id="bottom_data_legend_detail_test" class="legend_details">';
+		echo '  <ul>';
+		echo '      <li>0 - '.$lang['srv_bottom_data_legend_test_note_li0'].'</li>';
+		echo '      <li>1 - '.$lang['srv_bottom_data_legend_test_note_li1'].'</li>';
+		echo '      <li>2 - '.$lang['srv_bottom_data_legend_test_note_li2'].'</li>';
+		echo '  </ul>';
 		echo '</div>';
+
 		echo '</div>';
 	}
 }
\ No newline at end of file
diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
index c8999bdee..3979f1788 100644
--- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
+++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
@@ -1114,8 +1114,6 @@ class SurveyDataDisplay{
 		global $global_user_id;
 
 
-        
-
 		// na vrhu in na dnu izrisemo paginacijo
 		if(self::$dataFileStatus != FILE_STATUS_NO_DATA && (int)self::$_RECORD_COUNT  > 0) {
 			
@@ -1124,29 +1122,7 @@ class SurveyDataDisplay{
 
 
 			// Checkboxa za urejanje in izpise podatkov ter razpiranje dodatnih nastavitev
-			echo '<div class="dataSettingsBasic">';
-
-			echo '<input type="checkbox" id="dataIcons_edit" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_edit'] == true ? ' checked="checekd"' : '').'/><label for="dataIcons_edit">'.$lang['srv_dataIcons_edit'].'</label>';
-			if (self::$displayEditIcons['dataIcons_edit'] == true) {
-				echo ' '.Help::display('srv_podatki_urejanje_inline');
-			}
-			echo '&nbsp;&nbsp;';
-			
-            // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
-            $userAccess = UserAccess::getInstance($global_user_id);
-			if(!$userAccess->checkUserAccess($what='data_export')) {
-				echo '<input type="checkbox" id="dataIcons_write" onclick="popupUserAccess(\'data_export\'); return false;"'
-				.(self::$displayEditIcons['dataIcons_write'] == true ? ' checked="checked"' : '').' '
-				.' /><label for="dataIcons_write" '
-				.(!$userAccess->checkUserAccess($what='data_export') ? 'class="user_access_locked"' : '').'>'
-				.$lang['srv_dataIcons_write'].'</label>';
-			}
-			else {
-				echo '<input type="checkbox" id="dataIcons_write" onchange="changeDataIcons(); return false;"'
-				.(self::$displayEditIcons['dataIcons_write'] == true ? ' checked="checked"' : '').' '
-				.' /><label for="dataIcons_write" '
-				.'>'.$lang['srv_dataIcons_write'].'</label>';
-			}       
+			echo '<div class="dataSettingsBasic">';    
 
 			$arrow = (isset($_SESSION['sid_' . self::$sid]['dataIcons_settings'])) ? $_SESSION['sid_' . self::$sid]['dataIcons_settings'] : 0;
 			echo '<div id="toggleDataCheckboxes" ' . $borderLeft . ' onClick="toggleDataCheckboxes(\'data\');"><span class="faicon ' . ($arrow == 1 ? ' dropup_blue' : 'dropdown_blue') . '"></span> ' . $lang['srv_extra_settings'] . '</div>';
@@ -1156,7 +1132,7 @@ class SurveyDataDisplay{
 
             // Search
 			if(!self::$_VARS[VAR_CODING])
-            self::displayDataSearch();
+                self::displayDataSearch();
 
 
             // Paginacija
@@ -1179,7 +1155,29 @@ class SurveyDataDisplay{
             if (self :: $is_social_network == false || self::$_VARS[VAR_CIRCLES] == 0) {
 
                 echo '<div class="clr" id="dataIconSetingsLinks" >'.$lang['srv_dataIcons_note'].'&nbsp;&nbsp;';
+
                 
+                echo '<input type="checkbox" id="dataIcons_edit" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_edit'] == true ? ' checked="checekd"' : '').'/><label for="dataIcons_edit">'.$lang['srv_dataIcons_edit'].'</label>';
+                if (self::$displayEditIcons['dataIcons_edit'] == true) {
+                    echo ' '.Help::display('srv_podatki_urejanje_inline');
+                }
+                
+                // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
+                $userAccess = UserAccess::getInstance($global_user_id);
+                if(!$userAccess->checkUserAccess($what='data_export')) {
+                    echo '<input type="checkbox" id="dataIcons_write" onclick="popupUserAccess(\'data_export\'); return false;"'
+                    .(self::$displayEditIcons['dataIcons_write'] == true ? ' checked="checked"' : '').' '
+                    .' /><label for="dataIcons_write" '
+                    .(!$userAccess->checkUserAccess($what='data_export') ? 'class="user_access_locked"' : '').'>'
+                    .$lang['srv_dataIcons_write'].'</label>';
+                }
+                else {
+                    echo '<input type="checkbox" id="dataIcons_write" onchange="changeDataIcons(); return false;"'
+                    .(self::$displayEditIcons['dataIcons_write'] == true ? ' checked="checked"' : '').' '
+                    .' /><label for="dataIcons_write" '
+                    .'>'.$lang['srv_dataIcons_write'].'</label>';
+                }  
+
                 if (self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
                     echo '<input type="checkbox" id="dataIcons_quick_view" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_quick_view'] == true ? ' checked="checekd"' : '').'/><label for="dataIcons_quick_view">'.$lang['srv_dataIcons_quick_view'].'</label>';
                     echo '&nbsp;&nbsp;';
@@ -1304,7 +1302,7 @@ class SurveyDataDisplay{
                 }
             } 
             else {
-                echo '<br /><div style="margin: 0 0 40px 0;">Ni podatkov za prikaz. Preverite filtre (Podatki, Para podatki, Polni para podatki)</div>';
+                echo 'Ni podatkov za prikaz. Preverite filtre (Podatki, Para podatki, Polni para podatki)';
             }
         }
             
@@ -1317,22 +1315,25 @@ class SurveyDataDisplay{
 
         echo '</div>'; // id="div_vnosi_data">';
 
-        
+
+        // Spodnje nastavitve pod tabelo
+        echo '<div class="data_table_bottom_holder">';
+
         #izrišemo legendo statusov
         self::displayStatusLegend();
         self::displayMetaStatusLegend();
         self::displayTestLegend();
 
-
 		// na vrhu in na dnu izrisemo paginacijo
-		if(self::$dataFileStatus != FILE_STATUS_NO_DATA){
+		/*if(self::$dataFileStatus != FILE_STATUS_NO_DATA){
 			echo '<div id="vnosi_paginacija" class="bottom_paginacija">';
 			self::displayPaginacija($position='_bottom');
 			echo '</div>';
-
-			echo '<div class="clr"></div>';
-		}
+		}*/
 		
+        echo '</div>';
+
+
 		// osvetlimo stolpec s spremenljivko
 		if (isset($_GET['highlight_spr'])) {
 			?><script>
@@ -3461,7 +3462,7 @@ class SurveyDataDisplay{
 	
 		if (self::$dataFileStatus >= 0) { 
 			#status - če smo v meta ali imamo profil vse enote
-			if ( (self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL])
+			if (true|| (self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL])
 					|| ( SurveyStatusProfiles::getCurentProfileId() == 1 )) {
 				SurveyAnalysisHelper::getInstance()->displayStatusLegend();
 			}
diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js
index 850d10a07..adaeb27ba 100644
--- a/admin/survey/script/script_analiza.js
+++ b/admin/survey/script/script_analiza.js
@@ -722,56 +722,42 @@ function toggle_click_missing(what) {
 	}
 }
 
-function show_single_percent(id,status) {
+function show_single_percent(id, status) {
 
-	if (status == 0) {
-		// pokazemo frekvence in skrijemo procente
-		$('[name=single_sums_percent_'+id+']').each(function() {$(this).hide();});
-		$('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).show();});
-		$('[name=single_sums_percent_cnt_'+id+']').removeClass('anl_dash_bb');
+    // Vklop/izklop frekvenc
+    if (status == 1) {
 
-		// popravimo css link-e
-		$("#img_analysis_f_p_1_"+id+", #img_analysis_f_p_2_"+id).addClass("displayNone");
-		$("#img_analysis_f_1_"+id+", #img_analysis_f_2_"+id).removeClass("displayNone");
-		$("#img_analysis_p_1_"+id+", #img_analysis_p_2_"+id).addClass("displayNone");
-		
-	} else if (status == 1) {
-		// pokazemo oboje
-		$('[name=single_sums_percent_cnt_'+id+']').addClass('anl_dash_bb');
-		$('[name=single_sums_percent_'+id+']').each(function() {$(this).show();});
-		$('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).show();});
+        // Ugasnemo - samo ce je drug vklopljen
+        if($('#freq-p_button_1_'+id).hasClass('active')){
 
-		// popravimo css link-e
-		$("#img_analysis_f_p_1_"+id+", #img_analysis_f_p_2_"+id).removeClass("displayNone");
-		$("#img_analysis_f_1_"+id+", #img_analysis_f_2_"+id).addClass("displayNone");
-		$("#img_analysis_p_1_"+id+", #img_analysis_p_2_"+id).addClass("displayNone");
+            if($('#freq-p_button_2_'+id).hasClass('active')){
+                $('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).hide();});
+                $('#freq-p_button_1_'+id).removeClass('active');
+            }
+        }
+        // Prizgemo
+        else{
+            $('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).show();});
+            $('#freq-p_button_1_'+id).addClass('active');
+        }
+    } 
+    // Vklop/izklop procentov
+    else if (status == 2) {
 
-		// skrijemo še vrednosti v vrstici z procenti
-		$("#span_do_hide_1"+id).hide();
-		$("#span_do_hide_2"+id).hide();
-		$("#span_do_hide_3"+id).hide();
-		$("#span_do_hide_4"+id).hide();
-		$("#span_do_hide_5"+id).hide();
-	
-	} else {
-		$('[name=single_sums_percent_cnt_'+id+']').removeClass('anl_dash_bb');
-		// pokazemo procente skrijemo frekvence
-		$('[name=single_sums_percent_'+id+']').each(function() {$(this).show();});
-		$('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).hide();});
+        // Ugasnemo - samo ce je drug vklopljen
+        if($('#freq-p_button_2_'+id).hasClass('active')){
 
-		// popravimo css link-e
-		$("#img_analysis_f_p_1_"+id+", #img_analysis_f_p_2_"+id).addClass("displayNone");
-		$("#img_analysis_f_1_"+id+", #img_analysis_f_2_"+id).addClass("displayNone");
-		$("#img_analysis_p_1_"+id+", #img_analysis_p_2_"+id).removeClass("displayNone");
-		
-		// skrijemo še vrednosti v vrstici z procenti
-		$("#span_do_hide_1"+id).show();
-		$("#span_do_hide_2"+id).show();
-		$("#span_do_hide_3"+id).show();
-		$("#span_do_hide_4"+id).show();
-		$("#span_do_hide_5"+id).show();
-
-	}
+            if($('#freq-p_button_1_'+id).hasClass('active')){
+                $('[name=single_sums_percent_'+id+']').each(function() {$(this).hide();});
+                $('#freq-p_button_2_'+id).removeClass('active');
+            }
+        }
+        // Prizgemo
+        else{
+            $('[name=single_sums_percent_'+id+']').each(function() {$(this).show();});
+            $('#freq-p_button_2_'+id).addClass('active');
+        }
+    }
 }
 
 function printAnaliza(ime)
@@ -1004,153 +990,17 @@ function showHidenTextTable(spid,num_records,loop_id) {
 		$('#chart_'+spid+'_loop_'+loop_id).load('ajax.php?t=charts&a=show_spid_more_table', {anketa:srv_meta_anketa_id, spid:spid, num_records:num_records, loop:loop_id});
 	}
 }
-/*
-var intervalPB='';
-var hasStarted=false;
 
-function createCollectData(auto) {
-	var _automatic = '&automatic=false';
-	if (arguments.length > 0 ) {
-		if (auto == true) {
-			_automatic = '';
-		}
-	}
+function show_navedbe(spid, status) {
 
-	if (hasStarted == false) {
-		// skrijemo tekst z file statusom
-		$('#vnosi_file_status').hide();
-
-		// nalozimo div za izris poteka
-		$('#fade').fadeTo('slow', 1);
-		$('#fullscreen').show();
-
-		$("#fullscreen").load('prepareDataCrontab.php?action=LoadProgresBar', {anketa: srv_meta_anketa_id}, function () {
-			$('#pbAllPercent div').css('width','0%');
-			$('#pbCurrPercent div').css('width','0%');
-			$('#pbRowPercent div').css('width','0%');
-
-			$('#pbAllPercent').css('visibility','visible');
-			$('#pbCurrPercent').css('visibility','visible');
-			$('#hpbRowPercent, #pbRowPercent').css('visibility','visible');
-
-		    $.ajax({
-		        cache: false,
-		        type: 'post',
-		        url: 'prepareDataCrontab.php?action=collectSingle'+_automatic+'&anketa='+srv_meta_anketa_id,
-		        beforeSend: start_display_progressBar()
-		    });
-		});
-	}
-}
-
-var pbLabels= new Array()
-pbLabels['1'] = lang['srv_collectdata_progress_status1'];
-pbLabels['2'] = lang['srv_collectdata_progress_status2'];
-pbLabels['3'] = lang['srv_collectdata_progress_status3'];
-pbLabels['8'] = lang['srv_collectdata_progress_status8'];
-pbLabels['9'] = lang['srv_collectdata_progress_status9']
-pbLabels['-1'] = lang['srv_collectdata_progress_status0']
-
-function start_display_progressBar(type) {
-	if (type == undefined) type = 'true';
-    if (intervalPB=="") {
-    	$('#start').css('visibility','hidden');
-        intervalPB=window.setInterval("display_progressBar('"+type+"')",750); // interval = 400 ms
-        $('#loader').css('display','inline');
-    } else {
-        stop_display_progressBar();
-    }
-}
-
-function stop_display_progressBar() {
-	$("#loading").show();
-    if (intervalPB!="") {
-    	$('#start').css('visibility','visible');
-        window.clearInterval(intervalPB);
-        intervalPB="";
-
-//		$('#fade').fadeOut('slow');
-		$('#fullscreen').hide();
-		$('#fullscreen').html('');
-
-        hasStarted = true;
-    	return reloadData();
-    }
-}
-function display_progressBar(type) {
-	if (type == undefined) type = 'true';
-	$.ajax({
-		cache: false,
-		type: 'get',
-		url: 'getCollectTimer.php?ajaxTimer='+type,
-		success: function(response) {
-			var data = jQuery.parseJSON(response);
-			
-			$('#actionLabel').html(pbLabels[data.id]+' ('+data.t+')');
-			$('#pbAllPercent div').css('width',data.pa+'%');
-			if ( data.id == '2') {
-				// na koliko % smo v header datoteki
-				$('#pbCurrPercent div').css('width',data.ph+'%');
-				$('#pbCurrPercentLabel').html(data.ph+'%');
-				// na katerem zapisu smo
-				$('#pbRowPercent div').css('width',data.pr+'%');
-				$('#pbRowPercentLabel').html(data.nr);
-				
-			}
-			if ( data.id == '3') {
-//				$('#hpbRowPercent, #pbRowPercent').css('visibility','visible');
-				// na koliko % smo v data datoteki
-				$('#pbCurrPercent div').css('width',data.pd+'%');
-				$('#pbCurrPercentLabel').html(data.pd+'%');
-				// na katerem zapisu smo
-				$('#pbRowPercent div').css('width',data.pr+'%');
-				$('#pbRowPercentLabel').html(data.nr);
-			}
-
-			if ( data.id == '9'  || data.id == '-1' ) { // 9 = konec
-				hasStarted = true;
-				// konec prenosa
-				$('#pbCurrPercent div').css('width','100%');
-				$('#pbRowPercent div').css('width','100%');
-				$('#pbCurrPercentLabel').html('100%');
-				$('#pbRowPercentLabel').html('100%');
-				stop_display_progressBar();
-			}
-		}
-	});
-}
-*/
-function show_navedbe(spid,status) {
-		if (status == 1) {
-			// vidno je oboje
-			// pokažemo pravilne linke
-//			$("[name=span_show_navedbe_1_"+spid+"]").each(function() {$(this).addClass('displayNone'); });
-			$("[name=span_show_navedbe_2_"+spid+"]").each(function() {$(this).removeClass('displayNone'); });
-			$("[name=span_show_navedbe_3_"+spid+"]").each(function() {$(this).addClass('displayNone'); });
-			$("#div_navedbe_1_"+spid).removeClass('displayNone');
-			$("#div_navedbe_2_"+spid).addClass('displayNone');
-			
-		} else if (status == 2) {
-			// pokažemo samo navedbe
-			// pokažemo pravilne linke
-//			$("[name=span_show_navedbe_1_"+spid+"]").each(function() {$(this).removeClass('displayNone'); });
-			$("[name=span_show_navedbe_2_"+spid+"]").each(function() {$(this).addClass('displayNone'); });
-			$("[name=span_show_navedbe_3_"+spid+"]").each(function() {$(this).removeClass('displayNone'); });
-			$("#div_navedbe_1_"+spid).addClass('displayNone');
-			$("#div_navedbe_2_"+spid).removeClass('displayNone');
-			/*
-		} else {
-		
-			// pokažemo samo odgovore
-
-			// pokažemo pravilne linke
-			$("[name=span_show_navedbe_1_"+spid+"]").each(function() {$(this).addClass('displayNone'); });
-			$("[name=span_show_navedbe_2_"+spid+"]").each(function() {$(this).removeClass('displayNone'); });
-			$("[name=span_show_navedbe_3_"+spid+"]").each(function() {$(this).addClass('displayNone'); });
-			$("#div_navedbe_1_"+spid).removeClass('displayNone');
-			$("#div_navedbe_2_"+spid).addClass('displayNone');
-*/
-		}	
+    if (status == 1) {
+        $("#div_navedbe_1_"+spid).removeClass('displayNone');
+        $("#div_navedbe_2_"+spid).addClass('displayNone'); 
+    } 
+    else if (status == 2) {
+        $("#div_navedbe_1_"+spid).addClass('displayNone');
+        $("#div_navedbe_2_"+spid).removeClass('displayNone');
+    }	
 }
 
 // Pobrisemo vec vnosov hkrati
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 1615cf6fa..9b8229369 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -15757,14 +15757,105 @@ textarea#addusers, textarea#addusers_note {
   border: 1px solid #E5E5E5;
   border-radius: 2px;
 }
+.data_table_top_holder .dataSettingsBasic {
+  display: flex;
+  margin-right: 8px;
+  padding-right: 8px;
+  border-right: 1px #C4C4C4 solid;
+}
 .data_table_top_holder #vnosi_paginacija {
   display: flex;
   position: absolute;
   right: 16px;
 }
+.data_table_top_holder #dataSettingsCheckboxes {
+  padding: 16px;
+  color: #333333;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 20px;
+  text-align: left;
+  background: #FFFFFF;
+  border: 1px solid #C4C4C4;
+  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  z-index: 99999;
+  position: absolute;
+  top: 41px;
+  border-radius: 2px;
+}
+.data_table_top_holder #dataSettingsCheckboxes a {
+  text-decoration: none;
+}
+.data_table_top_holder #dataSettingsCheckboxes ul {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+.data_table_top_holder #dataSettingsCheckboxes ul li {
+  margin-bottom: 16px;
+}
+.data_table_top_holder #dataSettingsCheckboxes ul li:last-of-type {
+  margin-bottom: 0;
+}
+.data_table_top_holder #dataSettingsCheckboxes ul li span {
+  cursor: pointer;
+  color: #333333;
+}
+.data_table_top_holder #dataSettingsCheckboxes ul li span:hover {
+  color: #1E88E5;
+}
+
 .data_table_bottom_holder {
+  display: flex;
+  align-items: flex-start;
   margin-top: 32px;
 }
+.data_table_bottom_holder .legend_box {
+  box-sizing: border-box;
+  padding: 8px 16px;
+  margin-right: 16px;
+  width: auto;
+  font-size: 14px;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+}
+.data_table_bottom_holder .legend_box#bottom_data_legend_status {
+  background-color: #F1F8FD;
+}
+.data_table_bottom_holder .legend_box#bottom_data_legend_missing {
+  background-color: #F8F8F8;
+}
+.data_table_bottom_holder .legend_box#bottom_data_legend_test {
+  background-color: #E9FFDE;
+}
+.data_table_bottom_holder .legend_box .legend_title {
+  cursor: pointer;
+  color: #1E88E5;
+  transition: 0.2s;
+}
+.data_table_bottom_holder .legend_box .legend_title:hover {
+  color: #0059ab;
+}
+.data_table_bottom_holder .legend_box .legend_title .faicon {
+  margin-right: 8px;
+}
+.data_table_bottom_holder .legend_box .legend_title .faicon::before {
+  font-size: 12px;
+}
+.data_table_bottom_holder .legend_box .legend_title span {
+  font-size: 14px;
+}
+.data_table_bottom_holder .legend_box .legend_details {
+  display: none;
+}
+.data_table_bottom_holder .legend_box .legend_details ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+.data_table_bottom_holder .legend_box .legend_details ul li {
+  margin-top: 8px;
+}
 
 #div_vnosi_data table#dataTable {
   table-layout: fixed;
@@ -15913,7 +16004,7 @@ textarea#addusers, textarea#addusers_note {
   display: flex;
   flex-direction: column;
   overflow-x: auto;
-  margin: 0 0 64px 0;
+  margin: 0 0 32px 0;
 }
 #div_analiza_data .div_analiza_holder .analiza_table_top_settings,
 #div_means_data .div_analiza_holder .analiza_table_top_settings,
@@ -15946,17 +16037,112 @@ textarea#addusers, textarea#addusers_note {
   cursor: pointer;
   color: #1E88E5;
 }
-#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale,
-#div_means_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale,
-#div_break_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale,
-#ttestResults .div_analiza_holder .analiza_table_top_settings .div_analiza_scale {
+#div_analiza_data .div_analiza_holder .enote-navedbe_holder,
+#div_analiza_data .div_analiza_holder .div_analiza_scale,
+#div_analiza_data .div_analiza_holder .freq-p_holder,
+#div_means_data .div_analiza_holder .enote-navedbe_holder,
+#div_means_data .div_analiza_holder .div_analiza_scale,
+#div_means_data .div_analiza_holder .freq-p_holder,
+#div_break_data .div_analiza_holder .enote-navedbe_holder,
+#div_break_data .div_analiza_holder .div_analiza_scale,
+#div_break_data .div_analiza_holder .freq-p_holder,
+#ttestResults .div_analiza_holder .enote-navedbe_holder,
+#ttestResults .div_analiza_holder .div_analiza_scale,
+#ttestResults .div_analiza_holder .freq-p_holder {
+  display: inline;
+  margin-left: 16px;
+}
+#div_analiza_data .div_analiza_holder .enote-navedbe_holder button,
+#div_analiza_data .div_analiza_holder .div_analiza_scale button,
+#div_analiza_data .div_analiza_holder .freq-p_holder button,
+#div_means_data .div_analiza_holder .enote-navedbe_holder button,
+#div_means_data .div_analiza_holder .div_analiza_scale button,
+#div_means_data .div_analiza_holder .freq-p_holder button,
+#div_break_data .div_analiza_holder .enote-navedbe_holder button,
+#div_break_data .div_analiza_holder .div_analiza_scale button,
+#div_break_data .div_analiza_holder .freq-p_holder button,
+#ttestResults .div_analiza_holder .enote-navedbe_holder button,
+#ttestResults .div_analiza_holder .div_analiza_scale button,
+#ttestResults .div_analiza_holder .freq-p_holder button {
+  cursor: pointer;
+  box-sizing: border-box;
+  padding: 4px 16px;
+  margin: 0;
+  width: auto;
+  min-width: auto;
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 15px;
+  color: #A9A9A9;
+  background-color: #FFFFFF;
+  border: 1px solid #E5E5E5;
+}
+#div_analiza_data .div_analiza_holder .enote-navedbe_holder button:first-child,
+#div_analiza_data .div_analiza_holder .div_analiza_scale button:first-child,
+#div_analiza_data .div_analiza_holder .freq-p_holder button:first-child,
+#div_means_data .div_analiza_holder .enote-navedbe_holder button:first-child,
+#div_means_data .div_analiza_holder .div_analiza_scale button:first-child,
+#div_means_data .div_analiza_holder .freq-p_holder button:first-child,
+#div_break_data .div_analiza_holder .enote-navedbe_holder button:first-child,
+#div_break_data .div_analiza_holder .div_analiza_scale button:first-child,
+#div_break_data .div_analiza_holder .freq-p_holder button:first-child,
+#ttestResults .div_analiza_holder .enote-navedbe_holder button:first-child,
+#ttestResults .div_analiza_holder .div_analiza_scale button:first-child,
+#ttestResults .div_analiza_holder .freq-p_holder button:first-child {
+  border-radius: 2px 0px 0px 2px;
+}
+#div_analiza_data .div_analiza_holder .enote-navedbe_holder button:nth-child(2),
+#div_analiza_data .div_analiza_holder .div_analiza_scale button:nth-child(2),
+#div_analiza_data .div_analiza_holder .freq-p_holder button:nth-child(2),
+#div_means_data .div_analiza_holder .enote-navedbe_holder button:nth-child(2),
+#div_means_data .div_analiza_holder .div_analiza_scale button:nth-child(2),
+#div_means_data .div_analiza_holder .freq-p_holder button:nth-child(2),
+#div_break_data .div_analiza_holder .enote-navedbe_holder button:nth-child(2),
+#div_break_data .div_analiza_holder .div_analiza_scale button:nth-child(2),
+#div_break_data .div_analiza_holder .freq-p_holder button:nth-child(2),
+#ttestResults .div_analiza_holder .enote-navedbe_holder button:nth-child(2),
+#ttestResults .div_analiza_holder .div_analiza_scale button:nth-child(2),
+#ttestResults .div_analiza_holder .freq-p_holder button:nth-child(2) {
+  border-radius: 0px 2px 2px 0px;
+}
+#div_analiza_data .div_analiza_holder .enote-navedbe_holder button.active, #div_analiza_data .div_analiza_holder .enote-navedbe_holder button:hover,
+#div_analiza_data .div_analiza_holder .div_analiza_scale button.active,
+#div_analiza_data .div_analiza_holder .div_analiza_scale button:hover,
+#div_analiza_data .div_analiza_holder .freq-p_holder button.active,
+#div_analiza_data .div_analiza_holder .freq-p_holder button:hover,
+#div_means_data .div_analiza_holder .enote-navedbe_holder button.active,
+#div_means_data .div_analiza_holder .enote-navedbe_holder button:hover,
+#div_means_data .div_analiza_holder .div_analiza_scale button.active,
+#div_means_data .div_analiza_holder .div_analiza_scale button:hover,
+#div_means_data .div_analiza_holder .freq-p_holder button.active,
+#div_means_data .div_analiza_holder .freq-p_holder button:hover,
+#div_break_data .div_analiza_holder .enote-navedbe_holder button.active,
+#div_break_data .div_analiza_holder .enote-navedbe_holder button:hover,
+#div_break_data .div_analiza_holder .div_analiza_scale button.active,
+#div_break_data .div_analiza_holder .div_analiza_scale button:hover,
+#div_break_data .div_analiza_holder .freq-p_holder button.active,
+#div_break_data .div_analiza_holder .freq-p_holder button:hover,
+#ttestResults .div_analiza_holder .enote-navedbe_holder button.active,
+#ttestResults .div_analiza_holder .enote-navedbe_holder button:hover,
+#ttestResults .div_analiza_holder .div_analiza_scale button.active,
+#ttestResults .div_analiza_holder .div_analiza_scale button:hover,
+#ttestResults .div_analiza_holder .freq-p_holder button.active,
+#ttestResults .div_analiza_holder .freq-p_holder button:hover {
+  color: #1E88E5;
+  background-color: #EAF9FE;
+  border-color: #1E88E5;
+}
+#div_analiza_data .div_analiza_holder .div_analiza_scale,
+#div_means_data .div_analiza_holder .div_analiza_scale,
+#div_break_data .div_analiza_holder .div_analiza_scale,
+#ttestResults .div_analiza_holder .div_analiza_scale {
   opacity: 0;
   filter: alpha(opacity=0);
 }
-#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a,
-#div_means_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a,
-#div_break_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a,
-#ttestResults .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a {
+#div_analiza_data .div_analiza_holder .div_analiza_scale a,
+#div_means_data .div_analiza_holder .div_analiza_scale a,
+#div_break_data .div_analiza_holder .div_analiza_scale a,
+#ttestResults .div_analiza_holder .div_analiza_scale a {
   text-decoration: none;
 }
 #div_analiza_data .div_analiza_holder .div_other_text,
@@ -16495,6 +16681,12 @@ textarea#addusers, textarea#addusers_note {
   height: 34px;
   border-right: 1px #E5E5E5 solid;
 }
+.analysis_bottom_settings .comment_holder span {
+  font-size: 14px;
+}
+.analysis_bottom_settings .comment_holder span.faicon:before {
+  font-size: 14px;
+}
 .analysis_bottom_settings a {
   margin: 0 8px;
   font-size: 16px;
diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss
index 0d3615dae..ce53ee224 100644
--- a/resources/sass/admin_new/pages/survey_analysis/basic.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss
@@ -9,7 +9,7 @@
 
         overflow-x: auto;
 
-        margin: 0 0 64px 0;
+        margin: 0 0 32px 0;
 
         .analiza_table_top_settings{
             display: flex;
@@ -34,14 +34,55 @@
                     color: $blue;
                 }
             }
-    
-            .div_analiza_scale {
-                opacity: 0;
-                filter: alpha(opacity=0);
+        }
 
-                a{
-                    text-decoration: none;
+        .enote-navedbe_holder,
+        .div_analiza_scale,
+        .freq-p_holder{
+            display: inline;
+            margin-left: 16px;
+
+            button{
+                cursor: pointer;
+
+                box-sizing: border-box;
+                padding: 4px 16px;
+                margin: 0;
+                width: auto;
+                min-width: auto;
+
+                font-size: 12px;
+                font-weight: 400;
+                line-height: 15px;
+                color: #A9A9A9;
+
+                background-color: $white;
+                border: 1px solid $gray;
+
+                &:first-child{
+                    border-radius: 2px 0px 0px 2px;
                 }
+                
+                &:nth-child(2){
+                    border-radius: 0px 2px 2px 0px;
+                }
+
+                &.active,
+                &:hover{
+                    color: $blue;
+
+                    background-color: $light-blue;
+                    border-color: $blue;
+                }
+            }
+        }
+
+        .div_analiza_scale {
+            opacity: 0;
+            filter: alpha(opacity=0);
+
+            a{
+                text-decoration: none;
             }
         }
 
@@ -368,6 +409,14 @@
         height: 34px;
 
         border-right: 1px $gray solid;
+
+        span{
+            font-size: 14px;
+
+            &.faicon:before{
+                font-size: 14px;
+            }
+        }
     }
 
     a{
diff --git a/resources/sass/admin_new/pages/survey_data/data_table_settings.scss b/resources/sass/admin_new/pages/survey_data/data_table_settings.scss
index b94186ce2..6c3681c15 100644
--- a/resources/sass/admin_new/pages/survey_data/data_table_settings.scss
+++ b/resources/sass/admin_new/pages/survey_data/data_table_settings.scss
@@ -12,6 +12,19 @@
     border: 1px solid $gray;
     border-radius: 2px;
 
+    .dataSettingsBasic{
+        display: flex;
+
+        margin-right: 8px;
+        padding-right: 8px;
+
+        border-right: 1px $dark-gray solid;
+    }
+
+    #data_search_filter{
+
+    }
+
     #vnosi_paginacija{
         display: flex;
 
@@ -19,15 +32,15 @@
         right: 16px;
     }
 
-    #data_search_filter{
+    #dataSettingsCheckboxes{
+        @include hover_basic();
 
+        z-index: 99999;
+        position: absolute;
+        top: 41px;
+
+        border-radius: 2px;
     }
-
-    .dataSettingsBasic{
-
-    }
-
-    
 }
 
 #displayFilterNotes{
@@ -36,5 +49,71 @@
 
 
 .data_table_bottom_holder{
+    display: flex;
+    align-items: flex-start;
+
     margin-top: 32px;
+
+    .legend_box{
+        box-sizing: border-box;
+        padding: 8px 16px;
+        margin-right: 16px;
+        width: auto;
+
+        font-size: 14px;
+
+        border: 1px solid $gray;
+        border-radius: 2px;
+
+        &#bottom_data_legend_status{
+            background-color: #F1F8FD;
+        }
+
+        &#bottom_data_legend_missing{
+            background-color: $light-gray;
+        }
+
+        &#bottom_data_legend_test{
+            background-color: #E9FFDE;
+        }
+
+        .legend_title{
+            cursor: pointer;
+            color: $blue;
+            
+            transition: 0.2s;
+
+            &:hover{
+                color: $dark-blue;
+            }
+
+            .faicon{
+                margin-right: 8px;
+
+                &::before{
+                    font-size: 12px;
+                }
+            }
+
+            span{
+                font-size: 14px;
+            }
+        }
+    
+        .legend_details{
+            display: none;
+
+            ul{
+                list-style-type: none;
+                margin: 0;
+                padding: 0;
+
+                li{
+                    margin-top: 8px;
+                }
+            }
+        }
+
+    }
+    
 }