diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
index c8d35b87d..3a1d51d39 100644
--- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
+++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
@@ -5550,23 +5550,29 @@ class SurveyInvitationsNew {
 		$mid = (int)$_POST['mid'];
 
 		echo '<div id="inv_recipients_profile_name">';
-		echo $lang['srv_inv_message_rename_new_name'].'&nbsp;';
+
+		echo '<h2>'.$lang['message'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;">✕</a></div>';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_inv_message_rename_new_name'].'</span>';
+		echo '<input type="text" class="text medium" id="inv_message_profile_name" value="'.$naslov.'" tabindex="1" autofocus="autofocus">';
+		echo '</div>';
 
 		# polovimo vsa sporočila
 		$sql_string = "SELECT naslov, comment FROM srv_invitations_messages WHERE ank_id = '$this->sid' AND id = '$mid'";
 		list($naslov, $comment) = mysqli_fetch_row(sisplet_query($sql_string));
 
-		echo '<input type="text" id="inv_message_profile_name" value="'.$naslov.'" tabindex="1" autofocus="autofocus">';
-		echo '<br/><br/>';
-		echo $lang['srv_inv_message_draft_list_comment'];
-		echo '<textarea id="inv_message_comment" tabindex="3" rows="2" style="width:200px;">'.($comment).'</textarea>';
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_inv_message_draft_list_comment'].'</span>';
+		echo '<textarea id="inv_message_comment" tabindex="3">'.($comment).'</textarea>';
+		echo '</div>';
 
-			
-		echo '<br class="clr" /><br class="clr" />';
-		echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['save'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="invMessageRename(); return false;"><span>'.$lang['save'].'</span></a></span>';
-		echo '<span class="buttonwrapper floatRight spaceRight"  title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;" ><span>'.$lang['srv_cancel'].'</span></a></span>';
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;">'.$lang['srv_cancel'].'</button>';              
+        echo '<button class="medium blue" onclick="invMessageRename(); return false;">'.$lang['save'].'</button>';
+        echo '</div>';
 
-		echo '<br class="clr" />';
 		echo '</div>';
 	}
 
@@ -8732,6 +8738,9 @@ class SurveyInvitationsNew {
 	function invListEdit() {
 		global $lang,$site_url, $global_user_id;
 
+		echo '<h2>'.$lang['access'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;">✕</a></div>';
+
 		# polovimo podatke profila
 		$sql_string = "SELECT pid, name, comment, uid FROM srv_invitations_recipients_profiles WHERE pid='".$_POST['pid']."'";
 		$sql_query = sisplet_query($sql_string);
@@ -8754,10 +8763,12 @@ class SurveyInvitationsNew {
 		$this->displayListAccess($pid);
 		# skrita polja za respondente in polja
 		echo '<input id="profile_id" name="profile_id" type="hidden" value="'.($_POST['pid']).'" >';
-		echo '<br class="clr" /><br/>';
-		echo '<span class="buttonwrapper floatRight" title="'.$lang['save'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_list_edit_save(); return false;"><span>'.$lang['save'].'</span></a></span>';
-		echo '<span class="buttonwrapper floatRight spaceRight"  title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;" ><span>'.$lang['srv_cancel'].'</span></a></span>';
-		echo '<br class="clr" />';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;">'.$lang['srv_cancel'].'</button>';              
+        echo '<button class="medium blue" onclick="inv_list_edit_save(); return false;">'.$lang['save'].'</button>';
+        echo '</div>';
+
 		echo '</form>';
 		echo '</div>'; # id="inv_view_arch_recipients"
 		/*	echo '<script type="text/javascript">';
@@ -9055,9 +9066,8 @@ class SurveyInvitationsNew {
 
 			$_css_hidden = ($checked != '' ? '' : ' displayNone');
 			echo '<div id="div_for_uid_' . $row1['id'] . '" name="listAccess" class="floatLeft listAccess_uid'.$_css_hidden.'">';
-			echo '<label nowrap title="' . $row1['email'] . '"'.($uid == $row1['id']?' class="gray"':'').'>';
 			echo '<input type="checkbox" name="uid[]" value="' . $row1['id'] . '" id="uid_' . $row1['id'] . '"' . $checked .($uid == $row1['id'] ? ' disabled="disabled"' : ''). ' autocomplete="off"/>';
-			echo $row1['name'] . ($uid == $row1['id'] ? ' (' . $lang['author'] . ')' : '') . '</label>';
+			echo '<label nowrap title="' . $row1['email'] . '"'.($uid == $row1['id']?' class="gray"':'').'>'.$row1['name'] . ($uid == $row1['id'] ? ' (' . $lang['author'] . ')' : '') . '</label>';
 			echo '</div>';
 		}
 
diff --git a/admin/survey/script/invitations.js b/admin/survey/script/invitations.js
index 221b176c1..b2bc625db 100644
--- a/admin/survey/script/invitations.js
+++ b/admin/survey/script/invitations.js
@@ -19,6 +19,7 @@ function inv_delete_recipient() {
 }
 function editRecipient(inv_rid) {
 	$('#fade').fadeTo('slow', 1);
+	$('#fullscreen').addClass('divPopUp PopUpNarrow');
 	$('#fullscreen').html('').fadeIn('slow');
 	$("#fullscreen").load('ajax.php?t=invitations&a=edit_recipient', {anketa:srv_meta_anketa_id, inv_rid:inv_rid,noNavi:'true'});	
 }
@@ -530,6 +531,7 @@ function invShowMessageRename() {
 	// prikažemo popup za preimenovanje
 	var mid = $("#invitation_messages ol li.active").attr("mid");
 	$('#fade').fadeTo('slow', 1);
+	$('#fullscreen').addClass('divPopUp PopUpNarrow');
 	$('#fullscreen').html('').fadeIn('slow');
 	$("#fullscreen").load('ajax.php?t=invitations&a=show_message_rename', {anketa:srv_meta_anketa_id, noNavi:'true', mid:mid});
 }	
@@ -1289,6 +1291,7 @@ $("#inv_edit_rec_list table tr td").live('click', function(event) {
 */
 function inv_list_edit(pid) {
 	$('#fade').fadeTo('slow', 1);
+	$('#fullscreen').addClass('divPopUp PopUpNarrow');
 	$('#fullscreen').html('').fadeIn('slow');
 	$("#fullscreen").load('ajax.php?t=invitations&a=invListEdit', {anketa:srv_meta_anketa_id, pid:pid, noNavi:'true'});
 }
diff --git a/lang/1.php b/lang/1.php
index 24d6b4fb0..e7c3a623b 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5038,7 +5038,7 @@ $lang = array (
 	'srv_inv_list_no_recipients_filter' 		=> "Podatki so filtrirani \"%s\"",
 	'srv_inv_list_no_lists' 					=> "Ni seznamov!",
 	'srv_inv_list_access' 						=> "Dostop do seznama:",
-	'srv_inv_list_access_legend' 				=> "(Izberite uporabnike, kateri lahko uporabljajo seznam.)",
+	'srv_inv_list_access_legend' 				=> "(Izberite uporabnike, ki lahko uporabljajo seznam.)",
     'srv_inv_list_delete_multi'			        => "Ali resnično želite izbrisati izbrane sezname?",
 	'srv_inv_recipients_delete_multi'			=> "Ali resnično želite izbrisati izbrane respondente?",
 	'srv_inv_recipients_delete_all'				=> "Ali resnično želite izbrisati vse respondente?",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index dc488ffe7..74789e253 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8605,6 +8605,11 @@ div.edit_user_content {
   overflow: auto;
 }
 
+div#invListAccess {
+  max-height: 200px;
+  overflow: auto;
+}
+
 /* 
     Header scss - top line, menu...
 */
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 63311b798..7f780a405 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -873,4 +873,9 @@ div.user_settings {
 div.edit_user_content {
     max-height: 500px;
     overflow: auto;
+}
+
+div#invListAccess {
+    max-height: 200px;
+    overflow: auto;
 }
\ No newline at end of file