diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 21bd0b5a0..b649dac13 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -1002,10 +1002,9 @@ class Branching {
         echo '<div name="tip_preview_sub" id="tip_preview_sub_21_2" class="tip_preview_sub">';
         echo '<span>' . $lang['srv_new_question'] . '</span>';
         echo '<div class="tip_sample">';
-        echo '<div class="tip_sample_text">' . $lang['srv_tip_sample_t21_2_o1'] . '</div>';
-        echo '<div class="tip_sample_option">(' . $lang['srv_email_example'] . ')</div>';
+        echo '<div class="tip_sample_text">'.$lang['srv_tip_sample_t21_2_o1'].' ('.$lang['srv_email_example'].')</div>';
         echo '<div class="tip_sample_option"><input type="text" /></div>';
-        echo '<p style="font-size:smaller; color:gray;">' . $lang['srv_email_example_txt'] . '</p>';
+        echo '<div class="tip_sample_option bottom">' . $lang['srv_email_example_txt'] . '</div>';
         echo '</div>';
         echo '</div>';
 
@@ -1041,11 +1040,13 @@ class Branching {
         echo '<div name="tip_preview_sub" id="tip_preview_sub_21_6" class="tip_preview_sub">';
         echo '<span>' . $lang['srv_new_question'] . '</span>';
         echo '<div class="tip_sample">';
-        echo '<div class="tip_sample_text">' . $lang['srv_tip_sample_t21_6'] . '</div>';
-        echo '<div class="tip_sample_option"><div style="width:250px; height:50px; border: 1px grey solid; background-color: white;"></div></div>';
-		echo '<div class="clr"></div>';
-		echo '<input type="button" value="'.$lang['srv_signature_clear'].'" style="margin: 5px;" />';
-		echo '<br />'.$lang['srv_signature_name'].' <input type="text" />';
+        echo '  <div class="tip_sample_text">' . $lang['srv_tip_sample_t21_6'] . '</div>';
+        echo '  <div class="tip_sample_option">';
+        echo '      <div class="textarea"></div>';
+		echo '      <div class="button">'.$lang['srv_signature_clear'].'</div>';
+        echo '  </div>';
+		echo '  <span>'.$lang['srv_signature_name'].'</span>';
+        echo '  <input type="text" />';
         echo '</div>';
         if(!$userAccess->checkUserAccess($what='question_type_signature')){
             $userAccess->displayNoAccessText($what='question_type_signature');
@@ -1338,9 +1339,9 @@ class Branching {
         echo '<div class="tip_sample_text">' . $lang['srv_tip_sample_t19'] . '</div>';
         echo '<div class="tip_sample_option"><div>&nbsp;</div><span>' . $lang['srv_tip_sample_t19_o1'] . '</span><span>' . $lang['srv_tip_sample_t19_o2'] . '</span><span>' . $lang['srv_tip_sample_t19_o3'] . '</span></div>';
         echo '<div style="clear:left"></div>';
-        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t19_v1'] . '</div><span><input type="text" size="10" value="abc" /></span><span><input type="text" size="10" value="abc" /></span><span><input type="text" size="10" value="abc" /></span></div>';
+        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t19_v1'] . '</div><span><input type="text" value="abc" /></span><span><input type="text" value="abc" /></span><span><input type="text" value="abc" /></span></div>';
         echo '<div style="clear:left"></div>';
-        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t19_v2'] . '</div><span><input type="text" size="10" value="abc" /></span><span><input type="text" size="10" value="abc" /></span><span><input type="text" size="10" value="abc" /></span></div>';
+        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t19_v2'] . '</div><span><input type="text" value="abc" /></span><span><input type="text" value="abc" /></span><span><input type="text" value="abc" /></span></div>';
         echo '<div class="clr"></div>';
         echo '</div>';
         echo '</div>';
@@ -1352,11 +1353,11 @@ class Branching {
         echo '<div class="tip_sample_text">' . $lang['srv_tip_sample_t20'] . '</div>';
         echo '<div class="tip_sample_option"><div>&nbsp;</div><span>' . $lang['srv_tip_sample_t20_o1'] . '</span><span>' . $lang['srv_tip_sample_t20_o2'] . '</span><span>' . $lang['srv_tip_sample_t20_o3'] . '</span></div>';
         echo '<div style="clear:left"></div>';
-        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t20_v1'] . '</div><span><input type="text" size="10" value="123" /></span><span><input type="text" size="10" value="123" /></span><span><input type="text" size="10" value="123" /></span></div>';
+        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t20_v1'] . '</div><span><input type="text" value="4" /></span><span><input type="text" value="0" /></span><span><input type="text" value="2" /></span></div>';
         echo '<div style="clear:left"></div>';
-        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t20_v2'] . '</div><span><input type="text" size="10" value="123" /></span><span><input type="text" size="10" value="123" /></span><span><input type="text" size="10" value="123" /></span></div>';
+        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t20_v2'] . '</div><span><input type="text" value="8" /></span><span><input type="text" value="22" /></span><span><input type="text" value="7" /></span></div>';
         echo '<div style="clear:left"></div>';
-        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t20_v3'] . '</div><span><input type="text" size="10" value="123" /></span><span><input type="text" size="10" value="123" /></span><span><input type="text" size="10" value="123" /></span></div>';
+        echo '<div class="tip_sample_option"><div>' . $lang['srv_tip_sample_t20_v3'] . '</div><span><input type="text" value="6" /></span><span><input type="text" value="12" /></span><span><input type="text" value="6" /></span></div>';
         echo '<div class="clr"></div>';
         echo '</div>';
         echo '</div>';
@@ -1394,19 +1395,20 @@ class Branching {
         echo '<div class="tip_sample">';
         echo '<div class="tip_sample_text">' . $lang['srv_tip_sample_t17'] . '</div>';
 
-        echo '<div style="float: left; width: 150px; height: 110px; border-right: 1px black solid;">';
-        echo '<div class="tip_sample_option"><div class="razvrscanje_preview">' . $lang['srv_tip_sample_t17_o1'] . '</div></div>';
-        echo '<div class="tip_sample_option"><div class="razvrscanje_preview">' . $lang['srv_tip_sample_t17_o2'] . '</div></div>';
-        echo '<div class="tip_sample_option"><div class="razvrscanje_preview">' . $lang['srv_tip_sample_t17_o3'] . '</div></div>';
+        echo '<div class="ranking_preview_holder">';
+        echo '  <div class="ranking_preview_left">';
+        echo '      <div class="razvrscanje_preview">' . $lang['srv_tip_sample_t17_o1'] . '</div>';
+        echo '      <div class="razvrscanje_preview">' . $lang['srv_tip_sample_t17_o2'] . '</div>';
+        echo '      <div class="razvrscanje_preview">' . $lang['srv_tip_sample_t17_o3'] . '</div>';
+        echo '  </div>';
+        
+        echo '  <div class="ranking_preview_right">';
+        echo '      <div class="razvrscanje_preview_frame">1.</div>';
+        echo '      <div class="razvrscanje_preview_frame">2.</div>';
+        echo '      <div class="razvrscanje_preview_frame">3.</div>';
+        echo '  </div>';
         echo '</div>';
 
-        echo '<div style="float: left; width: 150px; height: 110px; margin-left: 30px;">';
-        echo '<div class="tip_sample_option"><div class="razvrscanje_preview_frame">1</div></div>';
-        echo '<div class="tip_sample_option"><div class="razvrscanje_preview_frame">2</div></div>';
-        echo '<div class="tip_sample_option"><div class="razvrscanje_preview_frame">3</div></div>';
-        echo '</div>';
-        echo '<div class="clr"></div>';
-
         echo '</div>';
         if(!$userAccess->checkUserAccess($what='question_type_ranking')){
             $userAccess->displayNoAccessText($what='question_type_ranking');
@@ -1452,12 +1454,12 @@ class Branching {
         // tip 18 - vsota
         echo '<div name="tip_preview_sub" id="tip_preview_sub_18" class="tip_preview_sub">';
         echo '<span>' . $lang['srv_new_question'] . '</span>';
-        echo '<div class="tip_sample" style="text-align: right;">';
+        echo '<div class="tip_sample">';
         echo '<div class="tip_sample_text">' . $lang['srv_tip_sample_t18'] . '</div>';
-        echo '<div class="tip_sample_option">' . $lang['srv_tip_sample_t18_o1'] . '<input type="text" size="8" style="margin-bottom: 3px;" value="9" /></div>';
-        echo '<div class="tip_sample_option">' . $lang['srv_tip_sample_t18_o2'] . '<input type="text" size="8" style="margin-bottom: 3px;" value="10" /></div>';
-        echo '<div class="tip_sample_option">' . $lang['srv_tip_sample_t18_o3'] . '<input type="text" size="8" style="margin-bottom: 3px;" value="5" /></div>';
-        echo '<div class="tip_sample_option" style="border-top: 1px black solid;">' . $lang['srv_tip_sample_t18_o4'] . '<input type="text" size="8" style="margin-top: 3px;" value="24" /></div>';
+        echo '<div class="tip_sample_option">' . $lang['srv_tip_sample_t18_o1'] . '<input type="text" value="9" /></div>';
+        echo '<div class="tip_sample_option">' . $lang['srv_tip_sample_t18_o2'] . '<input type="text" value="10" /></div>';
+        echo '<div class="tip_sample_option">' . $lang['srv_tip_sample_t18_o3'] . '<input type="text"  value="5" /></div>';
+        echo '<div class="tip_sample_option sum">' . $lang['srv_tip_sample_t18_o4'] . '<input type="text" value="24" /></div>';
         echo '</div>';
         if(!$userAccess->checkUserAccess($what='question_type_sum')){
             $userAccess->displayNoAccessText($what='question_type_sum');
diff --git a/lang/1.php b/lang/1.php
index 28d5d9d30..356349ed9 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6338,7 +6338,7 @@ $lang = array (
 	'srv_editing_mode_new_anketa'				=>	'Način urejanja ankete',
 	'srv_editing_mode_new_anketa_0'				=>	'Osnovni način',
 	'srv_editing_mode_new_anketa_1'				=>	'Napredni način',
-	'srv_email_example_txt'						=>	'Če želite ta e-mail uporabljati za pošiljanje je treba v naprednih nastavitvah označiti, da je sistemski.',
+	'srv_email_example_txt'						=>	'Če želite ta e-mail uporabljati za pošiljanje, je treba v naprednih nastavitvah nastaviti, da je spremenljivka sistemska.',
 	'srv_prikaz_default_valid'					=>	'Privzeta izbira ustreznih enot:',
 	'srv_prikaz_showItime'						=>	'Prikaži datum respondenta:',
 	'srv_prikaz_showLineNumber'					=>	'Prikaži številko vrstice respondenta:',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 318d0d408..cf5c6aefd 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -12818,6 +12818,7 @@ div.drop_setting_transition {
   background: #FFFFFF;
   border: 1px solid #E5E5E5;
   box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+  display: block;
 }
 .toolbox_holder .toolbox_preview .tip_preview_sub {
   display: none;
@@ -12884,6 +12885,126 @@ div.drop_setting_transition {
   margin: 0 8px 0 0 !important;
   vertical-align: -1px;
 }
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_17 .ranking_preview_holder {
+  display: flex;
+  margin-top: 16px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_17 .ranking_preview_holder .ranking_preview_left {
+  display: flex;
+  flex-direction: column;
+  margin-right: 32px;
+  padding-right: 16px;
+  border-right: 1px #E5E5E5 solid;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_17 .ranking_preview_holder .ranking_preview_left .razvrscanje_preview {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  margin-bottom: 10px;
+  height: 34px;
+  width: 140px;
+  font-size: 14px;
+  background: #F4F9FE;
+  border: 1px solid #D8EDFF;
+  border-radius: 2px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_17 .ranking_preview_holder .ranking_preview_right {
+  display: flex;
+  flex-direction: column;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_17 .ranking_preview_holder .ranking_preview_right .razvrscanje_preview_frame {
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  margin-bottom: 10px;
+  height: 34px;
+  width: 140px;
+  font-size: 14px;
+  text-indent: -24px;
+  background: #F8F8F8;
+  border: 1px dashed #D8EDFF;
+  border-radius: 2px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_18 .tip_sample {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  width: 250px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_18 .tip_sample .tip_sample_option {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_18 .tip_sample .tip_sample_option input {
+  width: 180px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_18 .tip_sample .tip_sample_option.sum {
+  padding-top: 4px;
+  border-top: 1px #E5E5E5 solid;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_19 .tip_sample .tip_sample_text, .toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_20 .tip_sample .tip_sample_text {
+  margin-bottom: 16px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_19 .tip_sample .tip_sample_option, .toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_20 .tip_sample .tip_sample_option {
+  display: flex;
+  align-items: center;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_19 .tip_sample .tip_sample_option div, .toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_20 .tip_sample .tip_sample_option div {
+  width: 70px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_19 .tip_sample .tip_sample_option span, .toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_20 .tip_sample .tip_sample_option span {
+  width: 90px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_19 .tip_sample .tip_sample_option span input, .toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_20 .tip_sample .tip_sample_option span input {
+  width: 75px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_21_2 .tip_sample_option.bottom {
+  margin-top: 16px;
+  padding-top: 16px;
+  border-top: 1px #E5E5E5 solid;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_21_6 {
+  display: block;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_21_6 .tip_sample {
+  display: flex;
+  flex-direction: column;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_21_6 .tip_sample .tip_sample_option {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_21_6 .tip_sample .tip_sample_option .textarea {
+  box-sizing: border-box;
+  width: 200px;
+  height: 50px;
+  margin-right: 8px;
+  background: #FFFFFF;
+  border: 1px solid #C4C4C4;
+  border-radius: 2px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_21_6 .tip_sample .tip_sample_option .button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 116px;
+  height: 28px;
+  box-sizing: border-box;
+  font-size: 14px;
+  background: #F8F8F8;
+  border: 1px solid #C4C4C4;
+  border-radius: 2px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_21_6 .tip_sample span {
+  font-size: 14px;
+}
+.toolbox_holder .toolbox_preview .tip_preview_sub#tip_preview_sub_21_6 .tip_sample input {
+  width: 200px;
+  margin-top: 4px;
+}
 .toolbox_holder.open {
   width: 240px;
 }
@@ -14187,6 +14308,7 @@ div.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable,
   justify-content: flex-start;
   visibility: hidden;
   margin-left: 16px;
+  margin-bottom: -10px;
   font-size: 14px;
 }
 li.spr .spremenljivka_content .content_div_normalmode .add-variable .faicon,
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
index 26166ae22..ef532c21e 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
@@ -396,6 +396,7 @@ div.spr,
 
                 visibility: hidden;
                 margin-left: 16px;
+                margin-bottom: -10px;
 
                 font-size: 14px;
 
diff --git a/resources/sass/admin_new/pages/survey_edit/toolbox.scss b/resources/sass/admin_new/pages/survey_edit/toolbox.scss
index 0d114b8df..f3688cb0e 100644
--- a/resources/sass/admin_new/pages/survey_edit/toolbox.scss
+++ b/resources/sass/admin_new/pages/survey_edit/toolbox.scss
@@ -386,8 +386,184 @@
 
                 vertical-align: -1px;
             }
+
+
+            // Razvrscanje
+            &#tip_preview_sub_17{
+
+                .ranking_preview_holder{
+                    display: flex;
+
+                    margin-top: 16px;
+
+                    .ranking_preview_left{
+                        display: flex;
+                        flex-direction: column;
+
+                        margin-right: 32px;
+                        padding-right: 16px;
+
+                        border-right: 1px $gray solid;
+
+                        .razvrscanje_preview{
+                            display: flex;
+                            justify-content: center;
+                            align-items: center;
+
+                            box-sizing: border-box;
+                            margin-bottom: 10px;
+                            height: 34px;
+                            width: 140px;
+
+                            font-size: 14px;
+               
+                            background: $medium-blue2;
+                            border: 1px solid #D8EDFF;
+                            border-radius: 2px;
+                        }
+                    }
+                    
+                    .ranking_preview_right{
+                        display: flex;
+                        flex-direction: column;
+
+                        .razvrscanje_preview_frame{
+                            display: flex;
+                            align-items: center;
+
+                            box-sizing: border-box;
+                            margin-bottom: 10px;
+                            height: 34px;
+                            width: 140px;
+
+                            font-size: 14px;
+                            text-indent: -24px;
+
+                            background: $light-gray;
+                            border: 1px dashed #D8EDFF;
+                            border-radius: 2px;
+                        }
+                    }
+                }
+            }
+
+            // Vsota
+            &#tip_preview_sub_18{
+
+                .tip_sample{
+                    display: flex;
+                    flex-direction: column;
+                    align-items: flex-end;
+
+                    width: 250px;
+
+                    .tip_sample_option{
+                        display: flex;
+                        justify-content: space-between;
+                        align-items: center;
+
+                        input{
+                            width: 180px;
+                        }
+
+                        &.sum{
+                            padding-top: 4px;
+                            border-top: 1px $gray solid;
+                        }
+                    }
+                }
+            }
+
+            // Multitext
+            &#tip_preview_sub_19,
+            &#tip_preview_sub_20{
+
+                .tip_sample{
+                    
+                    .tip_sample_text{
+                        margin-bottom: 16px;
+                    }
+
+                    .tip_sample_option{
+                        display: flex;
+                        align-items: center;
+                        
+                        div{
+                            width: 70px;
+                        }
+                        
+                        span {
+                            width: 90px;                            
+                            
+                            input{
+                                width: 75px;
+                            }
+                        }
+                    } 
+                }
+            }
+
+            &#tip_preview_sub_21_2{
+              
+                .tip_sample_option.bottom{
+                    margin-top: 16px;
+                    padding-top: 16px;
+                    
+                    border-top: 1px $gray solid;
+                }
+            }
+
+            &#tip_preview_sub_21_6{
+
+                .tip_sample{
+                    display: flex;
+                    flex-direction: column;
+
+                    .tip_sample_option{
+                        display: flex;
+                        align-items: center;
+
+                        margin-bottom: 16px;
+
+                        .textarea{
+                            box-sizing: border-box;
+                            width: 200px;
+                            height: 50px;
+                            margin-right: 8px;
+    
+                            background: $white;
+                            border: 1px solid $dark-gray;
+                            border-radius: 2px;
+                        }
+    
+                        .button{
+                            display: flex;
+                            align-items: center;
+                            justify-content: center;
+
+                            width: 116px;
+                            height: 28px;
+                            box-sizing: border-box;
+
+                            font-size: 14px;
+
+                            background: $light-gray;
+                            border: 1px solid $dark-gray;
+                            border-radius: 2px;
+                        }
+                    }
+
+                    span{
+                        font-size: 14px;
+                    }
+
+                    input{
+                        width: 200px;
+                        margin-top: 4px;
+                    }
+                }
+            }
         }
-        
     }
 
     &.open{