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/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');
 }