diff --git a/admin/survey/Glasovanje.php b/admin/survey/Glasovanje.php
index 6314e7a8b..aab7be0ef 100644
--- a/admin/survey/Glasovanje.php
+++ b/admin/survey/Glasovanje.php
@@ -159,15 +159,11 @@ class Glasovanje {
 		echo '<span class="nastavitveSpan4" style="width: 140px;"><label>' . $lang['glasovanja_results_survey_title'] . ':</label></span>';
 		echo '<label><input type="radio" name="survey_hide_title" value="0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'survey_hide_title\')" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'>' . $lang['yes'] . '</label> ';
 		echo '<label><input type="radio" name="survey_hide_title" value="1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'survey_hide_title\')" '.($survey_hide_title == 1 ? ' checked="checked"' : '').'>' . $lang['no1'] . '</label><br />';
-		/*echo '<input type="radio" name="glasovanja_survey_title" value="0" id="glasovanja_survey_title_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'akronim\')" ' . ($rowA['akronim'] == ' ' ? ' checked' : '') . '/><label for="glasovanja_survey_title_0" class="pointer">' . $lang['no1'] . '</label> ';
-		echo '<input type="radio" name="glasovanja_survey_title" value="1" id="glasovanja_survey_title_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'akronim\')" ' . ($rowA['akronim'] == '' ? ' checked' : '') . '/><label for="glasovanja_survey_title_1" class="pointer">' . $lang['yes'] . '</label> ';
-		echo '<input type="radio" name="glasovanja_survey_title" value="2" id="glasovanja_survey_title_2" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'akronim\')" ' . ($rowA['akronim'] == $lang['poll'] ? ' checked' : '') . '/><label for="glasovanja_survey_title_2" class="pointer">"' . $lang['poll'] . '"</label><br /> ';*/
 		
 		//anketa v arhivu - prikaz arhiva
-		echo '<span class="nastavitveSpan4" style="width: 140px;"><label>' . $lang['glasovanja_results_archive'] . ':</label></span>';
+		echo '<span class="nastavitveSpan4" style="width: 140px;"><label>' . $lang['glasovanja_results_archive'] . ':</label>'. Help :: display('srv_glasovanje_archive').'</span>';
 		echo '<label for="stat_archive_1" class="pointer"><input type="radio" name="stat_archive" value="1" id="stat_archive_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_archive\')" ' . ($row2['stat_archive'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
 		echo '<label for="stat_archive_0" class="pointer"><input type="radio" name="stat_archive" value="0" id="stat_archive_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_archive\')" ' . ($row2['stat_archive'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label><br /> ';
-		//echo '<input type="checkbox" name="stat_archive" value="1" id="stat_archive" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'stat_archive\')" ' . ($row2['stat_archive'] == 1 ? ' checked' : '') . '/><label for="stat_archive" class="pointer"></label><br /> ';	
 
 		echo '</fieldset>';
 		
@@ -183,26 +179,35 @@ class Glasovanje {
 		echo '<label for="show_stat_2" class="pointer"><input type="radio" name="show_stat" value="2" id="show_stat_2" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat\')" ' . ($row['stat'] == 2 ? ' checked' : '') . '/>' . $lang['glasovanja_results_admin'] . '</label><br /> ';
 	
 		if($row['stat'] > 0){
-			//prikaz stevila glasov, v procentih in z grafom
+
+			// prikaz stevila glasov, v procentih in z grafom
+            echo '<div>';
 			echo '<span class="nastavitveSpan5" style="width: 100%;"><label>' . $lang['glasovanja_results_type'] . ':</label></span><br />';
 			echo '<label for="glasovanja_results" class="pointer"><input type="checkbox" name="glasovanja_results" value="1" id="glasovanja_results" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_results\')" ' . ($row2['show_results'] == 1 ? ' checked' : '') . '/>' . $lang['glasovanja_results_count'] . '</label> ';
 			echo '<label for="glasovanja_percent" class="pointer"><input type="checkbox" name="glasovanja_percent" value="1" id="glasovanja_percent" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_percent\')" ' . ($row2['show_percent'] == 1 ? ' checked' : '') . '/>' . $lang['glasovanja_results_percent'] . '</label> ';
 			echo '<label for="glasovanja_graph" class="pointer"><input type="checkbox" name="glasovanja_graph" value="1" id="glasovanja_graph" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this, \'show_graph\')" ' . ($row2['show_graph'] == 1 ? ' checked' : '') . '/>' . $lang['glasovanja_results_graph'] . '</label><br /> ';
+            echo '</div>';
 
-			//prikaz stevila glasov
+			// prikaz stevila glasov
+            echo '<div>';
 			echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_results_allcount'] . ':</label></span>';
 			echo '<label for="glasovanja_count_0" class="pointer"><input type="radio" name="glasovanja_count" value="0" id="glasovanja_count_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_count\')" ' . ($row2['stat_count'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
 			echo '<label for="glasovanja_count_1" class="pointer"><input type="radio" name="glasovanja_count" value="1" id="glasovanja_count_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_count\')" ' . ($row2['stat_count'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label><br /> ';
+            echo '</div>';
 
-			//prikaz casa glasovanja
+			// prikaz casa glasovanja
+            echo '<div>';
 			echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_results_time'] . ':</label></span>';
 			echo '<label for="glasovanja_time_0" class="pointer"><input type="radio" name="glasovanja_time" value="0" id="glasovanja_time_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_time\')" ' . ($row2['stat_time'] == 0 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
 			echo '<label for="glasovanja_time_1" class="pointer"><input type="radio" name="glasovanja_time" value="1" id="glasovanja_time_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'stat_time\')" ' . ($row2['stat_time'] == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label><br /> ';
+            echo '</div>';
 
-			//prikaz naslova vprasanja
+			// prikaz naslova vprasanja
+            echo '<div>';
 			echo '<span class="nastavitveSpan4"><label>' . $lang['glasovanja_results_title'] . ':</label></span>';
 			echo '<label for="glasovanja_title_1" class="pointer"><input type="radio" name="glasovanja_title" value="1" id="glasovanja_title_1" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_title\')" ' . ($row2['show_title'] == 1 ? ' checked' : '') . '/>' . $lang['no1'] . '</label> ';
-			echo '<label for="glasovanja_title_0" class="pointer"><input type="radio" name="glasovanja_title" value="0" id="glasovanja_title_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_title\')" ' . ($row2['show_title'] == 0 ? ' checked' : '') . '/>' . $lang['yes'] . '</label><br /> ';
+			echo '<label for="glasovanja_title_0" class="pointer"><input type="radio" name="glasovanja_title" value="0" id="glasovanja_title_0" onClick="edit_glasovanje(\'' . $row2['spr_id'] . '\', this.value, \'show_title\')" ' . ($row2['show_title'] == 0 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
+            echo '</div>';
 		}
 		echo '</fieldset>';
 
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 47b24c395..006668cdb 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -4510,10 +4510,7 @@ class SurveyAdminSettings {
 						}
 					}
 						
-					if($forma) 
-						echo '<label for="alert_finish_respondent">'.$lang['srv_alert_anketiranec'].'</label>'; 
-					else 
-						echo '<label for="alert_finish_respondent">'.$lang['srv_alert_respondent'].'</label>';
+					echo '<label for="alert_finish_respondent">'.$lang['srv_alert_respondent'].'</label>';
 						
 					if ($email_ok && $ime_ok) {
 						echo $lang['srv_alert_respondent_note_ok_email_ime'];
@@ -4549,20 +4546,14 @@ class SurveyAdminSettings {
 					// preverimo sistemske nastavitve in spremenljivke ime
 
 				} else { 
-					if($forma) 
-						echo '<label for="alert_finish_respondent">'.$lang['srv_alert_anketiranec'].'</label>'; 
-					else 
-						echo '<label for="alert_finish_respondent">'.$lang['srv_alert_respondent'].'</label>';
+					echo '<label for="alert_finish_respondent">'.$lang['srv_alert_respondent'].'</label>';
 				}
 				break;
 
 			case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo
-				//respondent iz cms
-				//pri hitrih nastavitvah forme prikazemo drug text
-				if($forma) 
-					echo '<label for="alert_finish_respondent_cms">'.$lang['srv_alert_anketiranec_cms'].'</label>'; 
-				else 
-					echo '<label for="alert_finish_respondent_cms">'.$lang['srv_alert_respondent_cms'].'</label>';
+				
+                //respondent iz cms
+				echo '<label for="alert_finish_respondent_cms">'.$lang['srv_alert_respondent_cms'].'</label>';
 					
 				if ($isChecked) {
 					// preverimo sistemske nastavitve in spremenljivke
diff --git a/lang/1.php b/lang/1.php
index 93b5e47a7..67fb39406 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2251,8 +2251,6 @@ $lang = array (
     "srv_alert_oblika"		=>	 "Oblika e-mail sporočila:",
     "srv_alert_oblika_deactivate_note"	=>	 "Sporo&#269;ilo ob deaktivaciji ankete",
     "srv_alert_oblika_activate_note"	=>	 "Sporo&#269;ilo ob aktivaciji ankete",
-	"srv_alert_anketiranec_cms" =>	 "Anketiranec, registriran v CMS",
-	"srv_alert_anketiranec" =>	 "Anketiranec",
 	"srv_alert_author2" 	=>	 "Avtor ankete",
     "srv_nextins"           =>	 "Naslednji vnos",
     "srv_insend"            =>	 "Zaklju&#269;i",
diff --git a/lang/13.php b/lang/13.php
index d591b2b71..0e691b21c 100644
--- a/lang/13.php
+++ b/lang/13.php
@@ -1963,8 +1963,6 @@ Ta&#269;nu lokaciju fajla sa podacima mo&#382;emo potra&#382;iti na slede&#269;i
     "srv_alert_oblika"		=>	 "Oblik:",
     "srv_alert_oblika_deactivate_note"	=>	 "Poruka kod deaktivacije ankete",
     "srv_alert_oblika_activate_note"	=>	 "Poruka kod aktivacije ankete",
-	"srv_alert_anketiranec_cms" =>	 "Anketirani, registrovan v CMS",
-	"srv_alert_anketiranec" =>	 "Anketirani",
 	"srv_alert_author2" 	=>	 "Autor ankete",
     "srv_nextins"           =>	 "Slede&#269;i unos",
     "srv_insend"            =>	 "Zaklju&#269;i",
diff --git a/lang/2.php b/lang/2.php
index 674559270..7a22bcde4 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2237,8 +2237,6 @@ $lang = array (
     "srv_alert_oblika"		=>  "Design:",
     "srv_alert_oblika_deactivate_note"	=>  "Message on the deactivation of the survey",
     "srv_alert_oblika_activate_note"	=>  "Message on the activation of the survey",
-	"srv_alert_anketiranec_cms" =>	"Respondent, registered to Sisplet CMS",
-	"srv_alert_anketiranec" =>	"Respondent",
 	"srv_alert_author2" 	=>	"Survey author",
     "srv_nextins"           =>  "Next insert",
     "srv_insend"            =>  "Finish",
diff --git a/lang/41.php b/lang/41.php
index 8c95cda8a..8b402bad0 100644
--- a/lang/41.php
+++ b/lang/41.php
@@ -1963,8 +1963,6 @@ Ta&#269;nu lokaciju fajla sa podacima mo&#382;emo potra&#382;iti na slede&#269;i
     "srv_alert_oblika"		=>	 "Oblik:",
     "srv_alert_oblika_deactivate_note"	=>	 "Poruka kod deaktivacije ankete",
     "srv_alert_oblika_activate_note"	=>	 "Poruka kod aktivacije ankete",
-	"srv_alert_anketiranec_cms" =>	 "Anketirani, registrovan v CMS",
-	"srv_alert_anketiranec" =>	 "Anketirani",
 	"srv_alert_author2" 	=>	 "Autor ankete",
     "srv_nextins"           =>	 "Slede&#269;i unos",
     "srv_insend"            =>	 "Zaklju&#269;i",
diff --git a/public/css/admin.css b/public/css/admin.css
index 8b21c9adf..29c737eb4 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -14191,6 +14191,7 @@ select#skin {
 }
 #anketa_edit.page_.subpage_.glasovanje .anketa_edit_main #glas_settings {
   width: 330px;
+  min-width: 290px;
   margin: 20px 0 0 0;
   padding: 0;
   line-height: 18px;
diff --git a/resources/sass/admin/branching/voting.scss b/resources/sass/admin/branching/voting.scss
index beebf6d1d..e5a7ff57a 100644
--- a/resources/sass/admin/branching/voting.scss
+++ b/resources/sass/admin/branching/voting.scss
@@ -47,8 +47,11 @@ select#skin {
         /* Leve nastavitve */
         #glas_settings {
             width: 330px;
+            min-width: 290px;
+
             margin: 20px 0 0 0;
             padding: 0;
+
             line-height: 18px;
             
             background-color: white;
diff --git a/sql/update2.sql b/sql/update2.sql
index 5857d28b5..e78c12971 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9577,3 +9577,7 @@ ALTER TABLE srv_anketa ADD UNIQUE (hash);
 UPDATE srv_anketa SET hash=id;
 
 UPDATE misc SET value='22.09.30' WHERE what="version";
+
+INSERT INTO srv_help (what, help) VALUES ('srv_glasovanje_archive', 'Dodaj anketo v arhiv glasovanja');
+
+UPDATE misc SET value='21.11.16' WHERE what="version";