diff --git a/admin/survey/classes/class.SurveyParaAnalysis.php b/admin/survey/classes/class.SurveyParaAnalysis.php
index 3f1001764..04341e232 100644
--- a/admin/survey/classes/class.SurveyParaAnalysis.php
+++ b/admin/survey/classes/class.SurveyParaAnalysis.php
@@ -805,6 +805,8 @@ class SurveyParaAnalysis{
 			}
 		}
 		*/
+
+		/*SORTIRANJE
 		$sort_type = SORT_ASC;
 		if (isset($_REQUEST['sort_type']) 
 				&& ((int)$_REQUEST['sort_type'] == SORT_DESC || (int)$_REQUEST['sort_type'] == SORT_ASC)) {
@@ -844,61 +846,32 @@ class SurveyParaAnalysis{
 				$rows = array_reverse($rows);
 			}
 			
-		}
+		}*/
 		
 		$this->displayFormula();
+
+		echo '<h2>'.$lang['srv_para_label_variables'].'</h2>';
 		
 		echo '<table id="tbl_para_analitics" class="graph'.($showGraph ? ' showGraph' : '').'">';
-		echo '<tr class="persist-header">';
-		echo '<th class="pointer" ';
-		if ($sort_field == 'variable') {
-			if ($sort_type == SORT_DESC) {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_ASC . "')\"";
-			} else {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_DESC . "')\"";
-			}
-		} else {
-			echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=variable&sort_type=" . SORT_ASC . "')\"";
-		}
-		echo '>';
-		echo '<span class="floatLeft pointer">' . $lang['srv_para_variable'] . '</span>';
-		if ($sort_field == 'variable') {
-			echo '<span class="floatRight sprites '.$sort_type_sprite.'">&nbsp;</span>';
-		}
-		echo'</th>';
+		
+		echo '<tr>';
+		echo '<th>' . $lang['srv_para_variable'] . '</th>';
 		if ($showQuestion) {
 			echo '<th>'.$lang['srv_para_question'].'</th>';
 		}
 		if ($show_delta) {
-			echo '<th class="anl_w50" title="'.$lang[''].'">delta</th>';
+			echo '<th title="'.$lang[''].'">delta</th>';
 		}
-		echo '<th class="anl_w50 pointer" title="'.$lang['srv_para_unaswered'].'"';
-		if ($sort_field == 'ns') {
-			if ($sort_type == SORT_DESC) {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_ASC . "')\"";
-			} else {
-				echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_DESC . "')\"";
-			}
-		} else {
-			echo " onclick=\"window.location.assign('" . $pageUrl . "&sort=ns&sort_type=" . SORT_ASC . "')\"";
-		}
-		echo '>';
-		echo '<span>' . $lang['srv_para_unaswered_short'] . ' %</span>'; // . Help :: display('srv_item_nonresponse')
-		if ($sort_field == 'ns') {
-			echo '<span class="floatRight sprites '.$sort_type_sprite.'">&nbsp;</span>';
-		}
-		echo '</th>';
+		echo '<th>' . $lang['srv_para_unaswered_short'] . ' %</th>';
 		if ($showGraph) {
-			echo '<th class="anl_bb" title="' . $lang['srv_para_unaswered_graph_title'] . '">' . $lang['srv_para_unaswered_graph_title'] . '</th>';
+			echo '<th title="' . $lang['srv_para_unaswered_graph_title'] . '">' . $lang['srv_para_unaswered_graph_title'] . '</th>';
 		}
 		echo '</tr>';
-		
+
 		foreach ($rows AS $row) {
-			echo '<tr class="'.$css_sublcass.'">';
-			echo '<td >';
-			echo '<span class="anl_variabla">';
+			echo '<tr>';
+			echo '<td>';
 			echo '<a onclick="showspremenljivkaSingleVarPopup(\'' . $row['spid'] . '\'); return false;" href="#">' . $row['variable'] . '</a>';
-			echo '</span>';
 			echo '</td>';
 			if ($showQuestion) {
 				echo '<td>';
@@ -909,13 +882,12 @@ class SurveyParaAnalysis{
 				echo '<td>'.$row['delta'].'</td>';
 			}
 			echo '<td>'.common::formatNumber($row['ns']*100,1).'</td>';
-			#echo '<td>'.common::formatNumber($value,2).'</td>';
 			if ($showGraph) {
-				echo '<td class="empty_cell">';
+				echo '<td class="graph_cell">';
 				if ($row['ns'] > 0) {
-					echo '<div class="para_analitics_bar" style="'.'width:'.($row['ns']*100).'%; text-align:right; padding-right:5px; color:green;"></div>';
+					echo '<div class="graph_full" style="'.'width:'.($row['ns']*100).'%;"></div>';
 				} else {
-					echo '<div class="para_analitics_bar null_value" style="'.'width:1px"></div>';
+					echo '/';
 				}
 				echo '</td>';
 			}
diff --git a/lang/1.php b/lang/1.php
index bcf41a767..ede7f30ea 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6704,7 +6704,7 @@ $lang = array (
 	'srv_para_show_rows_other'					=>	'Prikaži polja "drugo"',
 	'srv_para_show_rows_text'					=>	'Prikaži polja tipa "besedilo"',
 	'srv_para_variable'							=>	'Spremenljivka',
-	'srv_para_question'							=>	'Vprašanje',
+	'srv_para_question'							=>	'Labela',
 	'srv_para_valid'							=>	'Veljavni',
 	'srv_para_approp'							=>	'Ustrezni',
 	'srv_para_nonconceptual'					=>	'Prikazano',
diff --git a/lang/2.php b/lang/2.php
index 7644d1945..508d45816 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6586,7 +6586,7 @@ $lang = array (
 	'srv_para_show_rows_other'					=>	'Show rows "other"',
 	'srv_para_show_rows_text'					=>	'Show rows "text"',
 	'srv_para_variable'							=>	'Variable',
-	'srv_para_question'							=>	'Question',
+	'srv_para_question'							=>	'Label',
 	'srv_para_valid'							=>	'Valid',
 	'srv_para_approp'							=>	'Appropriate',
 	'srv_para_nonconceptual'					=>	'Exposed units',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 60bebc617..64333da5c 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -11528,6 +11528,38 @@ div.page_nonresponse_graph div#surveyNonresponse div#dataSettingsCheckboxes .sec
   display: flex;
   flex-direction: row;
 }
+div.page_nonresponse_graph h2 {
+  width: 100%;
+  overflow: hidden;
+  font-weight: 300;
+  font-size: 24px;
+  margin-block-start: 0;
+  margin-block-end: 0;
+  margin-bottom: 16px;
+}
+div.page_nonresponse_graph h2:after {
+  content: "";
+  display: inline-block;
+  height: 0.5em;
+  vertical-align: bottom;
+  width: 100%;
+  box-sizing: border-box;
+  margin-right: -100%;
+  margin-left: 8px;
+  border-top: 1px solid #E5E5E5;
+}
+div.page_nonresponse_graph table {
+  width: 100%;
+  white-space: nowrap;
+}
+div.page_nonresponse_graph table td.graph_cell {
+  width: 100%;
+}
+div.page_nonresponse_graph table td.graph_cell div.graph_full {
+  background-color: #1E88E5;
+  height: 24px;
+  text-align: right;
+}
 
 div.drop_setting_margin {
   margin-top: 128px;
diff --git a/resources/sass/admin/modules/diagnostic.scss b/resources/sass/admin/modules/diagnostic.scss
index 4af774da1..f60610c87 100644
--- a/resources/sass/admin/modules/diagnostic.scss
+++ b/resources/sass/admin/modules/diagnostic.scss
@@ -16,7 +16,7 @@ $background_color_1: #EFF2F7;
 
     min-height: 500px;
 
-    H2 {
+    h2 {
         margin: 15px 0px 0px 0px;
         padding: 0px;
         font-size: 15px;
diff --git a/resources/sass/admin_new/pages/survey_status/nonresponse.scss b/resources/sass/admin_new/pages/survey_status/nonresponse.scss
index bf761c570..b24eb3f22 100644
--- a/resources/sass/admin_new/pages/survey_status/nonresponse.scss
+++ b/resources/sass/admin_new/pages/survey_status/nonresponse.scss
@@ -52,8 +52,48 @@ div.page_nonresponse_graph {
             }
         }
     }
+
+    h2 {
+        width: 100%;
+        overflow: hidden;
+        font-weight: $light;
+        font-size: 24px;
+
+        margin-block-start: 0;
+        margin-block-end: 0;
+
+        margin-bottom: 16px;
+
+        &:after {
+            content: "";
+            display: inline-block;
+            height: 0.5em;
+            vertical-align: bottom;
+            width: 100%;
+            box-sizing: border-box;
+            margin-right: -100%;
+            margin-left: 8px;
+            border-top: 1px solid $gray;
+        }
+    }
+
+    table {
+        width: 100%;
+        white-space: nowrap;
+
+        td.graph_cell {
+            width: 100%;
+            
+            div.graph_full {
+                background-color: $blue;
+                height: 24px;
+                text-align: right;
+            }
+        }
+    }
 }
 
+// Za premik vsebine pod dropdown nastavitve.
 div.drop_setting_margin {
     margin-top: 128px;
 }