diff --git a/admin/survey/classes/class.SurveyAktivnost.php b/admin/survey/classes/class.SurveyAktivnost.php
index 19eb68291..87c61d938 100644
--- a/admin/survey/classes/class.SurveyAktivnost.php
+++ b/admin/survey/classes/class.SurveyAktivnost.php
@@ -2,7 +2,6 @@
 
 class SurveyAktivnost{
 
-
 	public function __construct(){
 		global $lang;
 		
@@ -53,55 +52,6 @@ class SurveyAktivnost{
 		
 		$language = (isset($_GET['language'])) ? $_GET['language'] : 0;
     
-        if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
-
-            $package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
-            $package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
-            $package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
-            
-            echo '<span>'.$lang['srv_narocilo_paket'].':</span>';
-
-            echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
-            echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
-            echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
-            echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label></span>';
-            echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
-            echo '<span class="spaceLeft"><input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label></span>';
-            
-            echo '<span class="spaceLeft spaceRight bold">|</span>';
-        }
-
-		echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label></span>';
-		echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" id="uvoz" '.($uvoz == 1 ? ' checked="checked"' : '').' onchange="$(\'#uvoz_hidden\').val('.($uvoz==1 ? '0' : '1').');"><label for="uvoz">'.$lang['srv_diagnostics_filter_import'].'</label></span>';
-		
-		echo '<input type="hidden" name="ustrezni" id="ustrezni_hidden" value="'.$ustrezni.'" />';
-		echo '<span class="spaceLeft bold">|</span><span class="spaceLeft"></span><input type="checkbox" id="ustrezni" '.($ustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#ustrezni_hidden\').val('.($ustrezni==1 ? '0' : '1').');"><label for="ustrezni">'.$lang['srv_diagnostics_filter_6'].'</label>';
-		echo '<input type="hidden" name="delnoustrezni" id="delnoustrezni_hidden" value="'.$delnoustrezni.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" id="delnoustrezni" '.($delnoustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#delnoustrezni_hidden\').val('.($delnoustrezni==1 ? '0' : '1').');"><label for="delnoustrezni">'.$lang['srv_diagnostics_filter_5'].'</label></span>';
-		echo '<input type="hidden" name="neustrezni" id="neustrezni_hidden" value="'.$neustrezni.'" />';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="neustrezni" '.($neustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#neustrezni_hidden\').val('.($neustrezni==1 ? '0' : '1').');"><label for="neustrezni">'.$lang['srv_diagnostics_filter_34'].'</label></span>';
-		echo '<span class="spaceLeft"><input type="checkbox" value="1" id="mailsent" name="mailsent" '.($mailsent == 1 ? ' checked="checked"' : '').'><label for="mailsent">'.$lang['srv_diagnostics_filter_012'].'</label></span>';
-		
-		echo '<span class="spaceLeft bold">|</span><span class="spaceLeft"></span>'.$lang['lang'].': <select id="language" name="language">';
-		echo '<option value="0" '.($language=='0' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_all'].'</option>';
-		echo '<option value="1" '.($language=='1' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_slo'].'</option>';
-		echo '<option value="2" '.($language=='2' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_ang'].'</option>';
-		
-		echo '<input type="button" class="spaceLeft" value="'.$lang['srv_coding_filter'].'" onClick="this.form.submit();">';
-		
-		echo '<br /><br />';
-		
-		echo ''.$lang['srv_diagnostics_total'].' <select name="type" onchange="this.form.submit();">';
-		echo '<option value="users"' . ($type == 'users' ? ' selected' : '') . '>'.$lang['srv_diagnostics_respondentov'].'</option>';
-		echo '<option value="emails"' . ($type == 'emails' ? ' selected' : '') . '>'.$lang['srv_email-vabila'].'</option>';
-		echo '<option value="pages"' . ($type == 'pages' ? ' selected' : '') . '>'.$lang['srv_diagnostics_strani'].'</option>';
-		echo '<option value="analiza"' . ($type == 'analiza' ? ' selected' : '') . '>'.$lang['srv_diagnostics_analiza'].'</option>';
-		echo '<option value="graph"' . ($type == 'graph' ? ' selected' : '') . '>'.$lang['srv_diagnostics_graph'].'</option>';
-		echo '<option value="editing"' . ($type == 'editing' ? ' selected' : '') . '>'.$lang['srv_diagnostics_editing'].'</option>';
-		echo '</select> '.$lang['srv_diagnostics_in'].' ';
-		
 		echo '<select id="diagnostics_date_selected" name="time" onchange="diagnosticsChooseDate()">';
 		echo '<option value="1 minute"' . ($time == '1 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_1 minute'].'</option>';
 		echo '<option value="5 minute"' . ($time == '5 minute' ? ' selected' : '') . '>'.$lang['srv_diagnostics_5 minute'].'</option>';
@@ -129,11 +79,127 @@ class SurveyAktivnost{
 		echo ' '.$lang['srv_diagnostics_to'].' <input type="text" id="to" name="to" value="' . $to . '" '. ($time != '99date' ? ' disabled' : '') .'/>';
 		echo ' <span class="faicon calendar_icon icon-as_link" onclick="changeSelectOption()" id="to_img"></span>';
 
-		echo '<input type="submit" class="spaceLeft pointer" value="'.$lang['hour_show'].'" />';
-        echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total'].'</label><label class="srv_diagnostic_total_sub_label">'.$sum.'</label>';
-        echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total_survey'].'</label><label class="srv_diagnostic_total_survey_label">'.$sum_survey.'</label>';
+		// n, število anket
+        //echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total'].'</label><label class="srv_diagnostic_total_sub_label">'.$sum.'</label>';
+        //echo '<label class="srv_diagnostic_total_sub">'.$lang['srv_diagnostics_sum_total_survey'].'</label><label class="srv_diagnostic_total_survey_label">'.$sum_survey.'</label>';
 		
-		echo '</form><br />';
+		///////////////////////////////////////////////////////////////////////////////////
+		
+		// Nastavitve nad tabelo
+		echo '<div class="data_table_top_holder">';
+
+		//Osnova
+		echo '<div class="osnova">';
+		echo $lang['srv_diagnostics_basis'];
+
+		echo '<select class="dropdown" name="type" onchange="this.form.submit();">';
+		echo '<option value="users"' . ($type == 'users' ? ' selected' : '') . '>'.$lang['srv_diagnostics_respondentov'].'</option>';
+		echo '<option value="emails"' . ($type == 'emails' ? ' selected' : '') . '>'.$lang['srv_diagnostics_emails'].'</option>';
+		echo '<option value="pages"' . ($type == 'pages' ? ' selected' : '') . '>'.$lang['srv_diagnostics_strani'].'</option>';
+		echo '<option value="analiza"' . ($type == 'analiza' ? ' selected' : '') . '>'.$lang['srv_diagnostics_analiza'].'</option>';
+		echo '<option value="graph"' . ($type == 'graph' ? ' selected' : '') . '>'.$lang['srv_diagnostics_graph'].'</option>';
+		echo '<option value="editing"' . ($type == 'editing' ? ' selected' : '') . '>'.$lang['srv_diagnostics_editing'].'</option>';
+		echo '</select>';
+		echo '</div>';
+
+		//Upoštevane enote
+		echo '<div class="dataSettingsBasic">';    
+		echo '  <button id="toggleDataCheckboxes" class="small white-blue" onClick="toggleAktivnostCheckboxes(); return false;"><span class="faicon plus"></span>'.$lang['srv_diagnostics_upostevane'].'</button>';
+		echo '</div>';
+
+		// Dodatne nastavitve, ki se razprejo
+		echo '<div id="dataSettingsCheckboxes" class="displayNone">';
+		echo '  <div class="dataSettingsCheckboxes_holder">';
+			
+		// Upoštevaj enote
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_diagnostics_upostevaj'].'</span>';
+		
+		echo '<input type="hidden" name="uvoz" id="uvoz_hidden" value="'.$uvoz.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="testdata" name="testdata" '.($testdata == 1 ? ' checked="checked"' : '').'"><label for="testdata">'.$lang['srv_diagnostics_filter_test'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="testdataauto" name="testdataauto" '.($testdataauto == 1 ? ' checked="checked"' : '').'"><label for="testdataauto">'.$lang['srv_diagnostics_filter_autotest'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="uvoz" '.($uvoz == 1 ? ' checked="checked"' : '').' onchange="$(\'#uvoz_hidden\').val('.($uvoz==1 ? '0' : '1').');"><label for="uvoz">'.$lang['srv_diagnostics_filter_import'].'</label>';
+		echo '</div>';
+		
+		echo '<input type="hidden" name="ustrezni" id="ustrezni_hidden" value="'.$ustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '</span><input type="checkbox" id="ustrezni" '.($ustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#ustrezni_hidden\').val('.($ustrezni==1 ? '0' : '1').');"><label for="ustrezni">'.$lang['srv_diagnostics_filter_6'].'</label>';
+		echo '</div>';
+		echo '<input type="hidden" name="delnoustrezni" id="delnoustrezni_hidden" value="'.$delnoustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="delnoustrezni" '.($delnoustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#delnoustrezni_hidden\').val('.($delnoustrezni==1 ? '0' : '1').');"><label for="delnoustrezni">'.$lang['srv_diagnostics_filter_5'].'</label>';
+		echo '</div>';
+		echo '<input type="hidden" name="neustrezni" id="neustrezni_hidden" value="'.$neustrezni.'" />';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="neustrezni" '.($neustrezni == 1 ? ' checked="checked"' : '').' onchange="$(\'#neustrezni_hidden\').val('.($neustrezni==1 ? '0' : '1').');"><label for="neustrezni">'.$lang['srv_diagnostics_filter_34'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" id="mailsent" name="mailsent" '.($mailsent == 1 ? ' checked="checked"' : '').'><label for="mailsent">'.$lang['srv_diagnostics_filter_012'].'</label>';
+		echo '</div>';
+
+		echo '</div>';
+
+		echo '<div id="jezikpaket">';
+
+		//Jezik
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_diagnostics_jezik'].'</span>';
+
+		echo '<select class="dropdown w130" id="language" name="language">';
+		echo '<option value="0" '.($language=='0' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_all'].'</option>';
+		echo '<option value="1" '.($language=='1' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_slo'].'</option>';
+		echo '<option value="2" '.($language=='2' ? ' selected' : '').'>'.$lang['srv_diagnostics_filter_lang_ang'].'</option>';
+		echo '</select>';
+					
+		echo '</div>';
+
+		//Paketi
+		if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
+
+            $package_1ka = (isset($_GET['package_1ka']) && $_GET['package_1ka']=='0') ? 0 : 1;
+            $package_2ka = (isset($_GET['package_2ka']) && $_GET['package_2ka']=='0') ? 0 : 1;
+            $package_3ka = (isset($_GET['package_3ka']) && $_GET['package_3ka']=='0') ? 0 : 1;
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_narocilo_paket'].'</span>';
+
+            echo '<input type="hidden" name="package_1ka" id="package_1ka_hidden" value="'.$package_1ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_1ka" '.($package_1ka == 1 ? ' checked="checked"' : '').'" onchange="$(\'#package_1ka_hidden\').val('.($package_1ka==1 ? '0' : '1').');"><label for="package_1ka">1KA</label>';
+			echo '</div>';
+            echo '<input type="hidden" name="package_2ka" id="package_2ka_hidden" value="'.$package_2ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_2ka" '.($package_2ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_2ka_hidden\').val('.($package_2ka==1 ? '0' : '1').');"><label for="package_2ka">2KA</label>';
+			echo '</div>';
+            echo '<input type="hidden" name="package_3ka" id="package_3ka_hidden" value="'.$package_3ka.'" />';
+			echo '<div class="setting_item">';
+            echo '<input type="checkbox" value="1" id="package_3ka" '.($package_3ka == 1 ? ' checked="checked"' : '').' onchange="$(\'#package_3ka_hidden\').val('.($package_3ka==1 ? '0' : '1').');"><label for="package_3ka">3KA</label>';
+			echo '</div>';		
+			
+			echo '</div>';
+        }
+
+		echo '</div>'; //div#jezikpaket
+
+
+		// Gumb filtriraj
+		echo '<div class="button_holder">';
+		echo '  <button class="small blue" onClick="this.form.submit(); toggleAktivnostCheckboxes(); return false;">'.$lang['srv_diagnostics_filter'].'</button>';
+		echo '</div>';
+		
+		echo '  </div>';
+		echo '</div>'; //div#dataSettingsCheckboxes
+
+
+		echo '</div>'; // div.data_table_top_holder
+
+
+		echo '</form>';
 
 		if ($type == 'pages')
 			$time_edit = 'srv_user_grupa_active.time_edit';
@@ -266,10 +332,16 @@ class SurveyAktivnost{
 			echo mysqli_error($GLOBALS['connect_db']);
 		}
 
+		// Tabela
 		global $site_url;
-		
-		echo '<table style="width:70%">';
+
+		echo '<table id="aktivnost_ankete_table">';
 		$max = -1;
+		echo '<tr>';
+		echo '<th>'.$lang['srv_ime'].'</th>';
+		echo '<th>'.$lang['email'].'</th>';
+		echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
+		echo '</tr>';
 		
 		while ($row = mysqli_fetch_array($sql)) {
 			if ($max == -1)
@@ -277,10 +349,13 @@ class SurveyAktivnost{
 
 			echo '<tr>';
 			echo '<td><a href="'.SurveyInfo::getSurveyLink($row['ank_id']).'?preview=on&pages=all" target="_blank">' . $row['naslov'] . '</a></td>';
-			echo '<td>'.$row['email'].'</td>';
+			echo '<td class="gray">'.$row['email'].'</td>';
             $sum = $sum + $row['responses'];
             $sum_survey = $sum_survey + 1;
-			echo '<td style="width:60%"><div class="graph_lb" style="float: left; width:' . (round($row['responses'] / $max * 100, 0)) . '%">&nbsp;</div><div style="float:left">&nbsp;'.$row['responses'].'</div></td>';
+			echo '<td class="graph_cell">';
+			echo '<div class="graph_cell">';
+			echo '<div class="graph_full" style="width:' . (round($row['responses'] / $max * 100, 0)) . '%">&nbsp;</div><div>&nbsp;'.$row['responses'].'</div';
+			echo '</div></td>';
 			echo '</tr>';
 		}
 		
diff --git a/admin/survey/classes/class.SurveyThemeEditor.php b/admin/survey/classes/class.SurveyThemeEditor.php
index fdc9168fa..e4b2acbe5 100644
--- a/admin/survey/classes/class.SurveyThemeEditor.php
+++ b/admin/survey/classes/class.SurveyThemeEditor.php
@@ -302,8 +302,8 @@ class SurveyThemeEditor {
 
 			echo '<div class="setting_box">';
 
-			echo $lang['srv_te_question_border'].'<select class="dropdown large" name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
-			echo '<option value="" '.(''==$row['value']?' selected':'').'>'.$lang['default'].'</option>';
+			echo $lang['srv_te_question_border'].':<select class="dropdown large" name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo '<option value="" '.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 			echo '<option value="0" '.($row['value']=='0'?' selected':'').'>'.$lang['srv_te_question_border_0'].'</option>';
 			echo '<option value="1" '.($row['value']=='1'?' selected':'').'>'.$lang['srv_te_question_border_1'].'</option>';
 			echo '<option value="2" '.($row['value']=='2'?' selected':'').'>'.$lang['srv_te_question_border_2'].'</option>';
@@ -317,7 +317,7 @@ class SurveyThemeEditor {
 
             echo $lang['srv_te_custom_icon_pc'] . ': ';
             echo '<select class="dropdown large" id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">
-                <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['default'].'</option>
+                <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['srv_te_default'].'</option>
                 <option value="18" '.($row['value'] == 18 ? " selected":"").'>18 px</option>
                 <option value="21" '.($row['value'] == 21 ? " selected":"").'>21 px</option>
                 <option value="25" '.($row['value'] == 25 ? " selected":"").'>25 px</option>
@@ -334,7 +334,7 @@ class SurveyThemeEditor {
 			echo '<div class="setting_box">';
             echo $lang['srv_te_custom_icon_mobile'] . ': ';
             echo '<select class="dropdown large" id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">
-                <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['default'].'</option>
+                <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['srv_te_default'].'</option>
                 <option value="21" '.($row['value'] == 20 ? " selected":"").'>20 px</option>
                 <option value="25" '.($row['value'] == 25 ? " selected":"").'>25 px</option>
                 <option value="30" '.($row['value'] == 30 ? " selected":"").'>30 px</option>
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index f32287551..80acc50f9 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -519,7 +519,7 @@ class CrossRoad {
                     }
                     // Ativnost
                     else{
-                        $layout_width = 'wide';
+                        $layout_width = 'narrow';
                     }
 
                     break;
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 7335d5022..033ca61af 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5566,7 +5566,6 @@ function publishPopupOpen(name){
 }
 
 //Objava - prikaz dodajanje lepega linka
-
 function toggleNiceURL(type) {
 
 	if (type == 'show') {
@@ -5578,3 +5577,9 @@ function toggleNiceURL(type) {
 		$("#nice_url_holder").addClass('displayNone');
 	}
 }
+
+//Aktivnost - toggle dropdown checkboxes
+function toggleAktivnostCheckboxes() {
+	$("#dataSettingsCheckboxes").fadeIn("medium");
+	$("#dataSettingsCheckboxes").toggleClass("displayNone");
+}
diff --git a/lang/1.php b/lang/1.php
index f3a5b1e61..b791ee5af 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3042,7 +3042,7 @@ $lang = array (
 	"srv_url" 						=>	"URL",
 	"srv_embed_link" 				=>	"Embed",
 	"srv_pop-up" 					=>	"Pop-up",
-	"srv_email-vabila" 				=>	"E-po&#353;tna Vabila",
+	"srv_email-vabila" 				=>	"E-poštna vabila",
 	"srv_email-vabila_form"			=>	"Hitre nastavitve email vabil",
 	"srv_url_intro_active" 			=>	"Anketa je aktivirana.",
 	"srv_url_intro1" 				=>	"Anketa je aktivirana. URL:",
@@ -3596,16 +3596,22 @@ $lang = array (
     "srv_survey_comment_show"           =>	"Okno s komentarji je vedno odprto",
     "srv_c_to_mail"						=>	"Pošlji ta komentar urednikom na e-mail",
     "srv_c_alert"						=>	"Prikaži ta komentar vsem urednikom, ko urejajo anketo",
+	"srv_diagnostics_basis"				=>	"Osnova:",
 	"srv_diagnostics_user_surveys"		=>	"&#352;tevilo anket v",
 	"srv_diagnostics_total"				=>	"Skupno &#353;tevilo",
 	"srv_diagnostics_in"				=>	"v",
 	"srv_diagnostics_orfrom"			=>	", ali od",
 	"srv_diagnostics_to"				=>	"do",
-	"srv_diagnostics_respondentov"		=>	"Ustreznih", // respondentov
+	"srv_diagnostics_respondentov"		=>	"Ustrezne enote", // respondentov
 	"srv_diagnostics_strani"			=>	"Strani",
-	"srv_diagnostics_analiza"			=>	"Analiz",
-	"srv_diagnostics_editing"			=>	"Urejanj",
-	"srv_diagnostics_graph"				=>	"Grafov",
+	"srv_diagnostics_analiza"			=>	"Analize",
+	"srv_diagnostics_editing"			=>	"Urejanja",
+	"srv_diagnostics_graph"				=>	"Grafi",
+	"srv_diagnostics_emails"			=>	"E-mail vabila",
+	"srv_diagnostics_upostevane"		=>	"Upoštevane enote",
+	"srv_diagnostics_upostevaj"			=>	"Upoštevaj enote:",
+	"srv_diagnostics_jezik"				=>	"Jezik:",
+	"srv_diagnostics_filter"			=>	"Filtriraj",
 	"srv_diagnostics_1 minute"			=>	"1 minuti",
 	"srv_diagnostics_5 minute"			=>	"5 minutah",
 	"srv_diagnostics_10 minute"			=>	"10 minutah",
@@ -3624,13 +3630,13 @@ $lang = array (
 	"srv_diagnostics_choose_date"		=>	"Izberi datum",
 	"srv_diagnostics_sum_total"			=>	"n = ",
 	"srv_diagnostics_sum_total_survey"	=>  "Število anket: ",	
-	"srv_diagnostics_filter_test"		=>  "Testni",	
-	"srv_diagnostics_filter_autotest"	=>  "Avtomatski testni",	
-	"srv_diagnostics_filter_import"		=>  "Uvoženi",	
-	"srv_diagnostics_filter_6"			=>  "Status 6",	
-	"srv_diagnostics_filter_5"			=>  "Status 5",	
-	"srv_diagnostics_filter_34"			=>  "Neustrezni (status 3,4)",	
-	"srv_diagnostics_filter_012"		=>  "E-pošta brez odgovora (status 0,1,2)",	
+	"srv_diagnostics_filter_test"		=>  "Testne",	
+	"srv_diagnostics_filter_autotest"	=>  "Avtomatske testne",	
+	"srv_diagnostics_filter_import"		=>  "Uvožene",	
+	"srv_diagnostics_filter_6"			=>  "Enote s statusom 6",	
+	"srv_diagnostics_filter_5"			=>  "Enote s statusom 5",	
+	"srv_diagnostics_filter_34"			=>  "Neustrezne enote (status 3 in 4)",	
+	"srv_diagnostics_filter_012"		=>  "E-pošta brez odgovora (status 1 in 2)",	
 	"srv_diagnostics_filter_lang_all"	=>  "Vsi",	
 	"srv_diagnostics_filter_lang_slo"	=>  "Slovenščina",	
 	"srv_diagnostics_filter_lang_ang"	=>  "Angleščina",	
@@ -4130,7 +4136,7 @@ $lang = array (
 	"srv_lurkers_subnote"				=>	"(Uporabniki, kateri so samo preklikali čez anketo - lurkerji)",	
 	"srv_testni_vnos"					=>	"Prikaži testne enote:",	
 	"srv_show_pages"					=>	"Prika&#382;i frekven&#269;no porazdelitev za vsako stran posebej",	
-	"srv_stevilo_enot"					=>	"&#352;tevilo enot",	
+	"srv_stevilo_enot"					=>	"Število enot",	
 	"srv_skupaj_predvideni"				=>	"Skupaj predvideni",	
 	"srv_testni_podatki_alert_title"	=>	"Vaša anketa vsebuje testne podatke",	
 	"srv_testni_podatki_alert"			=>	"Pozor, v bazi so tudi testni podatki!",	
diff --git a/lang/2.php b/lang/2.php
index cb221a19b..2b9e31b64 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3565,16 +3565,22 @@ $lang = array (
     "srv_survey_comment_show"       =>  "Comment window is permanently open",
     "srv_c_to_mail"					=>	"Send this comment to e-mail addresses of all editors",
     "srv_c_alert"					=>	"Display this comment to all editors",
+	"srv_diagnostics_basis"			=>	"Basis:",
 	"srv_diagnostics_user_surveys"	=>	"Numbers of surveys",
     "srv_diagnostics_total"			=>	"Total number of",
 	"srv_diagnostics_in"			=>	"in",
 	"srv_diagnostics_orfrom"		=>	", or from",
 	"srv_diagnostics_to"			=>	"to",
-	"srv_diagnostics_respondentov"	=>	"users",
-	"srv_diagnostics_strani"		=>	"pages",
-	"srv_diagnostics_analiza"		=>	"analysis",
-	"srv_diagnostics_editing"		=>	"all edits",
-	"srv_diagnostics_graph"			=>	"graphs",
+	"srv_diagnostics_respondentov"	=>	"Valid units",
+	"srv_diagnostics_strani"		=>	"Pages",
+	"srv_diagnostics_analiza"		=>	"Analysis",
+	"srv_diagnostics_editing"		=>	"All edits",
+	"srv_diagnostics_graph"			=>	"Graphs",
+	"srv_diagnostics_emails"		=>	"E-mail invitations",
+	"srv_diagnostics_upostevane"		=>	"Counted units",
+	"srv_diagnostics_upostevaj"			=>	"Count units:",
+	"srv_diagnostics_jezik"				=>	"Language:",
+	"srv_diagnostics_filter"			=>	"Filter",
 	"srv_diagnostics_1 minute"		=>	"1 minute",
 	"srv_diagnostics_5 minute"		=>	"5 minutes",
 	"srv_diagnostics_10 minute"		=>	"10 minutes",
@@ -3598,8 +3604,8 @@ $lang = array (
 	"srv_diagnostics_filter_import"		=>  "Imported",	
 	"srv_diagnostics_filter_6"			=>  "Status 6",	
 	"srv_diagnostics_filter_5"			=>  "Status 5",	
-	"srv_diagnostics_filter_34"			=>  "Invalid (status 3,4)",	
-	"srv_diagnostics_filter_012"		=>  "Email unanswered (status 0,1,2)",	
+	"srv_diagnostics_filter_34"			=>  "Invalid (status 3and 4)",	
+	"srv_diagnostics_filter_012"		=>  "Email unanswered (status 1 and 2)",	
 	"srv_diagnostics_filter_lang_slo"	=>  "Slovenian",	
 	"srv_diagnostics_filter_lang_ang"	=>  "English",
 	"srv_diagnostics_interval_hour"		=>  "Hour",	
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d6a17e906..f7493d941 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10673,6 +10673,9 @@ div#theme-edit-wrap div#theme-editor div.columns div.setting_box div.input_box {
   display: flex;
   align-items: center;
 }
+div#theme-edit-wrap div#theme-editor div.columns div.setting_box option {
+  font-size: 14px;
+}
 div#theme-edit-wrap div#theme-editor div.columns div.setting_box div.input_box {
   border: 1px solid #C4C4C4;
   box-sizing: border-box;
@@ -10687,6 +10690,7 @@ div#theme-edit-wrap div#theme-editor div.columns div.setting_box div.input_box a
   margin-left: 8px;
   font-size: inherit;
   color: #1E88E5;
+  font-size: 14px;
 }
 div#theme-edit-wrap div#theme-editor #picker {
   /*max-height: 90vh;
@@ -21966,6 +21970,147 @@ div#user_info_segment_narocila .user_info.text {
   margin-right: 50px;
 }
 
+div.page_diagnostics .data_table_top_holder {
+  position: relative;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  margin-bottom: 16px;
+  padding: 6px 16px;
+  background: #F8F8F8;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  font-size: 14px !important;
+}
+div.page_diagnostics .data_table_top_holder .osnova {
+  box-sizing: border-box;
+  padding-right: 8px;
+  margin-right: 8px;
+  border-right: 1px solid #C4C4C4;
+}
+div.page_diagnostics .data_table_top_holder .osnova select {
+  padding: 3px 5px;
+  margin: 0 0 0 8px;
+  width: 123px;
+  vertical-align: middle;
+}
+div.page_diagnostics .data_table_top_holder .dataSettingsBasic {
+  display: flex;
+  margin-right: 8px;
+  padding-right: 8px;
+  border: none;
+}
+div.page_diagnostics .data_table_top_holder .dataSettingsBasic button.white-blue {
+  height: 28px;
+  width: 140px;
+  min-width: auto;
+  padding: 0;
+  line-height: 12px;
+  font-weight: 400;
+  color: #333333;
+  border-radius: 2px;
+}
+div.page_diagnostics .data_table_top_holder .dataSettingsBasic button.white-blue .faicon:before {
+  margin-right: 8px;
+  font-size: 12px;
+  color: #1E88E5;
+}
+div.page_diagnostics .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;
+  left: 211px;
+  border-radius: 2px;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes a {
+  text-decoration: none;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes ul {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes ul li {
+  margin-bottom: 16px;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes ul li:last-of-type {
+  margin-bottom: 0;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes ul li span {
+  cursor: pointer;
+  color: #333333;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes ul li span:hover {
+  color: #1E88E5;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder {
+  display: flex;
+  flex-direction: column;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder #jezikpaket {
+  display: flex;
+  flex-direction: row;
+  gap: 64px;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder #jezikpaket select,
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder #jezikpaket option {
+  padding: 3px 5px;
+  font-size: 16px !important;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder .setting_holder {
+  margin-bottom: 16px;
+  display: flex;
+  flex-direction: column;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder .setting_holder .setting_title {
+  font-weight: 600;
+  text-transform: uppercase;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder .setting_holder .setting_item {
+  margin-top: 12px;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder .button_holder {
+  padding: 8px 0 0 0;
+  margin: 0;
+  border-top: 1px #E5E5E5 solid;
+}
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes .dataSettingsCheckboxes_holder .button_holder button {
+  min-width: 130px;
+}
+div.page_diagnostics table#aktivnost_ankete_table {
+  white-space: nowrap;
+  width: 100%;
+}
+div.page_diagnostics table#aktivnost_ankete_table th {
+  height: 55px;
+  box-sizing: border-box;
+}
+div.page_diagnostics table#aktivnost_ankete_table td {
+  height: 40px;
+  box-sizing: border-box;
+}
+div.page_diagnostics table#aktivnost_ankete_table td.graph_cell {
+  width: 100%;
+}
+div.page_diagnostics table#aktivnost_ankete_table td.graph_cell div.graph_cell {
+  display: flex;
+  flex-direction: row;
+}
+div.page_diagnostics table#aktivnost_ankete_table td.graph_cell div.graph_cell .graph_full {
+  background-color: #1E88E5;
+  height: 24px;
+  margin-right: 8px;
+}
+
 @media (max-width: 1100px) {
   #quick_comments_link.newCss {
     display: none;
diff --git a/resources/sass/admin_new/pages/aktivnost/aktivnost.scss b/resources/sass/admin_new/pages/aktivnost/aktivnost.scss
new file mode 100644
index 000000000..1c4f00073
--- /dev/null
+++ b/resources/sass/admin_new/pages/aktivnost/aktivnost.scss
@@ -0,0 +1,151 @@
+div.page_diagnostics {
+
+    //Aktivnost - ankete
+
+    //Filtri zgoraj
+
+    .data_table_top_holder{
+        position: relative;
+        display: flex;
+        align-items: center;
+    
+        box-sizing: border-box;
+        margin-bottom: 16px;
+        padding: 6px 16px;
+    
+        background: $light-gray;
+        border: 1px solid $gray;
+        border-radius: 2px;
+
+        font-size: 14px !important;
+
+        .osnova {
+            box-sizing: border-box;
+            padding-right: 8px;
+            margin-right: 8px;
+            border-right: 1px solid $dark-gray;
+
+            select {
+                padding: 3px 5px;
+                margin: 0 0 0 8px;
+                width: 123px;
+                vertical-align: middle;
+            }
+        }
+    
+        .dataSettingsBasic{
+            display: flex;
+    
+            margin-right: 8px;
+            padding-right: 8px;
+            border: none;
+    
+            button.white-blue{
+                height: 28px;
+                width: 140px;
+                min-width: auto;
+                padding: 0;
+    
+                line-height: 12px;
+                font-weight: 400;
+                color: $black;
+    
+                border-radius: 2px;
+    
+                .faicon:before{
+                    margin-right: 8px;
+    
+                    font-size: 12px;
+                    color: $blue;
+                }
+            }
+        }
+    
+        #dataSettingsCheckboxes{
+            @include hover_basic();
+    
+            z-index: 99999;
+            position: absolute;
+            top: 41px;
+            left: 211px;
+    
+            border-radius: 2px;
+    
+            .dataSettingsCheckboxes_holder{
+                display: flex;
+                flex-direction: column;
+
+                #jezikpaket {
+                    display: flex;
+                    flex-direction: row;
+                    gap: 64px;
+
+                    select,
+                    option {
+                        padding: 3px 5px;
+                        font-size: 16px !important;
+                    }
+                }
+    
+                .setting_holder {
+                    margin-bottom: 16px;
+                    display: flex;
+                    flex-direction: column;
+
+                    .setting_title {
+                        font-weight: $semi-bold;
+                        text-transform: uppercase;
+                    }
+            
+                    .setting_item {
+                        margin-top: 12px;
+                    }
+                }
+    
+                .button_holder{
+                    padding: 8px 0 0 0;
+                    margin: 0;
+    
+                    border-top: 1px $gray solid;
+
+                    button {
+                        min-width: 130px;
+                    }
+                }
+            }
+        }
+    }
+
+
+    //Tabela
+    table#aktivnost_ankete_table {
+        white-space: nowrap;
+        width: 100%;
+        
+        th{
+            height: 55px;
+            box-sizing: border-box;
+        }
+
+        td {
+            height: 40px;
+            box-sizing: border-box;
+
+            &.graph_cell {
+                width: 100%;
+    
+                div.graph_cell {
+                    
+                    display:flex;
+                    flex-direction: row;
+
+                    .graph_full {
+                        background-color: $blue;
+                        height: 24px;
+                        margin-right: 8px;
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss b/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
index 16a598a1d..9e5824c10 100644
--- a/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
+++ b/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
@@ -339,6 +339,10 @@ div#theme-edit-wrap{
                     display: flex;
                     align-items: center;
                 }
+
+                option {
+                    font-size: 14px;
+                }
                 
                 //Za 1. fazo - box za barvo
                 div.input_box {
@@ -355,6 +359,7 @@ div#theme-edit-wrap{
                             margin-left: 8px;
                             font-size: inherit;
                             color: $blue;
+                            font-size: 14px;
                         }
                     }
                 }
diff --git a/resources/sass/admin_new/pages/pages.scss b/resources/sass/admin_new/pages/pages.scss
index 7fb3fa844..acb0b3f16 100644
--- a/resources/sass/admin_new/pages/pages.scss
+++ b/resources/sass/admin_new/pages/pages.scss
@@ -17,4 +17,6 @@
 //New survey
 @import "new_survey_page/new_survey_page";
 
-@import "narocila"
\ No newline at end of file
+@import "narocila";
+
+@import "aktivnost/aktivnost";