diff --git a/admin/survey/classes/class.Prevajanje.php b/admin/survey/classes/class.Prevajanje.php
index a5baee7e9..a427dd82a 100644
--- a/admin/survey/classes/class.Prevajanje.php
+++ b/admin/survey/classes/class.Prevajanje.php
@@ -263,10 +263,10 @@ class Prevajanje {
 			}
 			
 			// Jezik administrativnega vmesnika
-			echo '<div style="position:absolute; right:20px; bottom:10px;"><span class="bold">';
+			//echo '<div style="position:absolute; right:20px; bottom:10px;"><span class="bold">';
 			//printf ($lang['srv_language_admin_survey2'], 'index.php?anketa='.$this->anketa.'&a=nastavitve');
-			echo '<a href="index.php?anketa='.$this->anketa.'&a=nastavitve">'.$lang['srv_language_admin_survey'].'</a>';
-			echo '</span></div>';
+			//echo '<a href="index.php?anketa='.$this->anketa.'&a=nastavitve">'.$lang['srv_language_admin_survey'].'</a>';
+			//echo '</span></div>';
 			
 			echo '</form>';
 		}
@@ -463,9 +463,14 @@ class Prevajanje {
 	function urejanje_texti () {
 		global $lang;
 		
+        echo '<div class="jezik_row">';
+		echo '  <div class="jezik_left"><p class="caps semi-bold bottom16">'.$lang['srv_survey_info'].'</p></div>';
+		echo '  <div class="jezik_right"><p class="caps semi-bold bottom16">'.$lang['srv_survey_info'].'</p></div>';
+        echo '</div>';
+
         echo '<div class="jezik_row">';
 		echo '  <div class="jezik_left">'.$lang['srv_novaanketa_kratkoime'].'</div>';
-		echo '  <div class="jezik_right">'.$lang['srv_novaanketa_kratkoime'].'</div>';
+		echo '  <div class="jezik_right">'.$lang['srv_novaanketa_kratkoime'].':</div>';
         echo '</div>';
 
 		echo '<div class="jezik_row">';
@@ -487,7 +492,7 @@ class Prevajanje {
 		global $lang2;
 		
 		$row = SurveyInfo::getInstance()->getSurveyRow();
-		
+
 		if ($text == 'srv_novaanketa_kratkoime') {	// akronim pri default jeziku je pac v srv_anketa
 			$value = (($row['akronim'] == null || $row['akronim'] == '') ? $row['naslov'] : $row['akronim'] );
 		} elseif ($text == 'srv_question_comment_text') {	// "Vaš komentar k vprašanju" ni v lang, ampak je v settingsih
@@ -518,15 +523,13 @@ class Prevajanje {
 		$value1 = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_'.$text.'_'.$this->lang_id);
 		
 		if ($value1 == '' && $text != 'srv_anketa_opomba') $value1 = $def;
-		
-		echo '<span style="margin-left: 10px; margin:10px; display:block; width:120px; float:left;">';
-		if ($text == 'srv_novaanketa_kratkoime')
-			echo $lang['srv_naslov'].': ';
+
+		//if ($text == 'srv_novaanketa_kratkoime')
+		//	echo $lang['srv_naslov'].': ';
 		if ($text == 'srv_anketa_opomba')
-			echo $lang['note'].' ('.$lang['srv_internal'].'): ';
-		echo '</span>';
+			echo '<p class="top16">'.$lang['note'].' ('.$lang['srv_internal'].'): </p>';
 		
-		echo '<p style="margin-left:10px; min-height:15px; min-width:200px; float:left; outline:1px dashed gray; cursor: text" class="editable" id="srvlang_'.$text.'_'.$this->lang_id.'" contenteditable="true" onblur="extra_translation_save(\''.$text.'\');">'.$value1.'</p>';
+		echo '<p class="editable" id="srvlang_'.$text.'_'.$this->lang_id.'" contenteditable="true" onblur="extra_translation_save(\''.$text.'\');">'.$value1.'</p>';
 	}
 	
 	/**
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8b5546cfb..ac16b4275 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -21262,8 +21262,28 @@ div.prevajanje_holder .section .jezik_row .jezik_left.jezik_left,
 div.prevajanje_holder .section .jezik_row .jezik_right.jezik_left {
   margin-right: 16px;
 }
+div.prevajanje_holder .section .jezik_row .jezik_left div.spremenljivka_content,
+div.prevajanje_holder .section .jezik_row .jezik_right div.spremenljivka_content {
+  min-height: 100% !important;
+  box-sizing: border-box;
+}
+div.prevajanje_holder .section .jezik_row .jezik_left p.editable,
+div.prevajanje_holder .section .jezik_row .jezik_right p.editable {
+  width: 100%;
+  box-sizing: border-box;
+  border: 1px solid #E5E5E5;
+  border-radius: 4px;
+  margin-top: 4px;
+  height: 30px;
+  padding: 5px 8px;
+}
+div.prevajanje_holder .section .jezik_row .jezik_left span.title,
+div.prevajanje_holder .section .jezik_row .jezik_right span.title {
+  font-size: 20px;
+}
 div.prevajanje_holder .section.jezik_top_settings fieldset {
   width: 50%;
+  margin-bottom: 0;
 }
 div.prevajanje_holder .section.jezik_top_settings fieldset.jezik_left {
   min-height: 100% !important;
@@ -21309,8 +21329,9 @@ div.prevajanje_holder .section.jezik_vprasanja .jezik_row {
   margin-bottom: 32px;
 }
 div.prevajanje_holder .section.jezik_vprasanja .jezik_row.page {
-  font-size: 20px;
   font-weight: 600;
+  margin-bottom: 4px;
+  margin-top: 20px;
 }
 div.subpage_predvidenicas table,
 div.subpage_cas table {
diff --git a/resources/sass/admin_new/pages/survey_edit/jezik.scss b/resources/sass/admin_new/pages/survey_edit/jezik.scss
index 1037b4fa8..84d61ebb8 100644
--- a/resources/sass/admin_new/pages/survey_edit/jezik.scss
+++ b/resources/sass/admin_new/pages/survey_edit/jezik.scss
@@ -20,6 +20,25 @@ div.prevajanje_holder {
                 &.jezik_left{
                     margin-right: 16px;
                 }
+
+                div.spremenljivka_content {
+                    min-height: 100% !important;
+                    box-sizing: border-box;
+                }
+
+                p.editable {
+                    width: 100%;
+                    box-sizing: border-box;
+                    border: 1px solid $gray;
+                    border-radius: 4px;
+                    margin-top: 4px;
+                    height: 30px;
+                    padding: 5px 8px;
+                }
+
+                span.title {
+                    font-size: 20px;
+                }
             }
         }
 
@@ -28,6 +47,7 @@ div.prevajanje_holder {
 
             fieldset {
                 width: 50%;
+                margin-bottom: 0;
 
                 &.jezik_left{
                     min-height: 100% !important;
@@ -100,13 +120,13 @@ div.prevajanje_holder {
 
                 // Vrstica z naslovom strani
                 &.page{
-                    font-size: 20px;
                     font-weight: 600;
+                    margin-bottom: 4px;
+                    margin-top: 20px;
                 }
             
                 // Urejanje vprasanja
                 &.question{
-            
                 }
             
                 // Urejanje uvoda, zakljucka