diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index f43f30f86..df7fd2404 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -5861,71 +5861,109 @@ class SurveyAdminAjax {
 		
 		echo '<form name="testiranje_preview_settings" action="#" method="get">';
 		echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">';
-        
-        // Nastavitve komentarjev - preverimo ce so na voljo v paketu
+
+		echo '<div id="testiranje_preview_settings">';
+		echo '<div class="testiranje_preview_settings_left">';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title semi-bold">'.$lang['srv_preview_defaults'].':</span>';
+
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" '.($preview_disableif==1?' checked':'').' name="disableif" id="disableif"/>';
+		echo '<label for="disableif">'.$lang['srv_disableif'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" '.($preview_disablealert==1?' checked':'').' name="disablealert" id="disablealert"/>';
+		echo '<label for="disablealert">'.$lang['srv_disablealert'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" '.($preview_displayifs==1?' checked':'').' name="displayifs" id="displayifs"/>';
+		echo '<label for="displayifs">'.$lang['srv_displayifs'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" value="1" '.($preview_displayvariables==1?' checked':'').' name="displayvariables" id="displayvariables"/>';
+		echo '<label for="displayvariables">'.$lang['srv_displayvariables'].'</label>';
+		echo '</div>';
+
+		// Nastavitve komentarjev - preverimo ce so na voljo v paketu
         if($userAccess->checkUserAccess($what='question_type_location')){
-            echo '<div style="float: right; width: 260px">';
-            
-            echo '<p style="margin-top:0">'.$lang['srv_testiranje_komentarji'].': ';
-            echo '<input type="radio" name="question_resp_comment" value="0" id="question_resp_comment_0" ' . ($question_resp_comment == 0 ? ' checked' : '') . ' onclick="testiranje_settings();"><label for="question_resp_comment_0">' . $lang['no'] . '</label> ';
+			echo '<div class="setting_item">';
+		    echo '<input type="checkbox" value="1" '.($preview_hidecomment==1?' checked':'').' name="hidecomment" id="hidecomment"/>';
+            echo '<label for="hidecomment">'.$lang['srv_preview_comments2'].'</label>';
+			echo '</div>';
+        }
+
+		echo '</div>';
+
+		
+		
+		echo '</div>'; #testiranje_preview_settings_left
+		echo '<div class="testiranje_preview_settings_right">';
+
+		// Nastavitve komentarjev - preverimo ce so na voljo v paketu
+        if($userAccess->checkUserAccess($what='question_type_location')){
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title semi-bold">'.$lang['srv_testiranje_komentarji'].':</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="question_resp_comment" value="0" id="question_resp_comment_0" ' . ($question_resp_comment == 0 ? ' checked' : '') . ' onclick="testiranje_settings();"><label for="question_resp_comment_0">' . $lang['no'] . '</label> ';
             echo '<input type="radio" name="question_resp_comment" value="1" id="question_resp_comment_1" ' . ($question_resp_comment == 1 ? ' checked' : '') . ' onclick="testiranje_settings();"><label for="question_resp_comment_1">' . $lang['yes'] . '</label> ';
-            echo '</p>';
-            echo '<p class="question_resp_comment">'.$lang['srv_comments_show_open'].': <br />';
-            echo '<input type="radio" name="question_resp_comment_show_open" value="" id="question_resp_comment_show_open_0" ' . ($question_resp_comment_show_open == 0 ? ' checked' : '') . '/><label for="question_resp_comment_show_open_0">' . $lang['forma_settings_open'] . '</label> ';
+			echo '</div>';
+						
+			echo '</div>';
+
+
+			echo '<div class="setting_holder question_resp_comment">';
+			echo '<span class="setting_title">'.$lang['srv_comments_show_open'].':</span>';
+			
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="question_resp_comment_show_open" value="" id="question_resp_comment_show_open_0" ' . ($question_resp_comment_show_open == 0 ? ' checked' : '') . '/><label for="question_resp_comment_show_open_0">' . $lang['forma_settings_open'] . '</label> ';
             echo '<input type="radio" name="question_resp_comment_show_open" value="1" id="question_resp_comment_show_open_1" ' . ($question_resp_comment_show_open == 1 ? ' checked' : '') . '/><label for="question_resp_comment_show_open_1">' . $lang['forma_settings_closed'] . '</label> ';
-            echo '</p><p class="question_resp_comment">';
-            echo '' . $lang['srv_q_inicialke'] . ': <br />';
-            echo '<input type="radio" name="question_resp_comment_inicialke" value="0" id="question_resp_comment_inicialke_0" ' . ($question_resp_comment_inicialke == 0 ? ' checked' : '') . ' onclick="testiranje_settings();"><label for="question_resp_comment_inicialke_0">' . $lang['no'] . '</label> ';
+			echo '</div>';
+						
+			echo '</div>';
+
+			echo '<div class="setting_holder question_resp_comment">';
+			echo '<span class="setting_title">'.$lang['srv_q_inicialke'].':</span>';
+			
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="question_resp_comment_inicialke" value="0" id="question_resp_comment_inicialke_0" ' . ($question_resp_comment_inicialke == 0 ? ' checked' : '') . ' onclick="testiranje_settings();"><label for="question_resp_comment_inicialke_0">' . $lang['no'] . '</label> ';
             echo '<input type="radio" name="question_resp_comment_inicialke" value="1" id="question_resp_comment_inicialke_1" ' . ($question_resp_comment_inicialke == 1 ? ' checked' : '') . ' onclick="testiranje_settings();"><label for="question_resp_comment_inicialke_1">' . $lang['yes'] . '</label> ';
-            echo '</p>';
-            echo '<p class="question_resp_comment question_resp_comment_inicialke">' . $lang['srv_q_inicialke_alert'] . ': <br />';
-            echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="0" id="question_resp_comment_inicialke_alert_0" ' . ($question_resp_comment_inicialke_alert == 0 ? ' checked' : '') . '/><label for="question_resp_comment_inicialke_alert_0">' . $lang['srv_reminder_off2'] . '</label><br> ';
-            echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="1" id="question_resp_comment_inicialke_alert_1" ' . ($question_resp_comment_inicialke_alert == 1 ? ' checked' : '') . '/><label for="question_resp_comment_inicialke_alert_1">' . $lang['srv_reminder_soft2'] . '</label><br> ';
-            echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="2" id="question_resp_comment_inicialke_alert_2" ' . ($question_resp_comment_inicialke_alert == 2 ? ' checked' : '') . '/><label for="question_resp_comment_inicialke_alert_2">' . $lang['srv_reminder_hard2'] . '</label> ';
-            echo  '</p>';
-            echo '<p><a href="index.php?anketa='.$this->anketa.'&a=urejanje&advanced_expanded=1">('.$lang['srv_details_settings'].')</a></p>';
-            
-            echo '</div>';          
+			echo '</div>';
+						
+			echo '</div>';
+
+            echo '<div class="setting_holder question_resp_comment question_resp_comment_inicialke">';
+			echo '<span class="setting_title">'.$lang['srv_q_inicialke_alert'].':</span>';
+			
+			echo '<div class="setting_item">';
+            echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="0" id="question_resp_comment_inicialke_alert_0" ' . ($question_resp_comment_inicialke_alert == 0 ? ' checked' : '') . '/><label for="question_resp_comment_inicialke_alert_0">' . $lang['srv_reminder_off2'] . '</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+            echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="1" id="question_resp_comment_inicialke_alert_1" ' . ($question_resp_comment_inicialke_alert == 1 ? ' checked' : '') . '/><label for="question_resp_comment_inicialke_alert_1">' . $lang['srv_reminder_soft2'] . '</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+            echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="2" id="question_resp_comment_inicialke_alert_2" ' . ($question_resp_comment_inicialke_alert == 2 ? ' checked' : '') . '/><label for="question_resp_comment_inicialke_alert_2">' . $lang['srv_reminder_hard2'] . '</label>';
+			echo '</div>';
+						
+			echo '</div>';
+           
+            echo '<p class="top16"><a href="index.php?anketa='.$this->anketa.'&a=urejanje&advanced_expanded=1">'.$lang['srv_details_settings'].'</a></p>';
             
             ?><script>
                 testiranje_settings();
             </script><?		    
         }
-		
-		echo '<h3>'.$lang['srv_preview_defaults'].'</h3>';
-		
-		echo '<p><label for="disableif"><input type="checkbox" value="1" '.($preview_disableif==1?' checked':'').' name="disableif" id="disableif">';
-        echo ' '.$lang['srv_disableif'].'</label></p>';
-        
-		echo '<p><label for="disablealert"><input type="checkbox" value="1" '.($preview_disablealert==1?' checked':'').' name="disablealert" id="disablealert">';
-        echo ' '.$lang['srv_disablealert'].'</label></p>';
-        
-		echo '<p><label for="displayifs"><input type="checkbox" value="1" '.($preview_displayifs==1?' checked':'').' name="displayifs" id="displayifs">';
-        echo ' '.$lang['srv_displayifs'].'</label></p>';
-        
-		echo '<p><label for="displayvariables"><input type="checkbox" value="1" '.($preview_displayvariables==1?' checked':'').' name="displayvariables" id="displayvariables">';
-        echo ' '.$lang['srv_displayvariables'].'</label></p>';	
-            
-        // Nastavitve komentarjev - preverimo ce so na voljo v paketu
-        if($userAccess->checkUserAccess($what='question_type_location')){
-		    echo '<p><label for="hidecomment"><input type="checkbox" value="1" '.($preview_hidecomment==1?' checked':'').' name="hidecomment" id="hidecomment">';
-            echo ' '.$lang['srv_preview_comments2'].'</label></p>';
-        }
-		
-		echo '<div style="clear:both;"></div>';
 
-		echo '<div class="buttonwrapper floatRight">
-                <a class="ovalbutton ovalbutton_orange btn_savesettings" onclick="testiranje_preview_settings_save(); return false;" href="#">
-                <span>'.$lang['edit1337'].'</span>
-                </a>
-                </div>
-                
-                <div class="buttonwrapper spaceRight floatRight">
-                <a class="ovalbutton ovalbutton_gray btn_savesettings" onclick="$(\'#vrednost_edit\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;" href="#" style="margin-left:10px">
-                <span>'.$lang['srv_cancel'].'</span>
-                </a>
-                </div>';		
-		
+		echo '</div>'; #testiranje_preview_settings_right
+		echo '</div>'; #testiranje_preview_settings
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="$(\'#vrednost_edit\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_cancel'].'</button>';              
+        echo '<button class="medium blue" onclick="testiranje_preview_settings_save(); return false;">'.$lang['edit1337'].'</button>';
+        echo '</div>';
+
 		echo '</form>';
 	}
 	
diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index 214360000..2dd33483e 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -176,12 +176,12 @@ class SurveyDiagnostics
 		echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
 		echo '</div>';
 
-		/*Nastavitve testnega vnosa - popup	
-		echo ' - <a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'"><span class="sprites settings"></span> '.$lang['srv_uredniske_nastavitve'].'</a>';
+		//Nastavitve testnega vnosa - popup	
+		echo '<p class="top16"><a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'">'.$lang['srv_uredniske_nastavitve'].'</a></p>';
 		
 		if ( isset($_GET['popup']) && $_GET['popup'] == 'open' ) {
 			?><script> $(function() { $('#popup-open').click(); }); </script><?php
-		}*/
+		}
 
 		// DIAGNOSTIKA
 
diff --git a/lang/1.php b/lang/1.php
index 10f6cbdfb..8a9d3f2af 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6566,7 +6566,7 @@ $lang = array (
 	'srv_users_add_assigned_max_2'			    =>  'uporabnikom.',
 	"srv_users_add_assigned_title"				=>	'Ustvarite novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
 	"srv_users_assigned_title"				    =>	'Uporabniki nad katerimi imate pregled',
-	'srv_uredniske_nastavitve'					=>	'Uredniške nastavitve',
+	'srv_uredniske_nastavitve'					=>	'Uredniške nastavitve testiranja',
 	'srv_q_inicialke'							=>	'Respondenti naj vnesejo tudi svoje inicialke',
 	'srv_q_inicialke_alert'						=>	'Opozorilo za inicialke',
 	'srv_enter_inicialke'						=>	'Prosimo, vnesite še vaše inicialke (zgoraj desno)',
diff --git a/lang/2.php b/lang/2.php
index 52cf94178..6ed5113f6 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6455,7 +6455,7 @@ $lang = array (
 	'srv_users_add_assigned_max_2'			    =>  'users.',
     "srv_users_add_assigned_title"				=>	'Create new user you will have overview on<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span></span>',
     "srv_users_assigned_title"				    =>	'Your assigned users',
-    'srv_uredniske_nastavitve'					=>	'Editor settings',
+    'srv_uredniske_nastavitve'					=>	'Editor settings for testing',
 	'srv_q_inicialke'							=>	'Respondents should enter their initials',
 	'srv_enter_inicialke'						=>	'Please enter your initials',
 	"srv_enter_inicialke2"						=>	"You haven\'t enter your initials. Do you want to continue?",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 46e287564..8a4eaba83 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8329,6 +8329,20 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
   visibility: hidden;
 }
 
+div#testiranje_preview_settings {
+  display: flex;
+  flex-direction: row;
+  gap: 64px;
+}
+div#testiranje_preview_settings .testiranje_preview_settings_left,
+div#testiranje_preview_settings .testiranje_preview_settings_right {
+  width: fit-content;
+}
+div#testiranje_preview_settings .testiranje_preview_settings_left .setting_holder,
+div#testiranje_preview_settings .testiranje_preview_settings_right .setting_holder {
+  width: fit-content;
+}
+
 #div_survey_links {
   min-width: 600px;
   width: auto;
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 55b2d603f..5e44231a9 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -257,6 +257,23 @@ div#div_analiza_archive_name {
 	visibility: hidden;
 }
 
+//Diagnostika
+div#testiranje_preview_settings {
+    display: flex;
+    flex-direction: row;
+
+    gap: 64px;
+
+    .testiranje_preview_settings_left,
+    .testiranje_preview_settings_right {
+        width: fit-content;
+
+        .setting_holder {
+            width: fit-content;
+        }
+    }
+}
+
 
 /////PODATKI/////
 //Javna povezava