diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 84b27a23f..aa40427ec 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -718,7 +718,7 @@ class SurveyAdminSettings {
             
             // Shrani piskotek za X casa
 
-			echo '<div class="setting_holder">';
+			echo '<div class="setting_holder bottom8">';
             echo '<span class="setting_title">' . $lang['srv_cookie'] . Help :: display('srv_cookie') .':</span>';
 
 			echo '<div class="setting_item">';
@@ -739,7 +739,10 @@ class SurveyAdminSettings {
 			echo '</div>';
 			
 			echo '</div>';
+
             
+			echo '<div id="cookie_settings_wrap">';
+
             // Ko se uporabnik vrne (zacne od zacetka/nadaljuje kjer je ostal)
 
 			echo '<div class="setting_holder indent">';
@@ -771,9 +774,26 @@ class SurveyAdminSettings {
 			
 			echo '</div>';
 
+			// Ce ni sprejel piskotka lahko/ne more nadaljevati
+			echo '<div class="setting_holder bottom16 indent no-cookie">';
+            echo '<span class="setting title">' . $lang['srv_cookie_continue'] . Help :: display('srv_cookie_continue') . ':</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="cookie_continue" value="1" id="cookie_continue_1"' . ($row['cookie_continue'] == 1 ? ' checked="checked"' : '') . ' />';
+            echo '<label for="cookie_continue_1">' . $lang['srv_cookie_continue_yes'] . '</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="cookie_continue" value="0" id="cookie_continue_0"' . ($row['cookie_continue'] == 0 ? ' checked="checked"' : '') . ' />';
+            echo '<label for="cookie_continue_0">' . $lang['srv_cookie_continue_no'] . '</label>';
+			echo '</div>';
+			
+			echo '</div>';
+			
+			echo '</div>';
+
 			// Nikoli ne more popravljati svojih odgovorov (tudi ce se npr. vrne na prejsnjo stran)
 
-			echo '<div class="setting_holder indent">';
+			echo '<div class="setting_holder">';
             echo '<span class="setting_title" >' . $lang['srv_subsequent_answers'] . Help :: display('srv_subsequent_answers') . ':</span>';
 
 			echo '<div class="setting_item">';
@@ -786,24 +806,10 @@ class SurveyAdminSettings {
 			echo '</div>';
 			
 			echo '</div>';
-            
-            // Ce ni sprejel piskotka lahko/ne more nadaljevati
-			echo '<div class="setting_holder no-cookie">';
-            echo '<span class="nastavitveSpan3 bold">' . $lang['srv_cookie_continue'] . Help :: display('srv_cookie_continue') . ':</span>';
 
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="cookie_continue" value="1" id="cookie_continue_1"' . ($row['cookie_continue'] == 1 ? ' checked="checked"' : '') . ' />';
-            echo '<label for="cookie_continue_1">' . $lang['srv_cookie_continue_yes'] . '</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="cookie_continue" value="0" id="cookie_continue_0"' . ($row['cookie_continue'] == 0 ? ' checked="checked"' : '') . ' />';
-            echo '<label for="cookie_continue_0">' . $lang['srv_cookie_continue_no'] . '</label>';
-			echo '</div>';
-			
-			echo '</div>';
             
             // Prepoznaj respondenta
-			echo '<div class="setting_holder">';
+			echo '<div class="setting_holder" id="prepoznaj_respondenta">';
             echo '<span class="setting_title">' . $lang['srv_user'] . Help :: display('srv_user_from_cms') . ':</span>';
 
 			echo '<div class="setting_item">';
@@ -823,7 +829,7 @@ class SurveyAdminSettings {
             
             // Ob izpolnjevanju prikazi email
 			echo '<div class="setting_holder" id="cms_email">';
-            echo '<span class="setting title">' . $lang['srv_user_cms_show'] . Help :: display('srv_user_from_cms_email') . ':</span>';
+            echo '<span class="setting title">' . $lang['srv_user_cms_show'] . ':</span>';
 
 			echo '<div class="setting_item">';
 			echo '<input type="checkbox" name="user_from_cms_email" value="1" id="user_1_email"' . ($row['user_from_cms_email'] == 1 ? ' checked="checked"' : '') . ' '.($row['user_from_cms']>0?'':' disabled="true" ').'/>';
@@ -837,12 +843,10 @@ class SurveyAdminSettings {
             // Masovno vnasanje - modul Vnos
             echo '<fieldset id="vnos_modul"><legend>'.$lang['srv_vrsta_survey_type_5'].'</legend>';
 
-            echo '<div class="setting_holder">';
-			echo '<p>'.$lang['srv_vnos_navodila'].'</p>';
-			echo '</div>';
-
+			echo '<p class="bottom16">'.$lang['srv_vnos_navodila'].'</p>';
+			
 			echo '<div class="setting_holder">';
-            echo '<span class="setting_title">' . $lang['srv_mass_input']. Help :: display('srv_mass_insert') . ':</span>';
+            echo '<span class="setting_title">' . $lang['srv_mass_input'] . ':</span>';
 
 			echo '<div class="setting_item">';
 			echo '<input type="radio" name="mass_insert" value="1" id="mass_insert_1"' . ($row['mass_insert'] == 1 ? ' checked="checked"' : '') . ' />';
@@ -862,7 +866,7 @@ class SurveyAdminSettings {
                 
                 function checkcookie () {
 
-                    if ($('input[name=cookie]:checked').val() == '-1' && $('input[name=user_from_cms]:checked').val() == '0' && <?echo $row['user_base'];?> != 1 && <?echo $isMaza;?> != 1) {
+                    /**if ($('input[name=cookie]:checked').val() == '-1' && $('input[name=user_from_cms]:checked').val() == '0' && <?echo $row['user_base'];?> != 1 && <?echo $isMaza;?> != 1) {
                         $('input[name=cookie_return]').attr('disabled', true);
                         $('input[name=return_finished]').attr('disabled', true);
                         $('.no-cookie').css('visibility', 'hidden');
@@ -871,27 +875,38 @@ class SurveyAdminSettings {
                         $('input[name=cookie_return]').attr('disabled', false);
                         $('input[name=return_finished]').attr('disabled', false);
                         $('.no-cookie').css('visibility', 'visible');
+                    }**/
+
+					if ($('input[name=cookie]:checked').val() == '-1') {
+						$('#cookie_settings_wrap').addClass('displayNone');
+                    } 
+                    else {
+						$('#cookie_settings_wrap').removeClass('displayNone');
+
                     }
                     
                     if ( $('input[name=cookie_return]:checked').val() == 1 ) {
-                        $('.no-cookie-return').css('visibility', 'hidden');
+                        $('.no-cookie-return').addClass('displayNone');
                     } 
                     else {
-                        $('.no-cookie-return').css('visibility', 'visible');
+                        $('.no-cookie-return').removeClass('displayNone');
                     }
                     
                     if ( $('input[name=user_from_cms]:checked').val() == 0 ) {
-                        $('#cms_email').css('visibility', 'hidden');
+                        $('#cms_email').addClass('displayNone');
+						$('#prepoznaj_respondenta').addClass('bottom0');
                     } 
                     else {
-                        $('#cms_email').css('visibility', 'visible');
+                        $('#cms_email').removeClass('displayNone');
+						$('#prepoznaj_respondenta').removeClass('bottom0');
+
                     }
                     
                     if ( $('input[name=user_from_cms]:checked').val() == 2 ) {
-                        $('#vnos_modul').show();
+                        $('#vnos_modul').removeClass('displayNone');
                     } 
                     else {
-                        $('#vnos_modul').hide();
+                        $('#vnos_modul').addClass('displayNone');
                     }
                 }
 
@@ -934,36 +949,33 @@ class SurveyAdminSettings {
             echo '<span class="setting_title">' . $lang['srv_block_ip'] . Help :: display('srv_block_ip') . ':</span>';
 
 			echo '<div class="setting_item">';
-			echo '<input type="radio" name="block_ip" value="0" id="block_ip_0"' . ($row['block_ip'] == 0 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').hide();" />';
+			echo '<input type="radio" name="block_ip" value="0" id="block_ip_0"' . ($row['block_ip'] == 0 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').addClass(\'displayNone\');" />';
             echo '<label for="block_ip_0">' . $lang['no1'] . '</label>';
 			echo '</div>';
 			echo '<div class="setting_item">';
-			echo '<input type="radio" name="block_ip" value="10" id="block_ip_10"' . ($row['block_ip'] == 10 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').show();" />';
+			echo '<input type="radio" name="block_ip" value="10" id="block_ip_10"' . ($row['block_ip'] == 10 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').removeClass(\'displayNone\');" />';
             echo '<label for="block_ip_10">10 min</label>';
 			echo '</div>';
 			echo '<div class="setting_item">';
-			echo '<input type="radio" name="block_ip" value="20" id="block_ip_20"' . ($row['block_ip'] == 20 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').show();" />';
+			echo '<input type="radio" name="block_ip" value="20" id="block_ip_20"' . ($row['block_ip'] == 20 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').removeClass(\'displayNone\');" />';
             echo '<label for="block_ip_20">20 min</label>';
 			echo '</div>';
 			echo '<div class="setting_item">';
-			echo '<input type="radio" name="block_ip" value="60" id="block_ip_60"' . ($row['block_ip'] == 60 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').show();" />';
+			echo '<input type="radio" name="block_ip" value="60" id="block_ip_60"' . ($row['block_ip'] == 60 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').removeClass(\'displayNone\');" />';
             echo '<label for="block_ip_60">60 min</label>';
 			echo '</div>';
 			echo '<div class="setting_item">';
-			echo '<input type="radio" name="block_ip" value="720" id="block_ip_720"' . ($row['block_ip'] == 720 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').show();" />';
+			echo '<input type="radio" name="block_ip" value="720" id="block_ip_720"' . ($row['block_ip'] == 720 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').removeClass(\'displayNone\');" />';
             echo '<label for="block_ip_720">12 '.$lang['hour_hours2'].'</label>';
 			echo '</div>';
 			echo '<div class="setting_item">';
-			echo '<input type="radio" name="block_ip" value="1440" id="block_ip_1440"' . ($row['block_ip'] == 1440 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').show();" />';
+			echo '<input type="radio" name="block_ip" value="1440" id="block_ip_1440"' . ($row['block_ip'] == 1440 ? ' checked="checked"' : '') . ' onChange="$(\'#block_ip_warning\').removeClass(\'displayNone\');" />';
             echo '<label for="block_ip_1440">24 '.$lang['hour_hours2'].'</label>';
 			echo '</div>';
 			
 			echo '</div>';
 
-			echo '<div class="setting_holder">';
-            echo '<span id="block_ip_warning" class="red" '.($row['block_ip'] == 0 ? ' display:none;' : '').'">'.$lang['srv_block_ip_warning'].'</span>';
-			echo '</div>';
-
+            echo '<p id="block_ip_warning" class="top16 red '.($row['block_ip'] == 0 ? ' displayNone' : '').'">'.$lang['srv_block_ip_warning'].'</p>';
 
             echo '</fieldset>';
             
@@ -1000,24 +1012,39 @@ class SurveyAdminSettings {
                 echo '</script>';
                 
                 // dodajanje gesel za anketo
-                if($spr_id > 0){
-                    $vrednosti = $ss->getVrednosti($spr_id);
-                    if($vrednosti != 0){
-                        foreach($vrednosti as $vrednost){
-                            echo '<p>';
-                            echo '<strong>'.$vrednost['naslov'].'</strong><span class="faicon delete_circle icon-orange_link spaceLeft" style="margin-bottom:1px;" onclick="delete_skupina(\'2\', \''.$vrednost['id'].'\');"></span>';
-                            echo '</p>';
-                        }
-                    }
-                }
 
+				echo '<div class="setting_holder">';
+				echo '<label for="skupina">'.$lang['group_name'].':</label>';
 				echo '<div class="button_holder inline">';
 				echo '<input type="text" class="large" name="skupina" autocomplete="off" onKeyUp="add_skupina_enter(\'2\', event);" />';
-				echo '<button class="medium blue" nclick="add_skupina(\'2\');">'.$lang['add'].'</button>';
+				echo '<button class="medium blue" onclick="add_skupina(\'2\');">'.$lang['add'].'</button>';
+				echo '</div>';
 				echo '</div>';
 
-				echo '<a href="#" onClick="display_add_passwords_mass();">'.$lang['srv_password_add_mass'].'</a>';
+				echo '<table id="passwords_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
 
+					echo '<tr>';
+					echo '<th></th>';
+					echo '<th>'.$lang['password'].'</th>';
+					echo '</tr>';
+
+					if($spr_id > 0){
+						$vrednosti = $ss->getVrednosti($spr_id);
+						if($vrednosti != 0){
+							foreach($vrednosti as $vrednost){
+								echo '<tr>';
+								echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\'2\', \''.$vrednost['id'].'\');"></span></a></td>';
+								echo '<td>'.$vrednost['naslov'].'</td>';
+								echo '</tr>';
+							}
+						}
+					}
+
+				echo '</table>';
+
+				echo '<div class="setting_holder">';
+				echo '<a class="noline" href="#" onClick="display_add_passwords_mass();"><span class="faicon clipboard empty link-right"></span>'.$lang['srv_password_add_mass'].'</a>';
+				echo '</div>';
 
                 echo '</div>';
             }
diff --git a/admin/survey/script/skupine.js b/admin/survey/script/skupine.js
index 3048de8ba..85417bfb6 100644
--- a/admin/survey/script/skupine.js
+++ b/admin/survey/script/skupine.js
@@ -8,6 +8,10 @@ function add_skupina(skupine){
 		$('#groups_table').removeClass('displayNone');
 		$('#groups_table tr:last').after(response);
 		$('input[name=skupina]').val('').focus();
+
+		$('#passwords_table').removeClass('displayNone');
+		$('#passwords_table tr:last').after(response);
+		$('input[name=skupina]').val('').focus();
 	});
 }
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 1b9d5d3dd..f1a6cc6f2 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5875,6 +5875,10 @@ span.faicon.calendar_icon::before {
   content: "\f073";
 }
 
+span.faicon.clipboard::before {
+  content: "\f328";
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index 215752a86..226ad67c9 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -592,3 +592,8 @@ span.faicon.minus_circle::before{
 span.faicon.calendar_icon::before{
         content: "\f073";
 }
+
+//clipboard
+span.faicon.clipboard::before{
+        content: "\f328";
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/basic/layout.scss b/resources/sass/admin_new/basic/layout.scss
index 88b745290..5de8c434e 100644
--- a/resources/sass/admin_new/basic/layout.scss
+++ b/resources/sass/admin_new/basic/layout.scss
@@ -60,7 +60,6 @@ body{
                 flex-direction: column;
                 margin: 0 auto;
                 max-width: 1060px;
-
             }
         }