diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 509d9f708..52e812d87 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -3614,7 +3614,7 @@ class SurveyAdminSettings {
 		global $global_user_id;
 		global $mysql_database_name;
 	
-		echo '<fieldset id="gdpr_anketa">';
+		echo '<fieldset id="email_streznik_anketa">';
 		echo '<legend>'.$lang['srv_user_base_email_server_settings'].'</legend>';
 	
 		$row = SurveyInfo::getInstance()->getSurveyRow();
diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 9c5fd35f6..acf63d3df 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -701,98 +701,158 @@ class GDPR{
 
 
 		// GDPR nastavitve ankete
-		echo '<fieldset class="wide">';
+		echo '<fieldset id="gdpr_anketa">';
 		echo '<legend>'.$lang['srv_gdpr_survey_settings'].'</legend>';
 
 		// Besedilo na vrhu
-		echo '<p class="italic">'.$lang['srv_gdpr_survey_settings_desc1'].'</p>';
+		echo '<p>'.$lang['srv_gdpr_survey_settings_desc1'].'</p>';
 		
-		echo '<p class="italic">'.$lang['srv_gdpr_survey_settings_desc2'].' <a href="'.$site_url.'admin/survey/index.php?a=gdpr" target="_blank"><span class="bold">'.$lang['srv_here'].' >></span></a></p>';
+		echo '<p class="bottom16 top16">'.$lang['srv_gdpr_survey_settings_desc2'].' <a href="'.$site_url.'admin/survey/index.php?a=gdpr" target="_blank"><span class="bold">'.$lang['srv_here'].' >></span></a></p>';
 		
-		echo '<p class="italic">'.$lang['srv_gdpr_survey_settings_desc3'].'</p>';
+		echo '<p class="bottom16">'.$lang['srv_gdpr_survey_settings_desc3'].'</p>';
 
 		// Ali gre za gdpr anketo
-		echo '<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_data'].':</span>';
-		echo '<label for="is_gdpr_1"><input type="radio" name="is_gdpr" id="is_gdpr_1" '.($gdpr_settings != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
-		echo '<label for="is_gdpr_0"><input type="radio" name="is_gdpr" id="is_gdpr_0" '.($gdpr_settings == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
-
-		echo '<br /><br />';
+		echo '<div class="setting_holder">';
+		echo '<div class="fold ">';
+		echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_data'].':</span>';
 
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="is_gdpr" id="is_gdpr_1" '.($gdpr_settings != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+		echo '<label for="is_gdpr_1">'.$lang['yes'].'</label>';
+		echo '</div>';
+		
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="is_gdpr" id="is_gdpr_0" '.($gdpr_settings == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+		echo '<label for="is_gdpr_0">'.$lang['no'].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>';
 
         // Oznacena kot GDPR - prikazemo identifikatorje
         echo '<div id="gdpr_data_identifiers" '.($gdpr_settings == 0 ? ' style="display:none;"' : '').'>';
+
+        echo '<p class="semi-bold" >'.$lang['srv_gdpr_survey_gdpr_data_q'].'</p>';
+
+		echo '<div class="setting_holder">';
         
-        echo '<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_data_q'].'</span><br /><br />';
-
         // Osebni podatek ime
-		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_name'].':</span>';
-		echo '	<label for="name_1"><input type="radio" name="name" id="name_1" '.($gdpr_settings['name'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
-		echo '	<label for="name_0"><input type="radio" name="name" id="name_0" '.($gdpr_settings['name'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
-		echo '	<br />';
+		echo '<div class="fold">';
+        echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_name'].':</span>';
+        echo '<div class="setting_item">';
+		echo '<input type="radio" name="name" id="name_1" '.($gdpr_settings['name'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+		echo '<label for="name_1">'.$lang['yes'].'</label> ';
+        echo '</div>';
+        echo '<div class="setting_item">';
+		echo '<input type="radio" name="name" id="name_0" '.($gdpr_settings['name'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+		echo '<label for="name_0">'.$lang['no'].'</label> ';
+        echo '</div>';
+        echo '</div>';
 
 		// Osebni podatek email
-		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_email'].':</span>';
-		echo '	<label for="email_1"><input type="radio" name="email" id="email_1" '.($gdpr_settings['email'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
-		echo '	<label for="email_0"><input type="radio" name="email" id="email_0" '.($gdpr_settings['email'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
-		echo '	<br />';
+		echo '<div class="fold">';
+        echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_email'].':</span>';
+        echo '<div class="setting_item">';
+		echo '<input type="radio" name="email" id="email_1" '.($gdpr_settings['email'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+		echo '	<label for="email_1">'.$lang['yes'].'</label> ';
+        echo '</div>';
+        echo '<div class="setting_item">';
+        echo '<input type="radio" name="email" id="email_0" '.($gdpr_settings['email'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+		echo '	<label for="email_0">'.$lang['no'].'</label> ';
+		echo '</div>';
+        echo '</div>';
 
 		// Osebni podatek lokacija
-		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_location'].':</span>';
-		echo '	<label for="location_1"><input type="radio" name="location" id="location_1" '.($gdpr_settings['location'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
-		echo '	<label for="location_0"><input type="radio" name="location" id="location_0" '.($gdpr_settings['location'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
-		echo '	<br />';
+		echo '<div class="fold">';
+        echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_location'].':</span>';
+        echo '<div class="setting_item">';
+        echo '<input type="radio" name="location" id="location_1" '.($gdpr_settings['location'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+		echo '	<label for="location_1">'.$lang['yes'].'</label> ';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="location" id="location_0" '.($gdpr_settings['location'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+		echo '	<label for="location_0">'.$lang['no'].'</label> ';
+        echo '</div>';
+        echo '</div>';
 
 		// Osebni podatek telefon
-		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_phone'].':</span>';
-		echo '	<label for="phone_1"><input type="radio" name="phone" id="phone_1" '.($gdpr_settings['phone'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
-		echo '	<label for="phone_0"><input type="radio" name="phone" id="phone_0" '.($gdpr_settings['phone'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-		
-		echo '	<br />';
+		echo '<div class="fold">';
+        echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_phone'].':</span>';
+        echo '<div class="setting_item">';
+		echo '<input type="radio" name="phone" id="phone_1" '.($gdpr_settings['phone'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+		echo '	<label for="phone_1">'.$lang['yes'].'</label> ';
+        echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="phone" id="phone_0" '.($gdpr_settings['phone'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+		echo '	<label for="phone_0">'.$lang['no'].'</label> ';
+        echo '</div>';
+        echo '</div>';
 
 		// Osebni podatek spletni identifikator
-		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_web'].':</span>';
-		echo '	<label for="web_1"><input type="radio" name="web" id="web_1" '.($gdpr_settings['web'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
-		echo '	<label for="web_0"><input type="radio" name="web" id="web_0" '.($gdpr_settings['web'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-		
-		echo '	<br />';
+		echo '<div class="fold">';
+        echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_web'].':</span>';
+        echo '<div class="setting_item">';
+		echo '<input type="radio" name="web" id="web_1" '.($gdpr_settings['web'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+		echo '	<label for="web_1">'.$lang['yes'].'</label> ';
+        echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="web" id="web_0" '.($gdpr_settings['web'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+		echo '	<label for="web_0">'.$lang['no'].'</label> ';
+        echo '</div>';
+        echo '</div>';
 
 		// Osebni podatek drugo
-		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_other'].':</span>';
-		echo '	<label for="other_1"><input type="radio" name="other" id="other_1" '.($gdpr_settings['other'] != 0 ? ' checked':'').' value="1" onChange="showGDPRSettings(); toggleGDPROtherText(this);">'.$lang['yes'].'</label> ';
-		echo '	<label for="other_0"><input type="radio" name="other" id="other_0" '.($gdpr_settings['other'] == 0 ? ' checked':'').' value="0" onChange="showGDPRSettings(); toggleGDPROtherText(this);">'.$lang['no'].'</label> ';
-		
+		echo '<div class="fold">';
+        echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_other'].':</span>';
+        echo '<div class="setting_item">';
+		echo '<input type="radio" name="other" id="other_1" '.($gdpr_settings['other'] != 0 ? ' checked':'').' value="1" onChange="showGDPRSettings(); toggleGDPROtherText(this);">';
+		echo '	<label for="other_1">'.$lang['yes'].'</label> ';
+        echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="other" id="other_0" '.($gdpr_settings['other'] == 0 ? ' checked':'').' value="0" onChange="showGDPRSettings(); toggleGDPROtherText(this);">';
+		echo '	<label for="other_0">'.$lang['no'].'</label> ';
+        echo '</div>';
+        echo '</div>';
+
+        echo '</div>';
+
         echo '<div id="other_text" '.($gdpr_settings['other'] == 0 ? ' style="display:none;"' : '').'>';
+		
         if($language_slo){
-            echo '	<span class="nastavitveSpan1">&nbsp;</span>';
-            echo '	<textarea class="other" name="other_text_slo" id="other_text_slo" style="width:500px; height:80px; margin-top:10px;">'.$gdpr_settings['other_text_slo'].'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
+            echo '	<p class="gray top16">'.$lang['srv_gdpr_survey_gdpr_other_textA'].' ('.$admin_languages['1'].')</p>';
+            echo '	<textarea class="textarea" name="other_text_slo" id="other_text_slo" >'.$gdpr_settings['other_text_slo'].'</textarea>';
             echo '<br />';
         }
         if($language_eng){
-            echo '	<span class="nastavitveSpan1">&nbsp;</span>';
-            echo '	<textarea class="other" name="other_text_eng" id="other_text_eng" style="width:500px; height:80px; margin-top:10px;">'.$gdpr_settings['other_text_eng'].'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
+			echo '	<p class="gray top16">'.$lang['srv_gdpr_survey_gdpr_other_textA'].' ('.$admin_languages['2'].')</p>';
+            echo '	<textarea class="textarea" name="other_text_eng" id="other_text_eng">'.$gdpr_settings['other_text_eng'].'</textarea>';
         }
         echo '</div>';
         
         echo '</div>';
 
 
-		echo '	<br /><br />';
-
-
 		// Oznacena kot GDPR - prikazemo dodatne nastavitve gdpr
 		echo '<div id="gdpr_data_settings" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
 
 		// Ali se uporabi 1ka template v uvodu
-		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_1ka_template'].':</span>';
-		echo '	<label for="1ka_template_1"><input type="radio" name="1ka_template" id="1ka_template_1" '.(!isset($gdpr_settings['1ka_template']) || $gdpr_settings['1ka_template'] != 0 ? ' checked':'').' value="1" onClick="showGDPRTemplate(this.value);">'.$lang['yes'].'</label> ';
-		echo '	<label for="1ka_template_0"><input type="radio" name="1ka_template" id="1ka_template_0" '.(isset($gdpr_settings['1ka_template']) && $gdpr_settings['1ka_template'] == 0 ? ' checked':'').' value="0" onClick="showGDPRTemplate(this.value);">'.$lang['no'].'</label> ';
+		echo '<div class="setting_holder">';
+        echo '<div class="fold">';
+        echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_1ka_template'].':</span>';
 
-		echo '	<div class="spaceLeft floatRight red" style="display:inline; width:520px;">';
-		// Obvestilo z linkom na preview preduvoda
+        echo '<div class="setting_item">';
+		echo '<input type="radio" name="1ka_template" id="1ka_template_1" '.(!isset($gdpr_settings['1ka_template']) || $gdpr_settings['1ka_template'] != 0 ? ' checked':'').' value="1" onClick="showGDPRTemplate(this.value);">';
+		echo '	<label for="1ka_template_1">'.$lang['yes'].'</label> ';
+        echo '</div>';
+        echo '<div class="setting_item">';
+		echo '<input type="radio" name="1ka_template" id="1ka_template_0" '.(isset($gdpr_settings['1ka_template']) && $gdpr_settings['1ka_template'] == 0 ? ' checked':'').' value="0" onClick="showGDPRTemplate(this.value);">';
+		echo '	<label for="1ka_template_0">'.$lang['no'].'</label> ';
+        echo '</div>';
+                    
+        echo '</div>';
+        echo '</div>';
+
+		/* Obvestilo z linkom na preview preduvoda
 		echo '<span id="gdpr_data_template" class="italic" '.(isset($gdpr_settings['1ka_template']) && $gdpr_settings['1ka_template'] == 0 ? ' style="display:none;"' : '').'>';
 		echo $lang['srv_gdpr_survey_gdpr_1ka_template_note'];
 		echo '<br /><span class="bold"><a href="#" onClick="previewGDPRIntro(); return false;">'.$lang['srv_gdpr_survey_gdpr_1ka_template_preview'].'</a></span>';
@@ -801,7 +861,7 @@ class GDPR{
 		echo '		<span id="gdpr_data_template_warning" class="italic red" '.(!isset($gdpr_settings['1ka_template']) || $gdpr_settings['1ka_template'] == 1 ? ' style="display:none;"' : '').'>'.$lang['srv_gdpr_survey_gdpr_1ka_template_warning'].'</span>';
 		echo '	</div>';
 	
-		echo '	<br /><br /><br /><br />';
+		echo '	<br /><br /><br /><br />';*/
 
 		// Podrobnosti o zbiranju podatkov (popup v uvodu)
 		/*if($gdpr_settings['about'] == ''){
@@ -814,109 +874,176 @@ class GDPR{
 		echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_about'].':<br /><br /><span class="italic">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</span></span>';
 		echo '	<textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> ';*/
 
-        echo '	<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_about'].':<br /><br /><span class="italic">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</span></span>';
+        echo '<p class="semi-bold top16">'.$lang['srv_gdpr_survey_gdpr_about'].':</p>';
+        echo '<p class="top16">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</p>';
+
 		if($language_slo){
             $about_array = self::getGDPRInfoArray($ank_id, $language_id='1');
             $about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
-
-            echo '	<textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
-            echo '	<br><br><span class="nastavitveSpan1">&nbsp;</span>';
+			
+			echo '	<p class="semi-bold top16">'.$admin_languages['1'].'</p>';
+            echo '	<textarea name="about" class="textarea" id="about" disabled="disabled">'.$about_text.'</textarea>';
         }
         if($language_eng){
             $about_array = self::getGDPRInfoArray($ank_id, $language_id='2');
             $about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
-
-            echo '	<textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
+			
+			echo '	<p class="semi-bold top16">'.$admin_languages['2'].'</p>';
+            echo '	<textarea name="about" class="textarea" id="about" disabled="disabled">'.$about_text.'</textarea>';
         }
 
-		echo '<br /><br />';
-		
 		// Povezava na splosne gdpr nastavitve - ce ni izpolnil osebnih podatkov, je rdec warning
-		echo '<a href="'.$site_url.'admin/survey/index.php?a=gdpr" target="_blank"><span class="bold">'.$lang['srv_gdpr_general_settings'].'</span></a>';
 		if(!self::checkUserSettings())
-			echo '<br /><span class="red italic">'.$lang['srv_gdpr_general_settings_warning'].'</span>';
+			echo '<p class="top16">'.$lang['srv_gdpr_general_settings_warninga'].'<a href="'.$site_url.'admin/survey/index.php?a=gdpr" target="_blank">'.$lang['srv_gdpr_general_settings_warningb'].'</a>!</p>';
 
-		echo '<br /><br />';
-		
 		echo '</div>';
 
 		echo '</fieldset>';
 
 
-        echo '<br class="clr" />';
-
-
         // Dodatne informacije
-        echo '<fieldset id="gdpr_additional_info" class="wide" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
-		echo '<legend>'.$lang['srv_gdpr_survey_settings'].'</legend>';
-
-        echo '	<br />';
-
+        echo '<fieldset id="gdpr_additional_info"'.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
+		echo '<legend>'.$lang['srv_gdpr_general_settings_handling'].'</legend>';
 
 		// Cas hranjenja podatkov
-		echo '	<span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_expire'].':</span>';
-		echo '	<label for="expire_0"><input type="radio" name="expire" id="expire_0" '.($gdpr_settings['expire'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_expire_0'].'</label> ';
-        
-        echo '	<br /><span class="nastavitveSpan1">&nbsp;</span>';
-        echo '	<label for="expire_1"><input type="radio" name="expire" id="expire_1" '.($gdpr_settings['expire'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_expire_1'].'</label> ';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_expire'].':</span>';
+		
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="expire" id="expire_0" '.($gdpr_settings['expire'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">';
+		echo '	<label for="expire_0">'.$lang['srv_gdpr_survey_gdpr_expire_0'].'</label> ';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="expire" id="expire_1" '.($gdpr_settings['expire'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">';
+        echo '	<label for="expire_1">'.$lang['srv_gdpr_survey_gdpr_expire_1'].'</label> ';
+		echo '</div>';
+
         if($language_slo){
-            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text expire" placeholder="'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].'" name="expire_text_slo" id="expire_text_slo" value="'.$gdpr_settings['expire_text_slo'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text expire text large" name="expire_text_slo" id="expire_text_slo" value="'.$gdpr_settings['expire_text_slo'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'><p>SLO</p>';
+			echo '</div>';
+			echo '</div>';
         }
         if($language_eng){
-            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text expire" placeholder="'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].'" name="expire_text_eng" id="expire_text_eng" value="'.$gdpr_settings['expire_text_eng'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text expire text large" name="expire_text_eng" id="expire_text_eng" value="'.$gdpr_settings['expire_text_eng'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+			echo '</div>';
+			echo '</div>';
         }
 
-		echo '	<br /><br />';
-
+		echo '</div>';
 
 		// Drugi uporabniki podatkov
-		echo '	<span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_other_users'].':</span>';
-		echo '	<label for="other_users_0"><input type="radio" name="other_users" id="other_users_0" '.($gdpr_settings['other_users'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_other_users_0'].'</label> ';
-        
-        echo '	<br /><span class="nastavitveSpan1">&nbsp;</span>';
-        echo '	<label for="other_users_1"><input type="radio" name="other_users" id="other_users_1" '.($gdpr_settings['other_users'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_other_users_1'].'</label> ';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_other_users'].':</span>';
+		
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="other_users" id="other_users_0" '.($gdpr_settings['other_users'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">';
+		echo '	<label for="other_users_0">'.$lang['srv_gdpr_survey_gdpr_other_users_0'].'</label> ';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="other_users" id="other_users_1" '.($gdpr_settings['other_users'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">';
+        echo '	<label for="other_users_1">'.$lang['srv_gdpr_survey_gdpr_other_users_1'].'</label> ';
+		echo '</div>';
+
         if($language_slo){
-            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text other_users" placeholder="'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].'" name="other_users_text_slo" id="other_users_text_slo" value="'.$gdpr_settings['other_users_text_slo'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text other_users text large" name="other_users_text_slo" id="other_users_text_slo" value="'.$gdpr_settings['other_users_text_slo'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'><p>SLO</p>';
+			echo '</div>';
+			echo '</div>';
         }
         if($language_eng){
-            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text other_users" placeholder="'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].'" name="other_users_text_eng" id="other_users_text_eng" value="'.$gdpr_settings['other_users_text_eng'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text other_users text large" name="other_users_text_eng" id="other_users_text_eng" value="'.$gdpr_settings['other_users_text_eng'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+			echo '</div>';
+			echo '</div>';
         }
 
-		echo '	<br /><br />';
+		echo '</div>';
 
 
 		// Izvoz v tuje drzave
-		echo '	<span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export'].':</span>';
-		echo '	<label for="export_0"><input type="radio" name="export" id="export_0" '.($gdpr_settings['export'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_export_0'].'</label> ';
-        
-        echo '	<br /><span class="nastavitveSpan1">&nbsp;</span>';
-        echo '	<label for="export_1"><input type="radio" name="export" id="export_1" '.($gdpr_settings['export'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_export_country'].'</label> ';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_export'].':</span>';
+		
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="export" id="export_0" '.($gdpr_settings['export'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">';
+		echo '	<label for="export_0">'.$lang['srv_gdpr_survey_gdpr_export_0'].'</label> ';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" name="export" id="export_1" '.($gdpr_settings['export'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">';
+        echo '	<label for="export_1">'.$lang['srv_gdpr_survey_gdpr_export_country'].'</label> ';
+		echo '</div>';
+
         if($language_slo){
-            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].'" name="export_country_slo" id="export_country_slo" value="'.$gdpr_settings['export_country_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text export text large" name="export_country_slo" id="export_country_slo" value="'.$gdpr_settings['export_country_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>SLO</p>';
+			echo '</div>';
+			echo '</div>';
         }
         if($language_eng){
-            echo '	<br /><span class="nastavitveSpan1">&nbsp;</span><input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].'" name="export_country_eng" id="export_country_eng" value="'.$gdpr_settings['export_country_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text export text large" name="export_country_eng" id="export_country_eng" value="'.$gdpr_settings['export_country_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+			echo '</div>';
+			echo '</div>';
         }
 
-        echo '	<br /><br /><span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export_user'].':</span>';
+		echo '<span class="setting_title semi-bold top8 indent">'.$lang['srv_gdpr_survey_gdpr_export_user'].':</span>';
+
         if($language_slo){
-            echo ' <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].'" name="export_user_slo" id="export_user_slo" value="'.$gdpr_settings['export_user_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
-            echo ' <br />';
+
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text export text large" name="export_user_slo" id="export_user_slo" value="'.$gdpr_settings['export_user_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+			echo '</div>';
+			echo '</div>';
         }
         if($language_eng){
-            echo ' <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].'" name="export_user_eng" id="export_user_eng" value="'.$gdpr_settings['export_user_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text export text large" name="export_user_eng" id="export_user_eng" value="'.$gdpr_settings['export_user_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+			echo '</div>';
+			echo '</div>';
         }
 
-        echo '<br /><br /><span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export_legal'].':</span>';
+
+		echo '<span class="setting_title semi-bold top8 indent">'.$lang['srv_gdpr_survey_gdpr_export_legal'].':</span>';
+
         if($language_slo){
-            echo ' <input type="text" class="line_text long export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].'" name="export_legal_slo" id="export_legal_slo" value="'.$gdpr_settings['export_legal_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
-            echo ' <br /><span class="nastavitveSpan1">&nbsp;</span>';
+
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text long export text large" name="export_legal_slo" id="export_legal_slo" value="'.$gdpr_settings['export_legal_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+			echo '</div>';
+			echo '</div>';
         }
         if($language_eng){
-            echo ' <input type="text" class="line_text long export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].'" name="export_legal_eng" id="export_legal_eng" value="'.$gdpr_settings['export_legal_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
+
+			echo '<div class="setting_item indent">';
+			echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].':</p>';
+			echo '<div class="text_follow">';
+            echo '<input type="text" class="line_text long export text large" name="export_legal_eng" id="export_legal_eng" value="'.$gdpr_settings['export_legal_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+			echo '</div>';
+			echo '</div>';
         }
 
-		echo '	<br /><br />';
+		echo '</div>';
 
 
         // Pooblascena oseba za varstvo podatkov
@@ -955,11 +1082,11 @@ class GDPR{
         else{
             $gdpr_authorized = $gdpr_settings['authorized'];
         }
-		echo '	<span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_authorized'].':</span>';
-		echo '	<input type="text" name="authorized" id="authorized" value="'.$gdpr_authorized.'">';
-		
-		echo '	<br /><br />';
 
+		echo '<div class="setting_holder indent">';
+		echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_authorized'].':</span>';
+		echo '	<input type="text" class="text large" name="authorized" id="authorized" value="'.$gdpr_authorized.'">';
+		echo '</div>';
 
         // Kontaktni email
         if($gdpr_settings['contact_email'] == ''){
@@ -978,13 +1105,13 @@ class GDPR{
         else{
             $gdpr_contact_email = $gdpr_settings['contact_email'];
         }
-		echo '	<span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_contact_email'].':</span>';
-		echo '	<input type="text" name="contact_email" id="contact_email" value="'.$gdpr_contact_email.'">';
-		
-        echo '	<br /><br />';
-        
 
-        // Opomba
+		echo '<div class="setting_holder indent">';
+		echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_contact_email'].':</span>';
+		echo '	<input type="text" class="text large" name="contact_email" id="contact_email" value="'.$gdpr_contact_email.'">';
+		echo '</div>';
+
+        /*/ Opomba
 		echo '	<span class="nastavitveSpan1">'.$lang['note'].':</span>';
 		if($language_slo){
             echo '	<textarea name="note_slo" id="note_slo" style="width:500px; height:80px;">'.$gdpr_settings['note_slo'].'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
@@ -994,30 +1121,28 @@ class GDPR{
             echo '	<textarea name="note_eng" id="note_eng" style="width:500px; height:80px;">'.$gdpr_settings['note_eng'].'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
         }
 		
-		echo '	<br /><br />';
+		echo '	<br /><br />';*/
 
 		echo '</fieldset>';
 
 
         // Gumb shrani spremembe
-		echo '<br class="clr" />';
 
-		//echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.settingsanketa_' . $ank_id . '.submit(); return false;"><span>';
-		echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onClick="editGDPRSurvey(\''.$ank_id.'\'); return false;"><span>';
-		echo $lang['edit1337'] . '</span></a></div></span>';
-		echo '<div class="clr"></div>';
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="window.location.reload(); return false;">'.$lang['edit1338'].'</button>';              
+        echo '<button class="medium blue" onclick="editGDPRSurvey(\''.$ank_id.'\'); return false;">'.$lang['edit1337'].'</button>';
+        echo '</div>';
 
-        echo '<br /><br />';
-         
+
+		echo '<div id="gdpr_bottom_wrap">';
+
+		echo '<div id="gdpr_bottom_wrap_left">';
 
         // Export - informacije dane posamezniku
-        echo '<fieldset id="gdpr_export_individual" class="wide" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
+        echo '<fieldset id="gdpr_export_individual" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
         echo '<legend>'.$lang['srv_gdpr_survey_gdpr_export_individual'].'</legend>';
 
-        echo '	<br />';
-
-        echo '<a href="#" onClick="previewGDPRExport(\'1\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
-        echo '	<br />';
+        echo '<a class="noline" href="#" onClick="previewGDPRExport(\'1\'); return false;"><span class="faicon preview link-right"></span>'.$lang['srv_poglejanketo2'].'</a>';
 
         // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
         $userAccess = UserAccess::getInstance($global_user_id);
@@ -1027,69 +1152,60 @@ class GDPR{
         }
         else{
 
-            echo '<br />';
 
             if($language_slo){
-                echo '<span class="bold">'.$admin_languages['1'].':</span><br />';
-                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
-                echo '<br />';
-                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
+                echo '<span class="semi-bold lang">'.$admin_languages['1'].':</span>';
+                echo '<a class="noline lang" href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - Adobe Acrobat</a>';
+                echo '<a class="noline lang" href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - Microsoft Word</a>';
                 
-                echo '<br /><br />';
             }
 
             if($language_eng){
-                echo '<span class="bold">'.$admin_languages['2'].':</span><br />';
-                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
-                echo '<br />';
-                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
+                echo '<span class="semi-bold lang">'.$admin_languages['2'].':</span>';
+                echo '<a class="noline lang" href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - Adobe Acrobat</a>';
+                echo '<a class="noline lang" href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - Microsoft Word</a>';
             
-                echo '<br /><br />';
             }
         }
 
         echo '</fieldset>';
 
+		echo '</div>'; #left
 
-        echo '	<br />';        
+		echo '<div id="gdpr_bottom_wrap_right">';
 
 
         // Export - evidenca dejavnosti obdelav
-        echo '<fieldset id="gdpr_export_activity" class="wide" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
+        echo '<fieldset id="gdpr_export_activity" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
         echo '<legend>'.$lang['srv_gdpr_survey_gdpr_export_activity'].'</legend>';
 
-        echo '	<br />';
-
-        echo '<a href="#" onClick="previewGDPRExport(\'2\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
-        echo '	<br />';
+        echo '<a href="#" class="noline" onClick="previewGDPRExport(\'2\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
 
         if(!$userAccess->checkUserAccess($what='gdpr_export')){
             $userAccess->displayNoAccess($what='gdpr_export');
         }
         else{     
 
-            echo '<br />';
 
             if($language_slo){
-                echo '<span class="bold">'.$admin_languages['1'].':</span><br />';
-                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
-                echo '	<br />';
-                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
+                echo '<span class="semi-bold lang">'.$admin_languages['1'].':</span>';
+                echo '<a class="noline lang" href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - Adobe Acrobat</a>';
+                echo '<a class="noline lang" href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - Microsoft Word</a>';
                     
-                echo '<br /><br />';
             }
 
             if($language_eng){
-                echo '<span class="bold">'.$admin_languages['2'].':</span><br />';
-                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
-                echo '	<br />';
-                echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - (Microsoft Word)</a>';
-                
-                echo '<br /><br />';
+                echo '<span class="semi-bold lang">'.$admin_languages['2'].':</span>';
+                echo '<a class="noline lang" href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon pdf"></span>&nbsp;PDF - Adobe Acrobat</a>';
+                echo '<a class="noline lang" href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon rtf"></span>&nbsp;DOC - Microsoft Word</a>';
             }
         }
 
         echo '</fieldset>';
+
+		echo '</div>'; #right
+        echo '</div>'; #wrap
+
 	}
 
 	// Prikazemo vsebino zavihka gdpr - nastavitve posamezne ankete
@@ -2567,7 +2683,7 @@ class GDPR{
                     $type = $_POST['type'];
 
 
-                echo '<div id="preview_gdpr_export" class="divPopUp">';
+                echo '<div id="preview_gdpr_export">';
 
                 echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancel(); return false;">✕</a></div>';
 
diff --git a/admin/survey/script/GDPR.js b/admin/survey/script/GDPR.js
index 36462a6ae..7c3434ed4 100644
--- a/admin/survey/script/GDPR.js
+++ b/admin/survey/script/GDPR.js
@@ -103,6 +103,8 @@ function toggleGDPRInfoText(obj){
 function previewGDPRExport(type){
 	
 	var ank_id = $("input[name=anketa]").val();
+
+    $('#fullscreen').addClass("divPopUp");
 	
 	$('#fullscreen').html('').fadeIn('slow').draggable({
         delay: 100
diff --git a/lang/1.php b/lang/1.php
index ca861f417..ce3a7f6a6 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -8038,7 +8038,9 @@ $lang = array (
 	'srv_gdpr' => "GDPR",
 	'srv_gdpr_settings' => "GDPR nastavitve",
 	'srv_gdpr_general_settings' => "Splošne GDPR nastavitve",
-	'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!",
+	'srv_gdpr_general_settings_handling' => "GDPR - Ravnanje s podatki",
+	'srv_gdpr_general_settings_warninga' => "<span class=\"red\">Opozorilo!</span> Prosimo izpolnite osebne podatke GDPR profila na ",
+	'srv_gdpr_general_settings_warningb' => "tej povezavi",
 	'srv_gdpr_user_settings' 		=> "Splošne nastavitve",
 	'srv_gdpr_user_settings_title' 	=> "Splošne GDPR nastavitve",
 	'srv_gdpr_user_settings_desc1' 	=> "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.",
@@ -8127,6 +8129,7 @@ $lang = array (
 	'srv_gdpr_survey_gdpr_phone' 	=> "Telefon",
 	'srv_gdpr_survey_gdpr_web' 		=> "Spletni identifikator",
 	'srv_gdpr_survey_gdpr_other' 	        => "Drugi identifikatorji",
+	'srv_gdpr_survey_gdpr_other_textA' 	        => "Drugi identifikatorji, ki jih boste zbirali",
 	'srv_gdpr_survey_gdpr_other_text' 	    => "Navedite",
 	'srv_gdpr_survey_gdpr_other_info'       => "Dodatne informacije",
 	'srv_gdpr_survey_gdpr_expire' 	        => "Čas hranjenja podatkov",
@@ -8194,7 +8197,7 @@ $lang = array (
 	'srv_gdpr_survey_gdpr_1ka_template_preview' => "Predogled GDPR uvoda",
 	'srv_gdpr_survey_gdpr_1ka_template_warning' => "V primeru, da ne uporabite privzete predloge za obveščanje respondentov o zbiranju osebnih podatkov, morate za to poskrbeti sami!",
 	'srv_gdpr_survey_gdpr_about' 		=> "Podrobnosti o zbiranju osebnih podatkov",
-	'srv_gdpr_survey_gdpr_about_note' 		=> "Podrobnosti o zbiranju osebnih podatkov so prilagojene glede na vaše GDPR nastavitve profila in ankete.<br><br>Po potrebi prilagodite besedilo tako, da spremenite nastavitve spodaj oziroma v vašem GDPR profilu.",
+	'srv_gdpr_survey_gdpr_about_note' 		=> "Podrobnosti o zbiranju osebnih podatkov so prilagojene glede na vaše GDPR nastavitve profila in ankete. Po potrebi prilagodite besedilo tako, da spremenite nastavitve spodaj oziroma v vašem GDPR profilu.",
     
     'srv_gdpr_survey_gdpr_about_text1_1'	=> "OSEBNI PODATKI",
 	'srv_gdpr_survey_gdpr_about_text1_2'	=> "Osebni podatki se nanašajo na katero koli informacijo v zvezi z določenim ali določljivim posameznikom (respondentom). Določljiv posameznik je tisti, ki ga je mogoče neposredno ali posredno določiti, zlasti z navedbo identifikatorja kot je: npr. ime, telefon, identifikacijska številka, podatki o lokaciji, spletni identifikatorji, kot so elektronski naslov, prijavni podatki za spletne strani in gesla.",
diff --git a/lang/2.php b/lang/2.php
index 27c2645bf..bf7d5de50 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7923,7 +7923,9 @@ $lang = array (
 	'srv_gdpr' 							=> "GDPR",
 	'srv_gdpr_settings' 				=> "GDPR settings",
 	'srv_gdpr_general_settings' 		=> "General GDPR settings",
-	'srv_gdpr_general_settings_warning' => "Please fill in your personal data in your GDPR profile!",
+	'srv_gdpr_general_settings_handling' => "GDPR - Data handling",
+	'srv_gdpr_general_settings_warninga' => "<span class=\"red\">Warning!</span>Please fill in your personal data in your GDPR profile ",
+	'srv_gdpr_general_settings_warningb' => "here",
 	'srv_gdpr_user_settings' 			=> "General settings",
 	'srv_gdpr_user_settings_title' 		=> "General GDPR settings",
 	'srv_gdpr_user_settings_desc1' 		=> "Since May 25th, 2018, a new regulation on the protection of personal data (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>) is in force. New regulation also defines the method of collecting data and provides options for respondents, such as deletion, insight and modifying collected personal and/or survey data.",
@@ -8012,6 +8014,7 @@ $lang = array (
 	'srv_gdpr_survey_gdpr_phone' 	=> "Telephone",
 	'srv_gdpr_survey_gdpr_web' 		=> "Web identifier",
     'srv_gdpr_survey_gdpr_other' 	=> "Other identifiers",
+	'srv_gdpr_survey_gdpr_other_textA' 	        => "Other identifiers which you will be collecting",
     'srv_gdpr_survey_gdpr_other_text' 	    => "Please specify",
 	'srv_gdpr_survey_gdpr_other_info'       => "Additional info",
 	'srv_gdpr_survey_gdpr_expire' 	        => "Data storage time",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index c38ad5202..e0b80af4b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -23240,19 +23240,107 @@ div.prevajanje_holder .section.jezik_vprasanja .jezik_row.page {
   margin-bottom: 4px;
   margin-top: 20px;
 }
-fieldset#gdpr_anketa .setting_holder.horizontal {
+fieldset#gdpr_anketa .setting_holder {
+  margin-bottom: 0;
+  display: flex;
+  align-items: flex-end;
+  width: fit-content;
+}
+fieldset#gdpr_anketa .setting_holder .fold {
+  display: flex;
+  flex-direction: row;
+  height: 100%;
+  align-items: center;
+  width: fit-content;
+  margin-top: 8px;
+}
+fieldset#gdpr_anketa .setting_holder .fold .setting_title {
+  margin-right: 16px;
+  white-space: nowrap;
+}
+fieldset#gdpr_anketa .setting_holder .fold .setting_item {
+  margin-top: 0;
+  white-space: nowrap;
+}
+fieldset#gdpr_anketa #gdpr_data_identifiers {
+  margin: 16px 0 8px 0;
+}
+fieldset#gdpr_anketa #gdpr_data_identifiers #other_text textarea {
+  width: 533px;
+  height: 100px;
+}
+fieldset#gdpr_anketa #gdpr_data_settings textarea#about {
+  width: 100%;
+  height: 200px;
+}
+
+fieldset#gdpr_additional_info .setting_holder .setting_item .text_follow {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-top: 4px;
+}
+fieldset#gdpr_additional_info .setting_holder .setting_item .text_follow input {
+  margin: 0 4px 0 0;
+}
+fieldset#gdpr_additional_info .setting_holder .setting_item .text_follow input:disabled {
+  background-color: #E5E5E5;
+}
+fieldset#gdpr_additional_info .setting_holder .setting_item.indent {
+  margin-left: 28px;
+}
+fieldset#gdpr_additional_info .setting_holder.indent {
+  margin-left: 28px;
+}
+fieldset#gdpr_additional_info .setting_holder span.indent {
+  margin-left: 28px;
+}
+
+#gdpr_bottom_wrap {
+  display: flex;
+  flex-direction: row;
+  gap: 32px;
+}
+#gdpr_bottom_wrap #gdpr_bottom_wrap_left,
+#gdpr_bottom_wrap #gdpr_bottom_wrap_right {
+  width: 50%;
+}
+
+fieldset#gdpr_export_individual,
+fieldset#gdpr_export_activity {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+fieldset#gdpr_export_individual span.lang,
+fieldset#gdpr_export_activity span.lang {
+  margin-top: 16px;
+}
+fieldset#gdpr_export_individual a.lang,
+fieldset#gdpr_export_activity a.lang {
+  margin-top: 8px;
+  width: fit-content;
+}
+
+#preview_gdpr_export {
+  height: auto;
+  max-height: 700px;
+  overflow: auto;
+}
+
+fieldset#email_streznik_anketa .setting_holder.horizontal {
   display: flex;
   flex-direction: row;
   gap: 16px;
 }
-fieldset#gdpr_anketa .setting_holder.horizontal .setting_holder {
+fieldset#email_streznik_anketa .setting_holder.horizontal .setting_holder {
   margin-bottom: 0;
   display: flex;
 }
-fieldset#gdpr_anketa .setting_holder.horizontal .setting_holder .large {
+fieldset#email_streznik_anketa .setting_holder.horizontal .setting_holder .large {
   width: 300px;
 }
-fieldset#gdpr_anketa .setting_holder.horizontal .setting_holder .fold {
+fieldset#email_streznik_anketa .setting_holder.horizontal .setting_holder .fold {
   display: flex;
   flex-direction: row;
   height: 100%;
diff --git a/resources/sass/admin_new/pages/survey_edit/email_streznik_anketa.scss b/resources/sass/admin_new/pages/survey_edit/email_streznik_anketa.scss
new file mode 100644
index 000000000..f00d653be
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_edit/email_streznik_anketa.scss
@@ -0,0 +1,29 @@
+fieldset#email_streznik_anketa {
+    
+    .setting_holder {
+
+        &.horizontal {
+            display: flex;
+            flex-direction: row;
+            gap: 16px;
+
+            .setting_holder {
+                margin-bottom: 0;
+                display: flex;
+
+                .large {
+                    width: 300px;
+                }
+
+                .fold {
+                    display: flex;
+                    flex-direction: row;
+                    height: 100%;
+                    align-items: center;
+                    width: 300px;
+                }
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_edit/gdpr_anketa.scss b/resources/sass/admin_new/pages/survey_edit/gdpr_anketa.scss
index 7c23f1a81..15a4b04f6 100644
--- a/resources/sass/admin_new/pages/survey_edit/gdpr_anketa.scss
+++ b/resources/sass/admin_new/pages/survey_edit/gdpr_anketa.scss
@@ -1,29 +1,122 @@
 fieldset#gdpr_anketa {
-    
-    .setting_holder {
 
-        &.horizontal {
+    .setting_holder {
+        margin-bottom: 0;
+        display: flex;
+        align-items: flex-end;
+        width: fit-content;
+
+        .fold {
             display: flex;
             flex-direction: row;
-            gap: 16px;
+            height: 100%;
+            align-items: center;
+            width: fit-content;
 
-            .setting_holder {
-                margin-bottom: 0;
+            .setting_title {
+                margin-right: 16px;
+                white-space: nowrap;
+            }
+
+            .setting_item {
+                margin-top: 0;
+                white-space: nowrap;
+            }
+
+            margin-top: 8px;
+        }
+    }
+
+    #gdpr_data_identifiers {
+        margin: 16px 0 8px 0;
+
+        #other_text {
+            textarea {
+                width: 533px;
+                height: 100px;
+            }
+        }
+    }
+
+    #gdpr_data_settings {
+
+        textarea {
+            
+            &#about {
+                width: 100%;
+                height: 200px;
+            }
+        }
+    }
+
+}
+
+fieldset#gdpr_additional_info {
+
+    .setting_holder {
+        .setting_item {
+            .text_follow {
                 display: flex;
+                flex-direction: row;
+                align-items: center;
+                margin-top: 4px;
 
-                .large {
-                    width: 300px;
-                }
+                input {
+                    margin: 0 4px 0 0;
 
-                .fold {
-                    display: flex;
-                    flex-direction: row;
-                    height: 100%;
-                    align-items: center;
-                    width: 300px;
+                    &:disabled {
+                        background-color: $gray;
+                    }
                 }
             }
+
+            &.indent {
+                margin-left: 28px;
+            }
         }
 
+        &.indent {
+            margin-left: 28px;
+        }
+
+        span.indent {
+            margin-left: 28px;
+        }
     }
+}
+
+#gdpr_bottom_wrap  {
+    display: flex;
+    flex-direction: row;
+    gap: 32px;
+
+    #gdpr_bottom_wrap_left,
+    #gdpr_bottom_wrap_right {
+        width: 50%;
+    }
+}
+
+fieldset#gdpr_export_individual,
+fieldset#gdpr_export_activity {
+
+    height: 100%;
+
+    display: flex;
+    flex-direction: column;
+
+    span.lang {
+        margin-top: 16px;
+    }
+
+    a.lang {
+        margin-top: 8px;
+        width: fit-content;
+    }
+
+}
+
+#preview_gdpr_export {        
+	height: auto;
+	max-height: 700px;
+    overflow: auto;
 }
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_edit/survey_edit.scss b/resources/sass/admin_new/pages/survey_edit/survey_edit.scss
index c712fe45f..22203e5a6 100644
--- a/resources/sass/admin_new/pages/survey_edit/survey_edit.scss
+++ b/resources/sass/admin_new/pages/survey_edit/survey_edit.scss
@@ -26,3 +26,4 @@
 @import "jezik";
 
 @import "gdpr_anketa";
+@import "email_streznik_anketa";