diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 5146e583a..1bc7afd9f 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -408,17 +408,17 @@ class SurveyAdmin
         echo '<div id="branching" style="display:none"></div>';
 
         // fullscreen urejanje spremenljivke
-        echo '<div id="fullscreen"  class="'.($_GET['a'] == A_ANALYSIS ? ' analiza' : '') . ($_GET['a'] == 'telephone' || $_GET['a'] == 'invitations' || $_GET['m'] == 'anal_arch' || $_GET['a'] == 'analysis' ? ' divPopUp PopUpNarrow' : '').'"></div>';
+        echo '<div id="fullscreen"  class="'.($_GET['a'] == A_ANALYSIS ? ' analiza' : '').'"></div>';
 
         // fullscreen urejanje vprasanja
         echo '<div id="vprasanje" class="divPopUp"></div>';
 
         // popup za urejanje vrednosti
-        echo '<div id="vrednost_edit" class="divPopUp PopUpAuto"></div>';
+        echo '<div id="vrednost_edit" class="divPopUp"></div>';
 
 
         // Generičen popup
-        echo '<div id="general_popup" class="divPopUp PopUpNarrow"></div>';
+        echo '<div id="general_popup" class="divPopUp"></div>';
 
         // Knjiznica popup
         echo '<div id="library_popup" class="divPopUp"></div>';
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 4364492bb..3511c22fd 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -349,13 +349,13 @@ class SurveyAdminSettings {
 			echo '<div class="setting_holder">';
 			echo '<span class="seting_title">'.$lang['srv_opozorilo_vprasanja'].Help::display('srv_splosnenas_opozorilo').':</span>';
 			echo '<div class="setting_item">';
-			echo '<a class="noline" href="#" onClick="popupAlertAll(\'no\')"><span class="faicon minus_circle link-right"></span>'.$lang['srv_no_reminder_all'].'</a>';
+			echo '<span class="blue pointer" onClick="popupAlertAll(\'no\')"><span class="faicon minus_circle link-right"></span>'.$lang['srv_no_reminder_all'].'</span>';
 			echo '</div>';
 			echo '<div class="setting_item">';
-			echo '<a class="noline" href="#" onClick="popupAlertAll(\'soft\')"><span class="faicon link-right fa-stack"><span class="faicon circle empty fa-stack-1x"></span> <span class="faicon plus small fa-stack-1x"></span></span>'.$lang['srv_soft_reminder_all'].'</a>';
+			echo '<span class="blue pointer" onClick="popupAlertAll(\'soft\')"><span class="faicon link-right fa-stack"><span class="faicon circle empty fa-stack-1x"></span> <span class="faicon plus small fa-stack-1x"></span></span>'.$lang['srv_soft_reminder_all'].'</span>';
 			echo '</div>';
 			echo '<div class="setting_item">';
-			echo '<a class="noline" href="#" onClick="popupAlertAll(\'hard\')"><span class="faicon plus_circle link-right"></span>'.$lang['srv_hard_reminder_all'].'</a>';
+			echo '<span class="blue pointer" onClick="popupAlertAll(\'hard\')"><span class="faicon plus_circle link-right"></span>'.$lang['srv_hard_reminder_all'].'</span>';
 			echo '</div>';
 			
 			echo '</div>';
@@ -10723,7 +10723,7 @@ class SurveyAdminSettings {
 			}
 		}		
 		
-		// če imamo napake jo izpišemo
+		/*// če imamo napake jo izpišemo
 		if ($error == true){
 			echo $lang['srv_mail_test_smtp_error'].': '. $msg;
 		}
@@ -10746,7 +10746,7 @@ class SurveyAdminSettings {
 		$button->setCaption($lang['srv_zapri'])->setTitle($lang['srv_zapri']);
 		$popUp->addButton($button);
 	
-		echo $popUp;	
+		echo $popUp;	*/ //@TG8
 	}
 }
 ?>
\ No newline at end of file
diff --git a/admin/survey/classes/class.SurveyTimeProfiles.php b/admin/survey/classes/class.SurveyTimeProfiles.php
index 613d5ee16..e57a46775 100644
--- a/admin/survey/classes/class.SurveyTimeProfiles.php
+++ b/admin/survey/classes/class.SurveyTimeProfiles.php
@@ -441,15 +441,15 @@ class SurveyTimeProfiles {
 		
 		echo '<div class="button_holder">';
 		if ($current_pid == 0) {
-			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
+			echo '<button class="medium white-black" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
 			echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'].'" onclick="timeProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
 		} 
         else if ($current_pid == -1) {
-			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
+			echo '<button class="medium white-black" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
 			echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'].'" onclick="timeProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
 		} 
         else  {
-			echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
+			echo '<button class="medium white-black" title="'.$lang['srv_close_profile'].'" onclick="timeProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
 			echo '<button class="medium white-blue" title="'.$lang['srv_run_as_session_profile'].'" onclick="timeProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
 			echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'].'" onclick="timeProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
 			
@@ -472,7 +472,7 @@ class SurveyTimeProfiles {
 		echo '</div>';
 
 		echo '<div class="button_holder">';
-        echo '<button class="medium white-blue" onClick="timeProfileAction(\'cancel_create\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium white-black" onClick="timeProfileAction(\'cancel_create\'); return false;">'.$lang['srv_close_profile'].'</button>';             
         echo '<button class="medium blue" onclick="timeProfileAction(\'do_create\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
         echo '</div>';
 
@@ -491,7 +491,7 @@ class SurveyTimeProfiles {
 		echo '</div>';
 
 		echo '<div class="button_holder">';
-        echo '<button class="medium white-blue" onClick="timeProfileAction(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium white-black" onClick="timeProfileAction(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';             
         echo '<button class="medium blue" onclick="timeProfileAction(\'do_rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
         echo '</div>';
 
@@ -503,7 +503,7 @@ class SurveyTimeProfiles {
         echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
 
 		echo '<div class="button_holder">';
-        echo '<button class="medium white-blue" onClick="timeProfileAction(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium white-black" onClick="timeProfileAction(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';             
         echo '<button class="medium blue" onclick="timeProfileAction(\'do_delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
         echo '</div>';
 
diff --git a/admin/survey/classes/class.SurveyUrlLinks.php b/admin/survey/classes/class.SurveyUrlLinks.php
index a9b8b9b19..64ddedf0b 100644
--- a/admin/survey/classes/class.SurveyUrlLinks.php
+++ b/admin/survey/classes/class.SurveyUrlLinks.php
@@ -57,6 +57,7 @@ class SurveyUrlLinks
 		$podstran = $_REQUEST['podstran'];
 		$m = $_REQUEST['m'];
 		
+		//@TG9
 		$popUp = new PopUp();
 		$popUp->setId('div_survey_links');
 		$popUp->setHeaderText($lang['srv_public_link_title'].':');
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
index a4f4509f0..8ef0d20a5 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
@@ -475,7 +475,7 @@ class SurveyAnalysisArchive {
 	static function EmailArchive($aid) {
 		global $lang;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n";
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
@@ -541,7 +541,7 @@ class SurveyAnalysisArchive {
 	static function SendEmailArchive($aid = null, $subject, $text, $emails) {
 		global $lang, $site_url, $site_path, $global_user_id;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n";
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
@@ -658,7 +658,7 @@ class SurveyAnalysisArchive {
 	static function EditArchive($aid) {
 		global $lang, $site_url, $site_path, $global_user_id;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n";
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
@@ -670,31 +670,53 @@ class SurveyAnalysisArchive {
 			$s = sisplet_query("SELECT *, UNIX_TIMESTAMP(duration) as duration_d FROM srv_analysis_archive WHERE id='".$aid."' AND sid='".self::$sid."'");			
 			$row = mysqli_fetch_assoc($s);
 
-			echo $lang['srv_analiza_arhiviraj_ime'];
-	        echo ':&nbsp;<input id="newAnalysisArchiveName" name="newAnalysisArchiveName" type="text" size="60"  value="'.$row['name'].'"/>'."\n";
 
-	        echo '<br class="clr" />';
-			echo '<div>';
-			echo $lang['srv_analiza_archive_note'].':';
-			echo '<textarea name="newAnalysisArchiveNote" id="newAnalysisArchiveNote" style="height:50px; width:100%">'.$row['note'].'</textarea>';
-			echo '</div>';
-			echo '<div>';
-			// dostop
-			echo '<div class="floatLeft">';
-			echo $lang['srv_analiza_archive_access'].':';
-			echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="0"'.((int)$row['access'] == 0 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_all'];
-			echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="1"'.((int)$row['access'] == 1 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_admins'];
-                        echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="2"'.((int)$row['access'] == 2 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_password'];
-                        echo '<br/><div id="newAnalysisArchiveAccessPasswordDiv" style="visibility: '.((int)$row['access'] == 2 ? 'visible' : 'hidden').';">'.$lang['srv_analiza_archive_access_password_label'].'<input type="text" name="newAnalysisArchiveAccessPassword" id="newAnalysisArchiveAccessPassword" maxlength="25"  value="'.$row['access_password'].'"/>';
-                        echo '</div></div>';
-                        
-			echo '<div class="floatLeft anl_w110"  >&nbsp;</div>';
-			// trajanje
-			echo '<div class="floatLeft">';
-			echo $lang['srv_analiza_archive_duration'].':';
-			echo '<br/>';
-			echo '<input id="newAnalysisArchiveDuration" type="text" name="newAnalysisArchiveDuration" value="' . date('d.m.Y',$row['duration_d']) . '" disabled/>
-				<span class="faicon calendar_icon icon-as_link" id="duration_img"></span>
+			echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_analiza_arhiviraj_ime'].':</span>';
+        echo '<input id="newAnalysisArchiveName" class="text large" name="newAnalysisArchiveName" type="text" value="'.$row['name'].'"/>';
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_note'].':</span>';
+		echo '<textarea class="textarea" name="newAnalysisArchiveNote" id="newAnalysisArchiveNote">'.$row['note'].'</textarea>';
+		echo '</div>';
+
+		echo '<div class="alaysis_archive_wrap">';
+		// dostop
+		echo '<div class="alaysis_archive_left">';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_access'].':</span>';
+
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="newAnalysisArchiveAccess0" name="newAnalysisArchiveAccess" value="0" '.((int)$row['access'] == 0 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>';
+		echo '<label for="newAnalysisArchiveAccess0">'.$lang['srv_analiza_archive_access_all'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="newAnalysisArchiveAccess1" name="newAnalysisArchiveAccess" value="1" '.((int)$row['access'] == 1 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>';
+		echo '<label for="newAnalysisArchiveAccess1">'.$lang['srv_analiza_archive_access_admins'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="newAnalysisArchiveAccess2" name="newAnalysisArchiveAccess" value="2" '.((int)$row['access'] == 2 ? ' checked="true"' : '').' onchange="toggleAnalysisArchiveAccessPassword();"/>';
+		echo '<label for="newAnalysisArchiveAccess2">'.$lang['srv_analiza_archive_access_password'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item indent" id="newAnalysisArchiveAccessPasswordDiv">';
+		echo $lang['srv_analiza_archive_access_password_label'].':';
+		echo '<input type="text" class="text large" name="newAnalysisArchiveAccessPassword" id="newAnalysisArchiveAccessPassword" maxlength="25" />';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>'; //left
+
+		// trajanje
+		echo '<div class="alaysis_archive_right">';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_analiza_archive_duration'].':</span>';
+
+		echo '<div class="setting_item">';
+		echo '<input id="newAnalysisArchiveDuration" class="text medium" type="text" name="newAnalysisArchiveDuration" value="' . date('d.m.Y',$row['duration_d']) . '" readonly/>';
+		echo '<span class="faicon calendar_icon blue pointer" id="duration_img"></span>
 				<script type="text/javascript">
 					Calendar.setup({
 						inputField  : "newAnalysisArchiveDuration",
@@ -704,14 +726,20 @@ class SurveyAnalysisArchive {
 					});
 				</script>
 				';
-			
-			echo '</div>';
-			echo '<div class="clr"></div>';
-			echo '</div>';
+		echo '</div>';
+		
+		echo '</div>';
+
+
+		echo '</div>'; //right
+		
+		echo '</div>'; //wrap
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-black" title="'.$lang['srv_analiza_arhiviraj_cancle'].'" onClick="cancleArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';              
+        echo '<button class="medium blue" title="'.$lang['srv_analiza_arhiviraj_create'].'" onclick="saveArchiveAnaliza(\''.$aid.'\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
+		echo '</div>';
 
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_save'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="saveArchiveAnaliza(\''.$aid.'\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>'."\n";			
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
-			echo '<br class="clr" />';
 		} else {
 			self::DisplayError($CAE);
 		}
@@ -1002,7 +1030,7 @@ class SurveyAnalysisArchive {
 	static function AskDeleteArchive($aid) {
 		global $lang;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
+        echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n";
         
 		$CAE = self::CheckArchiveExistance($aid);
   
diff --git a/admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php b/admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php
index 21c06601e..066944be2 100644
--- a/admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php
+++ b/admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php
@@ -392,7 +392,7 @@ class Hierarhija {
 			echo '</div>';
 
 			// popup za urejanje vrednosti
-			echo '<div id="vrednost_edit" class="divPopUp PopUpAuto">';
+			echo '<div id="vrednost_edit" class="divPopUp">';
 			echo '</div>';
 
 			// fade pri fullscreen urejanje spremenljivke
diff --git a/admin/survey/script/inspect.js b/admin/survey/script/inspect.js
index b361210ce..1cb4a7778 100644
--- a/admin/survey/script/inspect.js
+++ b/admin/survey/script/inspect.js
@@ -6,7 +6,7 @@ function inspect_init() {
 		//});
 		
 		$('#fullscreen').html('').fadeIn('slow');
-		$("#fullscreen").load('ajax.php?t=inspect&a=show_inspectListSpr', {anketa : srv_meta_anketa_id}).addClass('z-index200');
+		$("#fullscreen").load('ajax.php?t=inspect&a=show_inspectListSpr', {anketa : srv_meta_anketa_id}).addClass('z-index200').addClass('popupShadow');
 	});
 	
 	$("#dsp_inspect_cancel").live('click', function(event) {
diff --git a/admin/survey/script/invitations.js b/admin/survey/script/invitations.js
index 799d23425..c3e36f972 100644
--- a/admin/survey/script/invitations.js
+++ b/admin/survey/script/invitations.js
@@ -1628,7 +1628,7 @@ function noEmailingType(value){
 function smtpAAIPopupShow(){
 	
     $('#fade').fadeTo('slow', 1);
-	$('#general_popup').html('').fadeIn('slow');
+	$('#general_popup').html('').addClass('PopUpNarrow').fadeIn('slow');
 	$("#general_popup").load('ajax.php?t=invitations&a=showAAISmtpPopup', {anketa: srv_meta_anketa_id, noNavi:'true'});
 }
 function smtpAAIPopupClose(){
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 171778812..bbca03920 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -4475,8 +4475,8 @@ function testiranje_preview_settings_save () {
 function showTestSurveySMTP()
 {
 	$('#fade').fadeTo('slow', 1);
-	$('#fullscreen').html('').fadeIn('slow');
-	$("#fullscreen").load('ajax.php?t=showTestSurveySMTP', $('form[name="settingsanketa_'+srv_meta_anketa_id+'"]').serialize(), function() {});
+	$('#general_popup').html('').fadeIn('slow');
+	$("#general_popup").load('ajax.php?t=showTestSurveySMTP', $('form[name="settingsanketa_'+srv_meta_anketa_id+'"]').serialize(), function() {});
     
     return false;
 }
@@ -5490,27 +5490,31 @@ function removeUploadFromData(usr_id, spr_id, code){
 function CopyToClipboard(copyText){
 	var temp_copy = $('<input>').val(copyText).appendTo('body').select()
 	document.execCommand('copy')
+	temp_copy.remove()
 }
 
 // Popup - opozorilo na vsa vprašanja
 function popupAlertAll(alert_type){
 
     $('#fade').fadeTo('slow', 1);
-    $('#general_popup').html('').fadeIn('slow');
+    $('#general_popup').html('').addClass('PopUpNarrow').fadeIn('slow');
     $("#general_popup").load('ajax.php?a=alert_all_popup', {alert_type:alert_type, anketa:srv_meta_anketa_id});
 }
 
 
 //Generičen alert popup
-function genericAlertPopup(name, optional_parameter){
+function genericAlertPopup(name, optional_parameter, class_string){
 
 	if (optional_parameter === undefined) {
 		optional_parameter = "";
 	}
-
+	if (class_string !== undefined) {
+		$('#general_popup').addClass(class_string);
+	}
     $('#fade').fadeTo('slow', 1);
     $('#general_popup').html('').fadeIn('slow');
     $("#general_popup").load('ajax.php?a=genericAlertPopup', {name:name, optional_parameter:optional_parameter});
+
 }
 
 //Toggle za prikaz nastavitev in opozoril v parapodatkih
diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js
index 6e4f0ad21..8bce3f416 100644
--- a/admin/survey/script/script_analiza.js
+++ b/admin/survey/script/script_analiza.js
@@ -825,10 +825,11 @@ function scrollToProfile(_target) {
 } 
 
 function cancleArchiveAnaliza() {
-	$('#fullscreen').hide();
+	$('#fullscreen').hide().removeClass('PopUpNarrow').removeClass('divPopUp');
 	$('#fade').fadeOut('slow');
 }
 function doArchiveAnaliza() {
+	$("#fullscreen").addClass('PopUpNarrow').addClass('divPopUp');
 	$("#fullscreen").load('ajax.php?a=doArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran}, function() {
 
 		$('#fade').fadeTo('slow', 1);
@@ -853,7 +854,7 @@ function submitArchiveAnaliza() {
 	
 }
 function closeArchiveAnaliza() {
-	$('#fullscreen').hide();
+	$('#fullscreen').hide().removeClass('PopUpNarrow').removeClass('divPopUp');
 	$('#fade').fadeOut('slow');
 }
 
diff --git a/admin/survey/script/telephone.js b/admin/survey/script/telephone.js
index c77603e3b..16e26b402 100644
--- a/admin/survey/script/telephone.js
+++ b/admin/survey/script/telephone.js
@@ -76,10 +76,10 @@ function phn_add_recipients() {
 			$elm.next().find('a').addClass('active');
 			$elm.removeClass('inv_ff_left_on').addClass('inv_ff_right_on').next().next().addClass('inv_ff_left_on');
 		} else {
-			genericAlertPopup('srv_invitation_note1');
+			genericAlertPopup('srv_invitation_note1',null,'PopUpNarrow');
 		}
 	} else {
-		genericAlertPopup('srv_invitation_note2');
+		genericAlertPopup('srv_invitation_note2',null,'PopUpNarrow');
 	}
 
 	return true;
@@ -208,13 +208,13 @@ function phnGetNewProfileName() {
 				$('#fullscreen').html('').fadeIn('slow');
 				$("#fullscreen").load('ajax.php?t=telephone&m=getProfileName', {anketa:srv_meta_anketa_id, recipients_list:recipients_list, fields:fields, noNavi:'true', pid:pid});
 			} else {
-				genericAlertPopup('srv_invitation_note1');
+				genericAlertPopup('srv_invitation_note1',null,'PopUpNarrow');
 			}
 		} else {
-			genericAlertPopup('srv_invitation_note2');
+			genericAlertPopup('srv_invitation_note2',null,'PopUpNarrow');
 		}
 	} else {
-		genericAlertPopup('alert_invalidPID');
+		genericAlertPopup('alert_invalidPID',null,'PopUpNarrow');
 	}
 }
 
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 39f8eeff7..8a98f0104 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -475,6 +475,7 @@ function vrednost_cancel () {
 function vrednost_fastadd (spremenljivka) {
 	
 	$('#fade').fadeTo('slow', 1);
+	$('#vrednost_edit').addClass('PopUpNarrow');
 	$('#vrednost_edit').show().load('ajax.php?t=vprasanje&a=vrednost_fastadd', {spremenljivka: spremenljivka, anketa: srv_meta_anketa_id});
 }
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8a4eaba83..470d22edf 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -7096,6 +7096,9 @@ a.help {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+.divPopUp .popup_main.no_border {
+  border-bottom: none;
+}
 .divPopUp .popup_main.with_menu {
   flex-direction: row;
 }
@@ -7621,6 +7624,9 @@ body.waitlong #loading {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#check_pogoji .popup_main.no_border {
+  border-bottom: none;
+}
 #check_pogoji .popup_main.with_menu {
   flex-direction: row;
 }
@@ -7799,6 +7805,9 @@ body.waitlong #loading {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#dropped_alert .popup_main.no_border {
+  border-bottom: none;
+}
 #dropped_alert .popup_main.with_menu {
   flex-direction: row;
 }
@@ -7986,6 +7995,9 @@ body.waitlong #loading {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#popup_user_access .popup_main.no_border {
+  border-bottom: none;
+}
 #popup_user_access .popup_main.with_menu {
   flex-direction: row;
 }
@@ -8384,6 +8396,10 @@ div#inspect_div .setting_holder .horizontal {
   flex-direction: row;
 }
 
+div.popupShadow {
+  box-shadow: 2px 2px 2px 2px #333333;
+}
+
 div#newMCTable .setting_holder input.text {
   width: 100% !important;
 }
@@ -18028,345 +18044,6 @@ and open the template in the editor.
   border-left: 1px #1E88E5 solid;
   border-radius: 1px 2px 2px 1px;
 }
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body {
-  max-height: 70vh;
-  overflow-y: auto;
-  margin: 32px 0 0 0;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row {
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  width: 100%;
-  margin-bottom: 8px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction {
-  padding-left: 22px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder {
-  cursor: pointer;
-  margin-right: 12px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before {
-  font-size: 20px;
-  color: #1E88E5;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder {
-  display: flex;
-  flex-grow: 1;
-  align-items: center;
-  justify-content: space-between;
-  padding: 32px 0;
-  font-size: 14px;
-  background-color: #FFFFFF;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label {
-  font-size: 14px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column {
-  display: flex;
-  align-items: baseline;
-  padding: 0 16px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket {
-  flex-direction: column;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons {
-  display: flex;
-  align-items: baseline;
-  justify-content: space-evenly;
-  width: 100%;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before {
-  font-size: 14px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before {
-  line-height: 22px;
-  color: #808080;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text {
-  font-size: 12px;
-  line-height: 15px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.variable,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.variable,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.variable {
-  flex-direction: column;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator {
-  flex-grow: 1;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek {
-  display: flex;
-  align-items: center;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a {
-  margin-right: 32px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator {
-  width: 50px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text] {
-  width: 100px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child {
-  margin-right: 0;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit {
-  margin-left: 8px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value {
-  display: flex;
-  flex-direction: column;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span {
-  display: flex;
-  margin-bottom: 8px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child {
-  margin-bottom: 0;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before {
-  color: #777777;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before {
-  color: #1E88E5;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder {
-  margin-left: 12px;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before {
-  font-size: 16px;
-  color: #1E88E5;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row select,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row select,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row select {
-  margin: 0;
-  width: auto;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text],
-#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text],
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text] {
-  margin: 0;
-  width: auto;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .div_condition_bottom,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .div_condition_bottom,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .div_condition_bottom {
-  margin: 4px 0 0 22px;
-  font-size: 14px;
-  font-weight: 400;
-}
-#branching li.if.if_editing .if_content #div_condition_editing_inner .div_condition_bottom.loop_bottom,
-#branching li.block.if_editing .if_content #div_condition_editing_inner .div_condition_bottom.loop_bottom,
-#branching li.loop.if_editing .if_content #div_condition_editing_inner .div_condition_bottom.loop_bottom {
-  margin: 12px 0 0 0;
-}
 #branching li.endif:hover,
 #branching li.endblock:hover,
 #branching li.endloop:hover,
@@ -18690,6 +18367,182 @@ and open the template in the editor.
   border-top: 1px solid #1E88E5;
 }
 
+#div_condition_editing_inner .condition_editing_body {
+  max-height: 70vh;
+  overflow-y: auto;
+  margin: 32px 0 0 0;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row {
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  width: 100%;
+  margin-bottom: 8px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction {
+  padding-left: 22px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder {
+  cursor: pointer;
+  margin-right: 12px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before {
+  font-size: 20px;
+  color: #1E88E5;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder {
+  display: flex;
+  flex-grow: 1;
+  align-items: center;
+  justify-content: space-between;
+  padding: 32px 0;
+  font-size: 14px;
+  background-color: #FFFFFF;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label {
+  font-size: 14px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column {
+  display: flex;
+  align-items: baseline;
+  padding: 0 16px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket {
+  flex-direction: column;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-evenly;
+  width: 100%;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before {
+  font-size: 14px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before {
+  line-height: 22px;
+  color: #808080;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text {
+  font-size: 12px;
+  line-height: 15px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.variable {
+  flex-direction: column;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator {
+  flex-grow: 1;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek {
+  display: flex;
+  align-items: center;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a {
+  margin-right: 32px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator {
+  width: 50px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text] {
+  width: 100px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child {
+  margin-right: 0;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit {
+  margin-left: 8px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value {
+  display: flex;
+  flex-direction: column;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span {
+  display: flex;
+  margin-bottom: 8px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child {
+  margin-bottom: 0;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before {
+  color: #777777;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before {
+  color: #1E88E5;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder {
+  margin-left: 12px;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before {
+  font-size: 16px;
+  color: #1E88E5;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row select {
+  margin: 0;
+  width: auto;
+}
+#div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text] {
+  margin: 0;
+  width: auto;
+}
+#div_condition_editing_inner .div_condition_bottom {
+  margin: 4px 0 0 22px;
+  font-size: 14px;
+  font-weight: 400;
+}
+#div_condition_editing_inner .div_condition_bottom.loop_bottom {
+  margin: 12px 0 0 0;
+}
+
 /*
     Knjiznica v urejanju ankete
 */
@@ -19769,6 +19622,9 @@ div#theme-edit-wrap div#theme-editor #picker .popup_main {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+div#theme-edit-wrap div#theme-editor #picker .popup_main.no_border {
+  border-bottom: none;
+}
 div#theme-edit-wrap div#theme-editor #picker .popup_main.with_menu {
   flex-direction: row;
 }
@@ -20125,6 +19981,9 @@ span.faicon.st-besede-popup {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#vrednost_edit .popup_main.no_border {
+  border-bottom: none;
+}
 #vrednost_edit .popup_main.with_menu {
   flex-direction: row;
 }
@@ -20318,6 +20177,9 @@ span.faicon.st-besede-popup {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#calculation .popup_main.no_border {
+  border-bottom: none;
+}
 #calculation .popup_main.with_menu {
   flex-direction: row;
 }
@@ -20565,6 +20427,9 @@ and open the template in the editor.
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#preview_spremenljivka .popup_main.no_border {
+  border-bottom: none;
+}
 #preview_spremenljivka .popup_main.with_menu {
   flex-direction: row;
 }
@@ -21525,6 +21390,9 @@ dl.arch_email dd {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#inv_view_arch_recipients .popup_main.no_border {
+  border-bottom: none;
+}
 #inv_view_arch_recipients .popup_main.with_menu {
   flex-direction: row;
 }
@@ -24270,6 +24138,9 @@ div.subpage_coding .coding-refresh .popup_main {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+div.subpage_coding .coding-refresh .popup_main.no_border {
+  border-bottom: none;
+}
 div.subpage_coding .coding-refresh .popup_main.with_menu {
   flex-direction: row;
 }
@@ -24449,6 +24320,9 @@ div.subpage_coding #coding .popup_main {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+div.subpage_coding #coding .popup_main.no_border {
+  border-bottom: none;
+}
 div.subpage_coding #coding .popup_main.with_menu {
   flex-direction: row;
 }
@@ -24770,6 +24644,9 @@ div.subpage_coding .floatRecodeSpremenljivka .popup_main {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+div.subpage_coding .floatRecodeSpremenljivka .popup_main.no_border {
+  border-bottom: none;
+}
 div.subpage_coding .floatRecodeSpremenljivka .popup_main.with_menu {
   flex-direction: row;
 }
@@ -25607,6 +25484,9 @@ and open the template in the editor.
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#div_export_setting_show .popup_main.no_border {
+  border-bottom: none;
+}
 #div_export_setting_show .popup_main.with_menu {
   flex-direction: row;
 }
@@ -28430,6 +28310,9 @@ ul.vrednost_sort input[type=text] {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+.subpage_analysis_creport #anketa_custom_report #newCReportProfile .popup_main.no_border {
+  border-bottom: none;
+}
 .subpage_analysis_creport #anketa_custom_report #newCReportProfile .popup_main.with_menu {
   flex-direction: row;
 }
@@ -28726,6 +28609,9 @@ and open the template in the editor.
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#dsp_inspect_cover .popup_main.no_border {
+  border-bottom: none;
+}
 #dsp_inspect_cover .popup_main.with_menu {
   flex-direction: row;
 }
@@ -29250,6 +29136,9 @@ input#endDate {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+.mc_table_settings .popup_main.no_border {
+  border-bottom: none;
+}
 .mc_table_settings .popup_main.with_menu {
   flex-direction: row;
 }
@@ -29458,6 +29347,9 @@ input#endDate {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#newMCTable .popup_main.no_border {
+  border-bottom: none;
+}
 #newMCTable .popup_main.with_menu {
   flex-direction: row;
 }
@@ -29642,6 +29534,9 @@ input#endDate {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#renameMCTable .popup_main.no_border {
+  border-bottom: none;
+}
 #renameMCTable .popup_main.with_menu {
   flex-direction: row;
 }
@@ -29826,6 +29721,9 @@ input#endDate {
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
+#deleteMCTable .popup_main.no_border {
+  border-bottom: none;
+}
 #deleteMCTable .popup_main.with_menu {
   flex-direction: row;
 }
diff --git a/resources/sass/admin_new/components/popup/basic.scss b/resources/sass/admin_new/components/popup/basic.scss
index 13a82960a..93e4b8b10 100644
--- a/resources/sass/admin_new/components/popup/basic.scss
+++ b/resources/sass/admin_new/components/popup/basic.scss
@@ -134,6 +134,10 @@
 
         border-bottom: 1px $dark-gray solid;
 
+        &.no_border {
+            border-bottom: none;
+        }
+
         &.with_menu{
             flex-direction: row;
         }
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 5e44231a9..58123ea92 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -349,6 +349,11 @@ div#inspect_div {
         }
     }
 }
+
+div.popupShadow {
+    box-shadow: 2px 2px 2px 2px $black;
+}
+
 //Multitabele
 div#newMCTable {
     .setting_holder {
diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss
index 520aa9a04..2191bd20b 100644
--- a/resources/sass/admin_new/pages/survey_edit/conditions.scss
+++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss
@@ -105,187 +105,6 @@ and open the template in the editor.
             border: 1px #CCE4F9 solid;
             border-left: 1px $blue solid;
             border-radius: 1px 2px 2px 1px;
-
-            #div_condition_editing_inner {
-
-                .condition_editing_preview {
-
-                }
-            
-                .condition_editing_body{
-                    max-height: 70vh;
-                    overflow-y: auto;
-            
-                    margin: 32px 0 0 0;            
-            
-                    .condition_editing_row{
-                        display: flex;
-                        align-items: center;
-
-                        box-sizing: border-box;
-                        width: 100%;
-                        margin-bottom: 8px;
-
-                        &.conjunction{
-                            padding-left: 22px;
-                        }
-                            
-                        .move_holder{
-                            cursor: pointer;
-
-                            margin-right: 12px;
-
-                            .faicon:before{
-                                font-size: 20px;
-                                color: $blue;
-                            }
-                        }
-
-                        .white_holder{
-                            display: flex;
-                            flex-grow: 1;
-                            align-items: center;
-                            justify-content: space-between;
-
-                            padding: 32px 0;
-
-                            font-size: 14px;
-
-                            background-color: $white;
-
-                            span,
-                            label{
-                                font-size: 14px;
-                            }
-
-                            .column{
-                                display: flex;
-                                align-items: baseline;
-
-                                padding: 0 16px;
-
-                                &.bracket{
-                                    flex-direction: column;
-
-                                    .bracket_icons{
-                                        display: flex;
-                                        align-items: baseline;
-                                        justify-content: space-evenly;
-
-                                        width: 100%;
-
-                                        .faicon{
-
-                                            &:before{
-                                                font-size: 14px;
-                                            }
-    
-                                            &.icon-grey_normal:before{
-                                                line-height: 22px;
-                                                color: $very-dark-gray2;
-                                            }
-                                        }
-                                    }
-
-                                    .bracket_text{
-                                        font-size: 12px;
-                                        line-height: 15px;
-                                    }
-                                }
-
-                                &.variable{
-                                    flex-direction: column;
-                                }
-
-                                &.operator{
-                                    flex-grow: 1;
-
-                                    .fill_vrednost,
-                                    .ostanek{
-                                        display: flex;
-                                        align-items: center;
-
-                                        input,
-                                        select,
-                                        a{
-                                            margin-right: 32px;
-
-                                            &.operator{
-                                                width: 50px;
-                                            }
-
-                                            &[type="text"]{
-                                                width: 100px;
-                                            }
-
-                                            &:last-child{
-                                                margin-right: 0;
-                                            }
-
-                                            .faicon.edit{
-                                                margin-left: 8px;
-                                            }
-                                        }
-
-                                        .edit_fill_value,
-                                        .preview_fill_value{
-                                            display: flex;
-                                            flex-direction: column;
-
-                                            label,
-                                            span{
-                                                display: flex;
-                                                margin-bottom: 8px;
-
-                                                &:last-child{
-                                                    margin-bottom: 0;
-                                                }
-                                            }
-
-                                            input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio::before {
-                                                color: $very-dark-gray;
-                                            }
-                                            input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio::before {
-                                                color: $blue;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        .delete_holder{
-                            margin-left: 12px;
-
-                            .faicon:before{
-                                font-size: 16px;
-                                color: $blue;
-                            }
-                        }
-
-                        select{
-                            margin: 0;
-                            width: auto;
-                        }
-
-                        input[type="text"]{
-                            margin: 0;
-                            width: auto;
-                        }
-                    }
-                }
-
-                .div_condition_bottom {
-                    margin: 4px 0 0 22px;
-
-                    font-size: 14px;
-                    font-weight: 400;
-
-                    &.loop_bottom{
-                        margin: 12px 0 0 0;
-                    }
-                }
-            }
         }
     }
 
@@ -700,4 +519,186 @@ and open the template in the editor.
         border-top: 1px solid $blue;
     }
 
+}
+
+//IF - vsebina pogoja
+#div_condition_editing_inner {
+
+    .condition_editing_preview {
+
+    }
+
+    .condition_editing_body{
+        max-height: 70vh;
+        overflow-y: auto;
+
+        margin: 32px 0 0 0;            
+
+        .condition_editing_row{
+            display: flex;
+            align-items: center;
+
+            box-sizing: border-box;
+            width: 100%;
+            margin-bottom: 8px;
+
+            &.conjunction{
+                padding-left: 22px;
+            }
+                
+            .move_holder{
+                cursor: pointer;
+
+                margin-right: 12px;
+
+                .faicon:before{
+                    font-size: 20px;
+                    color: $blue;
+                }
+            }
+
+            .white_holder{
+                display: flex;
+                flex-grow: 1;
+                align-items: center;
+                justify-content: space-between;
+
+                padding: 32px 0;
+
+                font-size: 14px;
+
+                background-color: $white;
+
+                span,
+                label{
+                    font-size: 14px;
+                }
+
+                .column{
+                    display: flex;
+                    align-items: baseline;
+
+                    padding: 0 16px;
+
+                    &.bracket{
+                        flex-direction: column;
+
+                        .bracket_icons{
+                            display: flex;
+                            align-items: baseline;
+                            justify-content: space-evenly;
+
+                            width: 100%;
+
+                            .faicon{
+
+                                &:before{
+                                    font-size: 14px;
+                                }
+
+                                &.icon-grey_normal:before{
+                                    line-height: 22px;
+                                    color: $very-dark-gray2;
+                                }
+                            }
+                        }
+
+                        .bracket_text{
+                            font-size: 12px;
+                            line-height: 15px;
+                        }
+                    }
+
+                    &.variable{
+                        flex-direction: column;
+                    }
+
+                    &.operator{
+                        flex-grow: 1;
+
+                        .fill_vrednost,
+                        .ostanek{
+                            display: flex;
+                            align-items: center;
+
+                            input,
+                            select,
+                            a{
+                                margin-right: 32px;
+
+                                &.operator{
+                                    width: 50px;
+                                }
+
+                                &[type="text"]{
+                                    width: 100px;
+                                }
+
+                                &:last-child{
+                                    margin-right: 0;
+                                }
+
+                                .faicon.edit{
+                                    margin-left: 8px;
+                                }
+                            }
+
+                            .edit_fill_value,
+                            .preview_fill_value{
+                                display: flex;
+                                flex-direction: column;
+
+                                label,
+                                span{
+                                    display: flex;
+                                    margin-bottom: 8px;
+
+                                    &:last-child{
+                                        margin-bottom: 0;
+                                    }
+                                }
+
+                                input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio::before {
+                                    color: $very-dark-gray;
+                                }
+                                input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio::before {
+                                    color: $blue;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            .delete_holder{
+                margin-left: 12px;
+
+                .faicon:before{
+                    font-size: 16px;
+                    color: $blue;
+                }
+            }
+
+            select{
+                margin: 0;
+                width: auto;
+            }
+
+            input[type="text"]{
+                margin: 0;
+                width: auto;
+            }
+        }
+    }
+
+    .div_condition_bottom {
+        margin: 4px 0 0 22px;
+
+        font-size: 14px;
+        font-weight: 400;
+
+        &.loop_bottom{
+            margin: 12px 0 0 0;
+        }
+    }
 }
\ No newline at end of file