diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index eb4603dff..8b51c045f 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1539,7 +1539,7 @@ class SurveyAdminSettings {
 			echo '<fieldset class="wide"><legend>'.$lang['srv_extra_translations'].' ';
 			
 			if ($row['multilang'] == 1) {
-				echo ' <select name="lang_id" onchange="window.location.href=\'index.php?anketa='.$this->anketa.'&a=jezik&lang_id=\'+this.value;">';
+				echo ' <select class="dropdown large w130 inline" name="lang_id" onchange="window.location.href=\'index.php?anketa='.$this->anketa.'&a=jezik&lang_id=\'+this.value;">';
 				
 				$lang_id = (int)$_GET['lang_id'];
 				if ($lang_id > 0)
@@ -1563,33 +1563,26 @@ class SurveyAdminSettings {
 			if ($row['multilang'] == 1 && $lang_id > 0) {
 				//echo '<p><span style="font-size:10px"> <a href="'.SurveyInfo::getSurveyLink().'?language='.$lang_id.'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><img src="img_0/preview_red.png" /></a> <a href="'.SurveyInfo::getSurveyLink().'?language='.$lang_id.'" target="_blank">'.SurveyInfo::getSurveyLink().'?language='.$lang_id.'</a></p>';
 			}
-			echo '<p><a href="index.php?anketa='.$this->anketa.'&a=prevajanje">'.$lang['srv_info_language'].'</a></p>';
-			
 			echo '<div class="standardne_besede">';
 			echo '<input type="hidden" name="extra_translations" value="1" />';			// da vemo, da nastavljamo ta besedila
+
+			// Tabela standardnih besed
+			echo '<table id="standard_words_table">';
+			echo '<tr>';
 			
-			echo '<p><span class="nastavitveSpan1 textleft">&nbsp;</span><span class="nastavitveSpan1 textleft" style="min-width:500px">'.($lang_id>0?$lang['srv_multilang']:$lang['srv_language_respons_1']).':';
-			
+			echo '<th>'.($lang_id>0?$lang['srv_language_respons_1'].': '.$resp_lang['language']:$lang['srv_language_admin'].': '.$lang['language']).'</th>';
 			
+			echo '<th>'.$lang['srv_std_second'].': ';
 			$file = '../../lang/'.$lang_resp.'.php';
 			include($file);
-			echo ' '.$lang['language'].'</span><br></p>';
-			
-			// nazaj na administrativnega
+			echo $lang['language'].'</th>';
+
+			// nazaj na administrativni jezik
 			$file = '../../lang/'.$lang_admin.'.php';
 			include($file);
 			
-			
-			echo '<p>';
-			
-			echo '<span class="nastavitveSpan1 textleft">'.($lang_id>0?$lang['srv_language_respons_1'].': '.$resp_lang['language']:$lang['srv_language_admin'].': '.$lang['language']).'</span>';
-			echo '<span class="nastavitveSpan1 textleft">'.$lang['srv_std_second'].'';
-			echo '</span>';
-			echo '<span class="bold">'.$lang['srv_std_translation'].' <a href="'.SurveyInfo::getSurveyLink().'&preview=on&language='.$lang_resp.'" target="_blank"><span class="faicon preview icon-as_link"></span></a></span>';
-			
-			echo '</p><hr>';
-			
-			echo '<p>';
+			echo '<th>'.$lang['srv_std_translation'].'</th>';
+			echo '</tr>';
 			
 			// jezik nastavimo na nastavitev za respondente, ker ta text dejansko nastavljamo
 			$file = '../../lang/'.$lang_resp.'.php';
@@ -1641,16 +1634,18 @@ class SurveyAdminSettings {
 			$this->extra_translation('srv_survey_non_active_notStarted', 1);
 			$this->extra_translation('srv_survey_non_active_expired', 1);
 			$this->extra_translation('srv_survey_non_active_voteLimit', 1);
-			
-						
-			echo '</p>';
-			
+
 			// nastavimo jezik nazaj
 			$file = '../../lang/'.$lang_admin.'.php';
 			include($file);
-			
+
+			echo '</table>';
+
 			echo '<div>';
-						
+			
+			//Link na zavihek Jezik
+			echo '<p><a href="index.php?anketa='.$this->anketa.'&a=prevajanje">'.$lang['srv_info_language'].'</a></p>';
+
 			echo '</fieldset>';
 			
 
@@ -2252,16 +2247,17 @@ class SurveyAdminSettings {
 		if($text == 'srv_nextpage_uvod')
 			$next_uvod = $lang_id == '' ? $admin_lang['srv_nextpage_uvod_desc'] : $resp_lang['srv_nextpage_uvod_desc'];
 		
-		echo '<div class="standardna-beseda"><span class="nastavitveSpan1 gray textleft">'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '<span class="gray italic">('.$next_uvod.')</span>' : '').'</span> ';
-		echo '<span class="nastavitveSpan1 textleft textItalic">'.$lang[$text].' </span>';
-		echo '<div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div>';
-		
+		echo '<tr class="standardna-beseda">';
+		echo '<td>'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '<span class="gray italic">('.$next_uvod.')</span>' : '').'</td> ';
+		echo '<td>'.$lang[$text].'</td>';
+		echo '<td><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div></td>';
+
 		if($editor == 1) 
 			echo '<span class="faicon edit2 sb-edit"'.$onclick.' style="float:right; margin-top:1px; display:none;"></span>';
         
 		echo '<textarea name="srvlang_'.$text.$lang_id.'" id="polje_srvlang_'.$text.$lang_id.'"  style="display:none;">'.$value.'</textarea>';
         
-		echo '</div>';
+		echo '</tr>';
 	}
 	
 	function anketa_nice_links () {
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4622bdf26..d662fc595 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -7634,6 +7634,13 @@ select.dropdown.small option {
 select.dropdown.w200 {
   width: 200px;
 }
+select.dropdown.w130 {
+  width: 130px;
+}
+select.dropdown.inline {
+  margin-left: 24px;
+  margin-top: 0;
+}
 select.dropdown:focus {
   outline-style: none;
   box-shadow: none;
@@ -7679,7 +7686,7 @@ table {
   text-align: left;
 }
 table td, table th {
-  padding: 0 16px;
+  padding: 8px 16px;
   border-top: 1px solid #E5E5E5;
   vertical-align: middle;
 }
diff --git a/resources/sass/admin_new/components/form/dropdown.scss b/resources/sass/admin_new/components/form/dropdown.scss
index d90660fc4..798be3a42 100644
--- a/resources/sass/admin_new/components/form/dropdown.scss
+++ b/resources/sass/admin_new/components/form/dropdown.scss
@@ -50,7 +50,14 @@ select.dropdown {
 
     &.w200 {
         width: 200px;
-        }
+    }
+    &.w130 {
+        width: 130px;
+    }
+    &.inline {
+        margin-left: 24px;
+        margin-top: 0;
+    }    
 
     &:focus {
         outline-style: none;
diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss
index 805e4abdd..ef3ab9145 100644
--- a/resources/sass/admin_new/components/table/table.scss
+++ b/resources/sass/admin_new/components/table/table.scss
@@ -5,7 +5,7 @@ table {
     text-align: left;
 
     td, th {
-        padding: 0 16px;
+        padding: 8px 16px;
         border-top: 1px solid $gray;
         vertical-align: middle;