diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index ce5f34348..f53ff6455 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -71,21 +71,23 @@ class GDPR{
 					echo '<h2> GDPR ANKETE</h2>';
 				echo '</div>';
 
-				echo '<div class="box_text"';
-					echo '<p> 0 <span> anketi vsebujeta GDPR občutljive podatke </span>  </p>';
+				echo '<div class="box_text" id="box_text1">';
+					echo '<div class="num_of_surveys" id="num_of_surveys1"> 0 </div>';
+					echo ' <p> anket vsebuje GDPR občutljive podatke </p>';
 				echo '</div>';
 			echo '</div>';
 
 
 			echo '<div class= "num_box num_box2">';
 
-				echo '<div class="box_flex" id="box_flex">';
-					echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked">';
+				echo '<div class="box_flex" id="box_flex potenc_gdpr">';
+					echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="test_function()">';
 					echo '<h2> POTENCIALNO GDPR ANKETE</h2>';
 				echo '</div>';
 
-				echo '<div class="box_text"';
-					echo '<p> 0 <span> anket lahko vsebuje GDPR občutljive podatke.</span>  </p>';
+				echo '<div class="box_text">';
+					echo '<div class="num_of_surveys"  id="num_of_surveys2"> 0 </div>';
+					echo '<p> anket lahko vsebuje GDPR občutljive podatke. </p>';
 				echo '</div>';
 			echo '</div>';
 			
@@ -93,13 +95,15 @@ class GDPR{
 			echo '<div class= "num_box num_box3">';
 
 				echo '<div class="box_flex" id="box_flex">';
-				echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked">';
+				echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="test_function()" >';
 					echo '<h2> NE-GDPR ANKETE</h2>';
 				echo '</div>';
 
-				echo '<div class="box_text"';
-					echo '<p> 0 <span> anket ne vsebuje GDPR občutljivih podatkov</span>  </p>';
+				echo '<div class="box_text">';
+					echo ' <div class="num_of_surveys"  id="num_of_surveys3"> 0 </div>';
+					echo '<p> anket ne vsebuje GDPR občutljivih podatkov </p>';
 				echo '</div>';
+
 			echo '</div>';
 
 		echo '</div>';
@@ -134,10 +138,13 @@ class GDPR{
 
 			// Nastavimo barvo vrstice
 			if($anketa['gdpr'] == 1)
+				//green
 				$color = ' class="green_row" id="green_row"';
 			elseif($anketa['potential_gdpr'] == 1)
-				$color = ' class="red_row" id="red_row"';
+				//Red
+				$color = ' class="red_row" id="red_row"'; 
 			else
+				//grey
 				$color = 'class="grey_row" id="grey_row"';
 
 			echo '<tr '.$color.'>';
@@ -166,6 +173,8 @@ class GDPR{
 
 		echo '</fieldset>';
 
+		echo '<script src="/admin/survey/script/GDPR_seznam_anket.js"></script>';
+
 	}
 
 	// Prikazemo vsebino zavihka gdpr - nastavitve uporabnika
diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php
index 55f8b9613..b9e8544c8 100644
--- a/admin/survey/classes/class.SurveyTheme.php
+++ b/admin/survey/classes/class.SurveyTheme.php
@@ -161,7 +161,7 @@ class SurveyTheme {
 			break;
             case 'checboxThemeSave':
                 $this->ajaxSaveChecboxTheme($_POST['anketa'],$_POST['checkbox']);
-            breake;
+            break;
 			
 			default:
 			print_r("<pre>");
@@ -592,6 +592,13 @@ class SurveyTheme {
 				echo '</div>';
 
 				//Gumbi
+				// show_settings(\''.$row['id'].'\');
+
+				// div z setingsi 
+				
+				// <div id="theme_additional_settings_'.$row['id'].'">
+
+
 				echo '<div class="options">';
 
 						echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>';
diff --git a/admin/survey/script/GDPR_seznam_anket.js b/admin/survey/script/GDPR_seznam_anket.js
index 3b14b7331..930735696 100644
--- a/admin/survey/script/GDPR_seznam_anket.js
+++ b/admin/survey/script/GDPR_seznam_anket.js
@@ -1,44 +1,74 @@
+var green_row_count = document.getElementsByClassName("green_row").length;
+var red_row_count = document.getElementsByClassName("red_row").length;
+var grey_row_count = document.getElementsByClassName("grey_row").length;
+
+var text_box1 = document.getElementById("num_of_surveys1");
+var text_box2 = document.getElementById("num_of_surveys2");
+var text_box3 = document.getElementById("num_of_surveys3");
+
+// izpis ŠTEVILA posameznih anket (gdpr / potencialno gdpr / ne-gdpr)
+text_box1.innerHTML = "<div>" + green_row_count+ "</div>";
+text_box2.innerHTML = "<div>" + red_row_count+ "</div>";
+text_box3.innerHTML = "<div>" + grey_row_count+ "</div>";
+
+
+
+
+
 // Seznam anket - togle checkbox prikaz anket
 
 function test_function() {
     var inputs = document.getElementById("gdpr_ankete_check");
     var potenc_gdpr = document.getElementById("potenc_gdpr_ankete_check");
-    var ne_gdpr_ankete = document.getElementById("ne_gdpr_ankete")
+    var ne_gdpr_ankete = document.getElementById("ne_gdpr_ankete");
+
+    var green_row = document.getElementsByClassName("green_row");
+    var red_row = document.getElementsByClassName("red_row");
+    var grey_row = document.getElementsByClassName("grey_row");
+
+    console.log(green_row.length);
 
-    var green_row = document.getElementById("green_row");
-    var red_row = document.getElementById("red_row");
-    var grey_row = document.getElementById("grey_row");
 
     // GDPR ANKETE togle
     if (!inputs.checked){
-        // document.getElementById("green_row").style.display="none";
-        green_row.style.display="none";
-        document.getElementById("box_flex").style.color="red";
-
+        // skrije vsak element z green_row classom
+        for(var i=0; i < green_row.length; i++){
+            green_row[i].style.display="none";
+        };
     }
     else{
-        // document.getElementById("green_row").style.display="table-row";
-        green_row.style.display="table-row";
-        document.getElementById("box_flex").style.color="green";
+        // prikaže vsak element z green_row classom
+        for(var i=0; i < green_row.length; i++){
+            green_row[i].style.display="table-row";
+        };
     }
     // potencialno GDPR ankete togle
     if (!potenc_gdpr.checked){
-        document.getElementById("red_row").style.display="none";
+        for(var i=0; i < red_row.length; i++){
+            red_row[i].style.display="none";
+        };
     }
     else{
-        document.getElementById("red_row").style.display="table-row";
+        for(var i=0; i < red_row.length; i++){
+            red_row[i].style.display="table-row";
+        };
     }
     // ne-GDPR ankete
     if (!ne_gdpr_ankete.checked){
-        document.getElementById("grey_row").style.display="none";
-        ne_gdpr_ankete.style.color="red";
+
+        for(var i=0; i < grey_row.length; i++){
+            grey_row[i].style.display="none";
+        };
     }
     else{
-        document.getElementById("grey_row").style.display="table-row";
-        ne_gdpr_ankete.style.color="green";
+        for(var i=0; i < grey_row.length; i++){
+            grey_row[i].style.display="table-row";
+        };
     }
 }
 
+
+
 function teme_options(){
     var toggle = document.getElementsByClassName('buttons-window');
     toggle.onclick = function(){
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8bd11649c..4e41c1402 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10033,13 +10033,17 @@ textarea:focus {
 }
 .box-container .num_box .box_text {
   padding: 0px 16px 16px 16px;
-  font-size: 32px;
-  line-height: 20px;
-}
-.box-container .num_box .box_text span {
   font-size: 16px;
+  line-height: 20px;
   color: #808080;
+  display: flex;
+  align-items: center;
+}
+.box-container .num_box .box_text .num_of_surveys {
+  font-size: 40px;
+  color: #333;
   font-weight: 400;
+  margin-right: 5px;
 }
 .box-container .num_box2 {
   margin: 0px 32px;
diff --git a/resources/sass/admin_new/components/form/seznam_anket.scss b/resources/sass/admin_new/components/form/seznam_anket.scss
index 5e972b544..f5777c73f 100644
--- a/resources/sass/admin_new/components/form/seznam_anket.scss
+++ b/resources/sass/admin_new/components/form/seznam_anket.scss
@@ -40,13 +40,19 @@
 
         .box_text{
             padding: 0px 16px 16px 16px;
-            font-size: 32px;
+            font-size: 16px;
             line-height: 20px;
+            color: #808080;
 
-            span{
-                font-size: 16px;
-                color: #808080;
+            display: flex;
+            align-items: center;
+
+            .num_of_surveys{
+                font-size: 40px;
+                color: #333;
                 font-weight: 400;
+
+                margin-right: 5px;
             }
 
         }