diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index 803a1e452..bb2f5a7e4 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -27,29 +27,44 @@ class SurveyStaticHtml
 
         $this->table_id = SurveyUserSetting:: getInstance()->getSettings('default_mc_table');
 
-        if (isset($this->table_id) && $this->table_id != '')
+        /*if (isset($this->table_id) && $this->table_id != '')
             $sql = sisplet_query("SELECT name FROM srv_mc_table WHERE id='$this->table_id' AND ank_id='$this->sid' AND usr_id='$global_user_id'");
         else
             $sql = sisplet_query("SELECT name FROM srv_mc_table WHERE ank_id='$this->sid' AND usr_id='$global_user_id' ORDER BY time_created ASC");
-        $row = mysqli_fetch_array($sql);
+        $row = mysqli_fetch_array($sql);*/
+
 
         echo '<div class="mc_settings_links">';
-        echo '<ul>';
 
-        // Izbiro tabele (popup) in dodajanje
-        echo '<li>';
-        echo '<span onClick="show_mc_tables();">' . $lang['srv_table'] . ': <span class="bold">' . $row['name'] . '</span></span>';
-        echo '<span id="mc_tables_plus" class="pointer spaceLeft faicon add icon-blue" title="' . $lang['srv_multicrosstabs_tables_add'] . '"></span></span>';
-        echo '</li>';
 
-        echo '<li class="space">&nbsp;</li>';
+        // Seznam tabel
+        echo '<div class="table_list">';
+
+        $sql = sisplet_query("SELECT id, name FROM srv_mc_table WHERE ank_id='$this->sid' AND usr_id='$global_user_id' ORDER BY time_created ASC");
+        while($row = mysqli_fetch_array($sql)){
+            echo '<div class="table_item '.($row['id'] == $this->table_id ? 'active' : '').'">';
+            echo '  <span onClick="switch_mc_table(\''.$row['id'].'\');">'.$row['name'].'</span>';
+            echo '</div>';
+        }
+
+        echo '</div>';
+
+
+        // Nastavtve, dodajanje tabele
+        echo '<div class="table_settings">';
+
+        // Urejanje
+        echo '  <span class="faicon edit" onClick="show_mc_tables();"></span>';
+
+        // Dodajanje
+        echo '  <span id="mc_tables_plus" class="faicon add" title="'.$lang['srv_multicrosstabs_tables_add'].'"></span>';
 
         // Nastavitve tabele (popup)
-        echo '<li>';
-        echo '<span class="gray" onClick="showMCSettings();">' . $lang['srv_multicrosstabs_settings'] . '</span>';
-        echo '</li>';
+        echo '  <span class="faicon wheel_32" onClick="showMCSettings();" title="'.$lang['srv_multicrosstabs_settings'].'"></span>';
+
+        echo '</div>';
+
 
-        echo '</ul>';
         echo '</div>';
     }
 
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
index 7916bf662..a8873c111 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
@@ -219,7 +219,7 @@ class SurveyMultiCrosstabs {
 			if($spr['canChoose'] && in_array($spr['tip'], array(1,3,6))){
 				
 				echo '<li class="draggable mc_draggable" id="'.$spr['spr_id'].'-'.$spr['sequence'].'">';		
-				echo '<span class="strong">'.$spr['variable'].'</span> - '.$this->snippet($spr['naslov'], 25);			
+				echo '  <span class="strong"><span class="faicon grip"></span>'.$spr['variable'].'</span> - '.$this->snippet($spr['naslov'], 25);			
 				echo '</li>';
 			}
 		}
@@ -255,9 +255,19 @@ class SurveyMultiCrosstabs {
 		// Napolnimo variable ki so ze izbrane
 		$this->getSelectedVars();
 
+        // Zvezdica za creport - ce smo v custom reportu tega ne izpisemo
+		if($_GET['m'] != 'analysis_creport'){
+		
+            echo '<div class="mc_table_top_settings">';
+
+			// Zvezdica za vkljucitev v porocilo	
+			SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=10, $sub_type=0, $spr1=$this->table_id);
+
+			echo '</div>';
+		}
+
 		echo '<table id="'.$this->table_id.'" cellspacing="0" cellpadding="0" class="mc_table">';
 
-		
 		// Imamo 2 nivoja
 		if($this->colLevel2){
 			
@@ -267,8 +277,10 @@ class SurveyMultiCrosstabs {
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';	
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';
+            
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $var){
 					
@@ -279,23 +291,27 @@ class SurveyMultiCrosstabs {
 					echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 					
 					// Gumb za brisanje
-					echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';
+					echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';
 					
 					echo '</td>';
 				}
 			}
 			// Izrisemo se zadnjo prazno navpicno celico vrstico
 			echo '<td id="undefined" class="spr vertical droppable empty" rowspan="4">'.$lang['srv_multicrosstabs_add'].'</td>';		
-			echo '</tr>';
 			
+            echo '</tr>';
+			
+            
 			// Izrisemo VARIABLE za spremenljivko - 2. vrstica
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';		
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';	
+
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $var){
 
@@ -314,16 +330,18 @@ class SurveyMultiCrosstabs {
 				}
 			}
 			echo '</tr>';
+
 			
 			// Izris vrstic za 2. nivo - 3. in 4. vrstica
-		
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';		
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';
+
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $parentVar){
 					
@@ -338,7 +356,7 @@ class SurveyMultiCrosstabs {
 								echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 								
 								// Gumb za brisanje
-								echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';
+								echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';
 								
 								echo '</td>';
 							}
@@ -355,15 +373,19 @@ class SurveyMultiCrosstabs {
 					}
 				}
 			}
+
 			echo '</tr>';
 			
+
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';		
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';
+
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $parentVar){
 					
@@ -378,7 +400,7 @@ class SurveyMultiCrosstabs {
 									echo $this->snippet($suboption, 25);
 									
 									// Gumb za brisanje
-									echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';
+									echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';
 									
 									echo '</td>';
 								}
@@ -387,10 +409,12 @@ class SurveyMultiCrosstabs {
 					}
 				}
 			}
+
 			echo '</tr>';
 		}
 		// Imamo samo 1 nivo
 		else{
+
 			// Izrisemo VERTIKALNO izbrane spremenljivkec - 1. vrstica	
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
@@ -398,7 +422,9 @@ class SurveyMultiCrosstabs {
 				$colspan = ' colspan="2"';
 			else
 				$colspan = ' colspan="4"';			
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';
+
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $var){
 					
@@ -408,7 +434,7 @@ class SurveyMultiCrosstabs {
 					echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 					
 					// Gumb za brisanje
-					echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';
+					echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';
 					
 					echo '</td>';
 				}
@@ -419,17 +445,21 @@ class SurveyMultiCrosstabs {
 			}
 
 			// Izrisemo se zadnjo prazno navpicno celico vrstico
-			echo '<td id="undefined" class="spr vertical droppable empty" rowspan="2">'.$lang['srv_multicrosstabs_add'].'</td>';		
+			echo '<td id="undefined" class="spr vertical droppable empty" rowspan="2">'.$lang['srv_multicrosstabs_add'].'</td>';
+
 			echo '</tr>';
 			
+
 			// Izrisemo VARIABLE za spremenljivko - 2. vrstica
 			if($this->rowSpan == 0)
 				$colspan = ' colspan="1"';
 			elseif(!$this->rowLevel2)
 				$colspan = ' colspan="2"';
 			else
-				$colspan = ' colspan="4"';			
+				$colspan = ' colspan="4"';	
+
 			echo '<tr><td class="borderless" '.$colspan.'></td>';	
+            
 			if(count($this->selectedVars['ver'])){
 				foreach($this->selectedVars['ver'] as $var){
 
@@ -452,6 +482,7 @@ class SurveyMultiCrosstabs {
 					}
 				}
 			}
+
 			echo '</tr>';
 		}
 
@@ -489,7 +520,7 @@ class SurveyMultiCrosstabs {
 										echo $this->snippet($this->variablesList[$parentVar['spr']]['naslov'], 25);
 										
 										// Gumb za brisanje
-										echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';				
+										echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';				
 										echo '</td>';
 									}
 									
@@ -510,7 +541,7 @@ class SurveyMultiCrosstabs {
 										echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 										
 										// Gumb za brisanje
-										echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';				
+										echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';				
 										echo '</td>';
 									}
 									
@@ -538,7 +569,7 @@ class SurveyMultiCrosstabs {
 									
 									echo '<tr>';
 									
-									echo '<td class="var sums">'.$lang['srv_analiza_crosstab_skupaj'].'</td>';
+									echo '<td class="var sums horizontal">'.$lang['srv_analiza_crosstab_skupaj'].'</td>';
 									
 									$crosstabs = $this->crosstabData[$parentVar['spr'].'-'.$var['spr']];
 								
@@ -564,7 +595,7 @@ class SurveyMultiCrosstabs {
 								echo $this->snippet($this->variablesList[$parentVar['spr']]['naslov'], 25);
 								
 								// Gumb za brisanje
-								echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';				
+								echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';				
 								echo '</td>';
 							}
 								
@@ -602,7 +633,7 @@ class SurveyMultiCrosstabs {
 							echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25);
 							
 							// Gumb za brisanje
-							echo '<div class="delete_var" onclick="deleteVariable(this);"></div>';				
+							echo '<div class="delete_var" onclick="deleteVariable(this);"><span class="faicon remove"></span></div>';				
 							echo '</td>';
 						}
 						
@@ -625,7 +656,7 @@ class SurveyMultiCrosstabs {
 					// Vrstica za sumo (ce jo imamo vklopljeno)
 					if($this->table_settings[$this->table_id]['sums'] == 1 && count($this->selectedVars['ver']) > 0 && !$this->colLevel2){
 						echo '<tr>';
-						echo '<td class="var sums">'.$lang['srv_analiza_crosstab_skupaj'].'</td>';
+						echo '<td class="var sums horizontal">'.$lang['srv_analiza_crosstab_skupaj'].'</td>';
 						
 						// Loop cez vse stolpce
 						foreach($this->selectedVars['ver'] as $spr2){
@@ -686,37 +717,26 @@ class SurveyMultiCrosstabs {
 		
 		echo '</tr>';
 		
-		
 		echo '</table>';
 		
 		
-		
-		echo '<div class="mc_table_bottom_settings">';
-		
 		// Izrisemo legendo
+		echo '<div class="mc_table_bottom_settings">';
 		$this->displayLegend();
-		
-				
-		// Ce smo v custom reportu tega ne izpisemo
-		if($_GET['m'] != 'analysis_creport'){
-		
-			// Zvezdica za vkljucitev v porocilo	
-			SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=10, $sub_type=0, $spr1=$this->table_id);
-		
-		
-			echo '<script type="text/javascript">';
-			
-			// Nastavimo droppable (drugace po ajaxu ne dela)
-			echo '$(function(){createDroppable();});';	
-			
-			// Nastavimo gumb za brisanje spremenljivke
-			echo '$(".mc_table tr td.spr").mouseover(function(){$(this).find(".delete_var").show();});';
-			echo '$(".mc_table tr td.spr").mouseout(function(){$(this).find(".delete_var").hide();});';
-			
-			echo '</script>';
-		}
-		
 		echo '</div>';
+
+
+        // JS
+        echo '<script type="text/javascript">';
+			
+        // Nastavimo droppable (drugace po ajaxu ne dela)
+        echo '$(function(){createDroppable();});';	
+        
+        // Nastavimo gumb za brisanje spremenljivke
+        echo '$(".mc_table tr td.spr").mouseover(function(){$(this).find(".delete_var").show();});';
+        echo '$(".mc_table tr td.spr").mouseout(function(){$(this).find(".delete_var").hide();});';
+        
+        echo '</script>';
 	}
 	
 	// Izpis celic v vrstici s podatki
@@ -1111,7 +1131,7 @@ class SurveyMultiCrosstabs {
 			// Numerus
 			if($this->table_settings[$this->table_id]['numerus'] == 1){
 				echo '<tr><td class="bold white">';
-				echo $crosstabs['sumaSkupna'];
+				echo ($crosstabs['sumaSkupna'] != '') ? $crosstabs['sumaSkupna'] : '0';
 				echo '</td></tr>';
 			}
 			
diff --git a/admin/survey/script/multiCrosstabs.js b/admin/survey/script/multiCrosstabs.js
index 1fdf3b930..11cf11320 100644
--- a/admin/survey/script/multiCrosstabs.js
+++ b/admin/survey/script/multiCrosstabs.js
@@ -190,6 +190,12 @@ function use_mc_table() {
 		location.reload();
 	});
 }
+function switch_mc_table(value) {
+
+	$.post('ajax.php?t=multicrosstabs&a=use_mc_table', {anketa:srv_meta_anketa_id, value:value}, function(){	
+		location.reload();
+	});
+}
 
 // popravljamo ime tabele...
 function mc_table_action(action){
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 91be7f60b..02e4a374f 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5449,6 +5449,10 @@ span.faicon.filter::before {
   content: "";
 }
 
+span.faicon.grip::before {
+  content: "";
+}
+
 span.faicon.star::before,
 span.faicon.star_off::before {
   font-size: 14px;
@@ -9487,6 +9491,311 @@ and open the template in the editor.
   border: 1px solid #1E88E5;
 }
 
+/*table settings popup*/
+.mc_table_settings {
+  /*max-height: 90vh;
+  overflow-y: scroll;*/
+  max-width: 90vw;
+  padding: 16px;
+  font-size: 16px;
+  line-height: 20px;
+  background-color: white;
+  display: none;
+  position: fixed;
+  top: 200px;
+  left: calc(50% - 200px);
+  z-index: 999;
+  width: 400px;
+}
+.mc_table_settings .popup_close {
+  position: absolute !important;
+  top: 10px;
+  right: 10px;
+  z-index: 9999;
+  font-size: 12px !important;
+  color: #777777;
+}
+.mc_table_settings .popup_close:hover {
+  color: #333333;
+}
+.mc_table_settings .popup_close a {
+  color: #777777;
+  text-decoration: none;
+}
+.mc_table_settings .popup_close a:hover {
+  color: #333333;
+}
+.mc_table_settings h2,
+.mc_table_settings .divPopUp_top {
+  width: 100%;
+  margin-top: 3px;
+  margin-bottom: 16px;
+  padding-bottom: 8px;
+  font-weight: 600;
+  font-size: 16px;
+  text-transform: uppercase;
+  border-bottom: 1px #E5E5E5 solid;
+}
+.mc_table_settings p {
+  line-height: 20px;
+}
+.mc_table_settings .button_holder {
+  justify-content: end !important;
+  margin: 16px 0 0 0;
+}
+.mc_table_settings .button_holder button:last-child {
+  margin-right: 0;
+}
+.mc_table_settings.warning_popup h2::before {
+  padding-right: 8px;
+  font-family: "Font Awesome 5 Free";
+  content: "";
+  font-size: 14px;
+  color: #FFC700;
+}
+.mc_table_settings #mcSettingsButtons {
+  position: absolute;
+  bottom: 15px;
+  right: 10px;
+}
+.mc_table_settings #delez {
+  width: 300px;
+  margin: 5px 10px 0px 60px;
+}
+.mc_table_settings form {
+  padding: 10px;
+}
+.mc_table_settings fieldset {
+  margin: 0px 0px 10px 0px;
+  border: 0;
+  border-top: 1px solid #1E88E5;
+}
+.mc_table_settings legend {
+  color: #1E88E5;
+  font-size: 13px;
+  font-weight: 500;
+  margin: 0;
+  padding: 0 10px;
+}
+
+/*new table popup*/
+#newMCTable {
+  /*max-height: 90vh;
+  overflow-y: scroll;*/
+  max-width: 90vw;
+  padding: 16px;
+  font-size: 16px;
+  line-height: 20px;
+  background-color: white;
+  display: none;
+  position: fixed;
+  left: calc(50% - 275px);
+  top: 40vh;
+  z-index: 999;
+  margin: 10px;
+  width: 550px;
+}
+#newMCTable .popup_close {
+  position: absolute !important;
+  top: 10px;
+  right: 10px;
+  z-index: 9999;
+  font-size: 12px !important;
+  color: #777777;
+}
+#newMCTable .popup_close:hover {
+  color: #333333;
+}
+#newMCTable .popup_close a {
+  color: #777777;
+  text-decoration: none;
+}
+#newMCTable .popup_close a:hover {
+  color: #333333;
+}
+#newMCTable h2,
+#newMCTable .divPopUp_top {
+  width: 100%;
+  margin-top: 3px;
+  margin-bottom: 16px;
+  padding-bottom: 8px;
+  font-weight: 600;
+  font-size: 16px;
+  text-transform: uppercase;
+  border-bottom: 1px #E5E5E5 solid;
+}
+#newMCTable p {
+  line-height: 20px;
+}
+#newMCTable .button_holder {
+  justify-content: end !important;
+  margin: 16px 0 0 0;
+}
+#newMCTable .button_holder button:last-child {
+  margin-right: 0;
+}
+#newMCTable.warning_popup h2::before {
+  padding-right: 8px;
+  font-family: "Font Awesome 5 Free";
+  content: "";
+  font-size: 14px;
+  color: #FFC700;
+}
+
+/*rename table popup*/
+#renameMCTable {
+  /*max-height: 90vh;
+  overflow-y: scroll;*/
+  max-width: 90vw;
+  padding: 16px;
+  font-size: 16px;
+  line-height: 20px;
+  background-color: white;
+  display: none;
+  position: fixed;
+  left: calc(50% - 275px);
+  top: 40vh;
+  z-index: 999;
+  margin: 10px;
+  width: 550px;
+}
+#renameMCTable .popup_close {
+  position: absolute !important;
+  top: 10px;
+  right: 10px;
+  z-index: 9999;
+  font-size: 12px !important;
+  color: #777777;
+}
+#renameMCTable .popup_close:hover {
+  color: #333333;
+}
+#renameMCTable .popup_close a {
+  color: #777777;
+  text-decoration: none;
+}
+#renameMCTable .popup_close a:hover {
+  color: #333333;
+}
+#renameMCTable h2,
+#renameMCTable .divPopUp_top {
+  width: 100%;
+  margin-top: 3px;
+  margin-bottom: 16px;
+  padding-bottom: 8px;
+  font-weight: 600;
+  font-size: 16px;
+  text-transform: uppercase;
+  border-bottom: 1px #E5E5E5 solid;
+}
+#renameMCTable p {
+  line-height: 20px;
+}
+#renameMCTable .button_holder {
+  justify-content: end !important;
+  margin: 16px 0 0 0;
+}
+#renameMCTable .button_holder button:last-child {
+  margin-right: 0;
+}
+#renameMCTable.warning_popup h2::before {
+  padding-right: 8px;
+  font-family: "Font Awesome 5 Free";
+  content: "";
+  font-size: 14px;
+  color: #FFC700;
+}
+
+/*delete table popup*/
+#deleteMCTable {
+  /*max-height: 90vh;
+  overflow-y: scroll;*/
+  max-width: 90vw;
+  padding: 16px;
+  font-size: 16px;
+  line-height: 20px;
+  background-color: white;
+  display: none;
+  position: fixed;
+  left: calc(50% - 275px);
+  top: 40vh;
+  z-index: 999;
+  margin: 10px;
+  width: 550px;
+}
+#deleteMCTable .popup_close {
+  position: absolute !important;
+  top: 10px;
+  right: 10px;
+  z-index: 9999;
+  font-size: 12px !important;
+  color: #777777;
+}
+#deleteMCTable .popup_close:hover {
+  color: #333333;
+}
+#deleteMCTable .popup_close a {
+  color: #777777;
+  text-decoration: none;
+}
+#deleteMCTable .popup_close a:hover {
+  color: #333333;
+}
+#deleteMCTable h2,
+#deleteMCTable .divPopUp_top {
+  width: 100%;
+  margin-top: 3px;
+  margin-bottom: 16px;
+  padding-bottom: 8px;
+  font-weight: 600;
+  font-size: 16px;
+  text-transform: uppercase;
+  border-bottom: 1px #E5E5E5 solid;
+}
+#deleteMCTable p {
+  line-height: 20px;
+}
+#deleteMCTable .button_holder {
+  justify-content: end !important;
+  margin: 16px 0 0 0;
+}
+#deleteMCTable .button_holder button:last-child {
+  margin-right: 0;
+}
+#deleteMCTable.warning_popup h2::before {
+  padding-right: 8px;
+  font-family: "Font Awesome 5 Free";
+  content: "";
+  font-size: 14px;
+  color: #FFC700;
+}
+
+/*tables list popup*/
+#div_mc_tables {
+  display: none;
+  width: 350px;
+  height: 280px;
+}
+#div_mc_tables #mc_tables_left {
+  margin-bottom: 10px;
+}
+
+#mc_tables {
+  cursor: pointer;
+  width: 99%;
+  height: 160px;
+  display: inline-block;
+  border: 1px solid gray;
+}
+#mc_tables .option {
+  padding: 1px;
+}
+#mc_tables .active {
+  background-color: #1E88E5;
+  color: white;
+  border-bottom: 1px solid #E5E5E5;
+}
+
 #custom_report_alert {
   display: none;
   margin-left: -200px;
@@ -16019,534 +16328,233 @@ iframe#ifmcontentstoprint {
   background-color: #74ACFF !important;
 }
 
-#mc_holder {
-  overflow: hidden;
-  margin-top: 20px;
-  min-height: 500px;
+#anketa_edit.subpage_multicrosstabs {
+  display: flex;
+  flex-direction: column;
 }
-#mc_holder .mc_table_bottom_settings {
-  clear: none;
-  float: right;
-  border-collapse: collapse;
-  margin: 0 2% 15px 0;
-  width: 72%;
+#anketa_edit.subpage_multicrosstabs .mc_settings_links {
+  align-self: center;
+  display: flex;
+  position: relative;
+  width: auto;
+  margin-bottom: 32px;
 }
-#mc_holder .custom_report_include {
-  clear: none;
-  float: left;
-  border-collapse: collapse;
-  margin: 0 2% 15px 0;
+#anketa_edit.subpage_multicrosstabs .mc_settings_links .table_list {
+  display: flex;
+  border-right: 1px #E5E5E5 solid;
 }
-
-/*drag list of questions*/
-#spr_list {
-  float: left;
-  overflow: auto;
-  position: fixed;
-  width: 20%;
-  max-height: 450px;
-  margin: 15px 0 15px 1%;
-  background-color: white;
-  border: 1px solid silver;
-  border-radius: 7px;
-  -moz-border-radius: 7px 7px 7px 7px;
-  -webkit-border-radius: 7px;
+#anketa_edit.subpage_multicrosstabs .mc_settings_links .table_list .table_item {
+  cursor: pointer;
+  padding: 4px 32px;
+  margin-right: 16px;
+  line-height: 20px;
+  color: #C4C4C4;
+  border-bottom: 1px #C4C4C4 solid;
+  transition: 0.2s;
 }
-#spr_list ul {
+#anketa_edit.subpage_multicrosstabs .mc_settings_links .table_list .table_item.active, #anketa_edit.subpage_multicrosstabs .mc_settings_links .table_list .table_item:hover {
+  color: #1E88E5;
+  border-bottom: 1px #1E88E5 solid;
+}
+#anketa_edit.subpage_multicrosstabs .mc_settings_links .table_settings {
+  display: flex;
+  align-items: center;
+}
+#anketa_edit.subpage_multicrosstabs .mc_settings_links .table_settings .faicon:before {
+  cursor: pointer;
+  margin-left: 16px;
+  font-size: 16px;
+  color: #1E88E5;
+  transition: 0.2s;
+}
+#anketa_edit.subpage_multicrosstabs .mc_settings_links .table_settings .faicon:hover:before {
+  color: #0059ab;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder {
+  display: flex;
+  flex-direction: column;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder #spr_list {
+  box-sizing: border-box;
+  margin-bottom: 50px;
+  padding: 4px;
+  border: 1px solid #E5E5E5;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder #spr_list ul {
+  display: flex;
+  flex-wrap: wrap;
   padding: 0;
-  padding: 5px 0;
-  z-index: 1;
+  margin: 0;
 }
-
-.mc_draggable {
-  width: 180px;
-  margin: 10px 15px;
+#anketa_edit.subpage_multicrosstabs #mc_holder #spr_list ul li.mc_draggable {
+  cursor: pointer;
+  box-sizing: border-box;
+  width: 210px;
+  margin: 4px;
   padding: 8px;
   list-style: none;
-  border: 1px #E5E5E5 dashed;
+  background-color: #F8F8F8;
 }
-.mc_draggable:hover {
+#anketa_edit.subpage_multicrosstabs #mc_holder #spr_list ul li.mc_draggable:hover {
   background-color: #E5E5E5;
-  cursor: pointer;
 }
-
-/*title of table*/
-.mc_table_title {
-  float: right;
-  table-layout: fixed;
+#anketa_edit.subpage_multicrosstabs #mc_holder #spr_list ul li.mc_draggable .strong {
+  font-weight: 600;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder #spr_list ul li.mc_draggable .strong .faicon:before {
+  margin-right: 8px;
+  color: #C4C4C4;
+  font-size: 14px;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table_title {
+  display: none;
   width: 70%;
   min-height: 15px;
-  margin: 15px 2% 15px 0;
-  padding: 5px 1%;
   font-size: 16px;
   font-weight: bold;
-  border-collapse: collapse;
 }
-.mc_table_title:hover {
-  cursor: text;
-  background-color: #E5E5E5;
-}
-.mc_table_title .multicrosstab_title_inline:focus {
-  outline: none;
-}
-
-.mc_table_title.writing {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table_title.mc_table_title.writing {
   background-color: #E5E5E5;
   outline: 1px dashed #E5E5E5;
 }
-
-/*multicrosstab table*/
-.mc_table {
-  float: right;
-  table-layout: fixed;
-  width: 72%;
-  margin: 15px 2% 15px 0;
-  border-collapse: collapse;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table_title:hover {
+  cursor: text;
+  background-color: #E5E5E5;
 }
-.mc_table tr {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table_title .multicrosstab_title_inline:focus {
+  outline: none;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table {
+  table-layout: fixed;
+  width: 100%;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr {
   height: 40px;
 }
-.mc_table tr td {
-  border: 1px #E5E5E5 solid;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td {
   text-align: center;
+  font-size: 14px;
+  padding: 8px;
+  border: 1px #E5E5E5 solid;
 }
-.mc_table tr td table.mc_inner_cell {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td table.mc_inner_cell {
   width: 100%;
   height: 100%;
   border-collapse: collapse;
+  margin: 0;
+  padding: 0;
 }
-.mc_table tr td table.mc_inner_cell tr {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td table.mc_inner_cell tr {
   width: 100%;
   height: auto;
 }
-.mc_table tr td table.mc_inner_cell tr td {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td table.mc_inner_cell tr td {
+  width: 100%;
   border: 0;
   border-top: 1px dashed #E5E5E5;
-  width: 100%;
 }
-.mc_table tr td table.mc_inner_cell tr:first-child td {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td table.mc_inner_cell tr:first-child td {
   border: 0;
 }
-.mc_table tr td .delete_var {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td .delete_var {
   display: none;
   position: absolute;
+  margin: -30px -8px;
   width: 16px;
   height: 16px;
-  margin: -25px 0 0 0;
-  background-image: url("../../../admin/survey/img_0/cross.png");
 }
-.mc_table tr td.borderless {
-  border: 0;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td .delete_var .faicon:before {
+  color: #1E88E5;
+  font-size: 14px;
 }
-.mc_table tr td.spr {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.borderless {
+  background-color: #F8F8F8;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.spr {
   cursor: pointer;
-  font-weight: bold;
-  background-color: #E5E5E5;
+  padding: 16px;
+  font-weight: 600;
+  font-size: 16px;
+  background-color: #F8F8F8;
 }
-.mc_table tr td.var {
-  background-color: #E5E5E5;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.var {
+  background-color: #F2F2F2;
 }
-.mc_table tr td.sums {
-  color: #FFC700;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.var.horizontal {
+  background-color: #FFFFFF;
 }
-.mc_table tr td.data {
-  background-color: #F9F9F7;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.sums {
+  font-weight: 600;
 }
-.mc_table tr td.crossCheck_EC {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.data {
+  padding: 0;
+  background-color: #FFFFFF;
+}
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.crossCheck_EC {
   background-color: #FFFAE8;
 }
-.mc_table tr td.crossCheck_RE {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.crossCheck_RE {
   background-color: #FFFAE8;
 }
-.mc_table tr td.crossCheck_SR {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.crossCheck_SR {
   background-color: #FFECA2;
 }
-.mc_table tr td.crossCheck_AR {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.crossCheck_AR {
   background-color: #FFDA46;
 }
-.mc_table tr td.rsdl_bck0 {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.rsdl_bck0 {
   background-color: white;
 }
-.mc_table tr td.rsdl_bck1 {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.rsdl_bck1 {
   background-color: #FFE8E8;
 }
-.mc_table tr td.rsdl_bck2 {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.rsdl_bck2 {
   background-color: #FFD1D1;
 }
-.mc_table tr td.rsdl_bck3 {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.rsdl_bck3 {
   background-color: #FF8B8B;
 }
-.mc_table tr td.rsdl_bck4 {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.rsdl_bck4 {
   background-color: #E8F1FF;
 }
-.mc_table tr td.rsdl_bck5 {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.rsdl_bck5 {
   background-color: #B9D5FF;
 }
-.mc_table tr td.rsdl_bck6 {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.rsdl_bck6 {
   background-color: #74ACFF;
 }
-.mc_table tr td.white {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.white {
   background-color: white;
 }
-.mc_table tr td.red {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.red {
   background-color: #FFD1D1;
 }
-.mc_table tr td.blue {
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.blue {
   background-color: #E8F1FF;
 }
-.mc_table tr td.drophover {
-  background-color: #FFC700 !important;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.empty {
+  background-color: #F8F8F8;
 }
-.mc_table tr td.empty {
-  border: 1px dashed #E5E5E5;
-  font-weight: normal;
-}
-.mc_table tr td.empty.droppable {
-  color: #FFC700;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.empty.droppable {
   border: 1px dashed #FFC700;
-  background-color: #FFC700;
+  background-color: rgba(255, 199, 0, 0.05);
 }
-
-/*settings links in top left corner*/
-.mc_settings_links {
-  float: none;
-  display: inline-block;
-  position: relative;
-  width: auto;
-  left: 200px;
-  padding: 3px 5px;
-  margin: 0 40px 0 0;
-  background-color: #E5E5E5;
-  border: 1px solid silver;
-  border-radius: 3px;
-  -moz-border-radius: 4px 4px 4px 4px;
-  -webkit-border-radius: 4px;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table tr td.drophover {
+  background-color: rgba(255, 199, 0, 0.2) !important;
 }
-.mc_settings_links ul {
-  margin: 0 !important;
-  padding: 0;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table_top_settings {
+  display: flex;
+  justify-content: end;
+  margin-bottom: 8px;
 }
-.mc_settings_links ul li {
-  display: inline-block;
-  list-style: none outside none;
-  margin: 0 !important;
-  padding: 2px 1px;
-  vertical-align: middle;
-}
-.mc_settings_links ul li > span {
-  vertical-align: middle;
-  cursor: pointer;
-}
-.mc_settings_links ul li.space {
-  background: url("../../../admin/survey/img_0/navigation/nav-control-bg.png") no-repeat scroll center top transparent;
-  line-height: 17px;
-  padding: 0 5px;
-  width: 7px;
-}
-
-/*table settings popup*/
-.mc_table_settings {
-  /*max-height: 90vh;
-  overflow-y: scroll;*/
-  max-width: 90vw;
-  padding: 16px;
-  font-size: 16px;
-  line-height: 20px;
-  background-color: white;
-  display: none;
-  position: fixed;
-  top: 200px;
-  left: calc(50% - 200px);
-  z-index: 999;
-  width: 400px;
-}
-.mc_table_settings .popup_close {
-  position: absolute !important;
-  top: 10px;
-  right: 10px;
-  z-index: 9999;
-  font-size: 12px !important;
-  color: #777777;
-}
-.mc_table_settings .popup_close:hover {
-  color: #333333;
-}
-.mc_table_settings .popup_close a {
-  color: #777777;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table_top_settings .custom_report_include a {
   text-decoration: none;
 }
-.mc_table_settings .popup_close a:hover {
-  color: #333333;
-}
-.mc_table_settings h2,
-.mc_table_settings .divPopUp_top {
-  width: 100%;
-  margin-top: 3px;
-  margin-bottom: 16px;
-  padding-bottom: 8px;
-  font-weight: 600;
-  font-size: 16px;
-  text-transform: uppercase;
-  border-bottom: 1px #E5E5E5 solid;
-}
-.mc_table_settings p {
-  line-height: 20px;
-}
-.mc_table_settings .button_holder {
-  justify-content: end !important;
-  margin: 16px 0 0 0;
-}
-.mc_table_settings .button_holder button:last-child {
-  margin-right: 0;
-}
-.mc_table_settings.warning_popup h2::before {
-  padding-right: 8px;
-  font-family: "Font Awesome 5 Free";
-  content: "";
-  font-size: 14px;
-  color: #FFC700;
-}
-.mc_table_settings #mcSettingsButtons {
-  position: absolute;
-  bottom: 15px;
-  right: 10px;
-}
-.mc_table_settings #delez {
-  width: 300px;
-  margin: 5px 10px 0px 60px;
-}
-.mc_table_settings form {
-  padding: 10px;
-}
-.mc_table_settings fieldset {
-  margin: 0px 0px 10px 0px;
-  border: 0;
-  border-top: 1px solid #1E88E5;
-}
-.mc_table_settings legend {
-  color: #1E88E5;
-  font-size: 13px;
-  font-weight: 500;
-  margin: 0;
-  padding: 0 10px;
-}
-
-/*tables list popup*/
-#div_mc_tables {
-  display: none;
-  width: 350px;
-  height: 280px;
-}
-#div_mc_tables #mc_tables_left {
-  margin-bottom: 10px;
-}
-
-#mc_tables {
-  cursor: pointer;
-  width: 99%;
-  height: 160px;
-  display: inline-block;
-  border: 1px solid gray;
-}
-#mc_tables .option {
-  padding: 1px;
-}
-#mc_tables .active {
-  background-color: #1E88E5;
-  color: white;
-  border-bottom: 1px solid #E5E5E5;
-}
-
-/*new table popup*/
-#newMCTable {
-  /*max-height: 90vh;
-  overflow-y: scroll;*/
-  max-width: 90vw;
-  padding: 16px;
-  font-size: 16px;
-  line-height: 20px;
-  background-color: white;
-  display: none;
-  position: fixed;
-  left: calc(50% - 275px);
-  top: 40vh;
-  z-index: 999;
-  margin: 10px;
-  width: 550px;
-}
-#newMCTable .popup_close {
-  position: absolute !important;
-  top: 10px;
-  right: 10px;
-  z-index: 9999;
-  font-size: 12px !important;
-  color: #777777;
-}
-#newMCTable .popup_close:hover {
-  color: #333333;
-}
-#newMCTable .popup_close a {
-  color: #777777;
-  text-decoration: none;
-}
-#newMCTable .popup_close a:hover {
-  color: #333333;
-}
-#newMCTable h2,
-#newMCTable .divPopUp_top {
-  width: 100%;
-  margin-top: 3px;
-  margin-bottom: 16px;
-  padding-bottom: 8px;
-  font-weight: 600;
-  font-size: 16px;
-  text-transform: uppercase;
-  border-bottom: 1px #E5E5E5 solid;
-}
-#newMCTable p {
-  line-height: 20px;
-}
-#newMCTable .button_holder {
-  justify-content: end !important;
-  margin: 16px 0 0 0;
-}
-#newMCTable .button_holder button:last-child {
-  margin-right: 0;
-}
-#newMCTable.warning_popup h2::before {
-  padding-right: 8px;
-  font-family: "Font Awesome 5 Free";
-  content: "";
-  font-size: 14px;
-  color: #FFC700;
-}
-
-/*rename table popup*/
-#renameMCTable {
-  /*max-height: 90vh;
-  overflow-y: scroll;*/
-  max-width: 90vw;
-  padding: 16px;
-  font-size: 16px;
-  line-height: 20px;
-  background-color: white;
-  display: none;
-  position: fixed;
-  left: calc(50% - 275px);
-  top: 40vh;
-  z-index: 999;
-  margin: 10px;
-  width: 550px;
-}
-#renameMCTable .popup_close {
-  position: absolute !important;
-  top: 10px;
-  right: 10px;
-  z-index: 9999;
-  font-size: 12px !important;
-  color: #777777;
-}
-#renameMCTable .popup_close:hover {
-  color: #333333;
-}
-#renameMCTable .popup_close a {
-  color: #777777;
-  text-decoration: none;
-}
-#renameMCTable .popup_close a:hover {
-  color: #333333;
-}
-#renameMCTable h2,
-#renameMCTable .divPopUp_top {
-  width: 100%;
-  margin-top: 3px;
-  margin-bottom: 16px;
-  padding-bottom: 8px;
-  font-weight: 600;
-  font-size: 16px;
-  text-transform: uppercase;
-  border-bottom: 1px #E5E5E5 solid;
-}
-#renameMCTable p {
-  line-height: 20px;
-}
-#renameMCTable .button_holder {
-  justify-content: end !important;
-  margin: 16px 0 0 0;
-}
-#renameMCTable .button_holder button:last-child {
-  margin-right: 0;
-}
-#renameMCTable.warning_popup h2::before {
-  padding-right: 8px;
-  font-family: "Font Awesome 5 Free";
-  content: "";
-  font-size: 14px;
-  color: #FFC700;
-}
-
-/*delete table popup*/
-#deleteMCTable {
-  /*max-height: 90vh;
-  overflow-y: scroll;*/
-  max-width: 90vw;
-  padding: 16px;
-  font-size: 16px;
-  line-height: 20px;
-  background-color: white;
-  display: none;
-  position: fixed;
-  left: calc(50% - 275px);
-  top: 40vh;
-  z-index: 999;
-  margin: 10px;
-  width: 550px;
-}
-#deleteMCTable .popup_close {
-  position: absolute !important;
-  top: 10px;
-  right: 10px;
-  z-index: 9999;
-  font-size: 12px !important;
-  color: #777777;
-}
-#deleteMCTable .popup_close:hover {
-  color: #333333;
-}
-#deleteMCTable .popup_close a {
-  color: #777777;
-  text-decoration: none;
-}
-#deleteMCTable .popup_close a:hover {
-  color: #333333;
-}
-#deleteMCTable h2,
-#deleteMCTable .divPopUp_top {
-  width: 100%;
-  margin-top: 3px;
-  margin-bottom: 16px;
-  padding-bottom: 8px;
-  font-weight: 600;
-  font-size: 16px;
-  text-transform: uppercase;
-  border-bottom: 1px #E5E5E5 solid;
-}
-#deleteMCTable p {
-  line-height: 20px;
-}
-#deleteMCTable .button_holder {
-  justify-content: end !important;
-  margin: 16px 0 0 0;
-}
-#deleteMCTable .button_holder button:last-child {
-  margin-right: 0;
-}
-#deleteMCTable.warning_popup h2::before {
-  padding-right: 8px;
-  font-family: "Font Awesome 5 Free";
-  content: "";
-  font-size: 14px;
-  color: #FFC700;
+#anketa_edit.subpage_multicrosstabs #mc_holder .mc_table_bottom_settings .mc_table_legend {
+  border-collapse: collapse;
+  line-height: 18px;
+  border: 1px solid #E5E5E5;
+  background-color: #F9F9F7;
 }
 
 .report_element_data table.mc_table {
@@ -16566,16 +16574,6 @@ iframe#ifmcontentstoprint {
   display: none;
 }
 
-.mc_table_legend {
-  clear: none;
-  float: right;
-  border-collapse: collapse;
-  padding: 5px 10px;
-  line-height: 18px;
-  border: 1px solid #E5E5E5;
-  background-color: #F9F9F7;
-}
-
 .ttest_chart_holder {
   margin-left: 0px;
 }
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index f78205bf9..c76e21a2f 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -152,6 +152,10 @@ span.faicon.filter::before{
         content: "\f0b0";
 }
 
+span.faicon.grip::before{
+    content: "\f58e";
+}
+
 span.faicon.star::before,
 span.faicon.star_off::before{
 		font-size: 14px;
diff --git a/resources/sass/admin_new/components/popup/page_specific/analysis_multicrosstabs.scss b/resources/sass/admin_new/components/popup/page_specific/analysis_multicrosstabs.scss
new file mode 100644
index 000000000..85450d85c
--- /dev/null
+++ b/resources/sass/admin_new/components/popup/page_specific/analysis_multicrosstabs.scss
@@ -0,0 +1,94 @@
+
+/*table settings popup*/
+.mc_table_settings {
+    @include popup_general();
+
+	display: none;
+	position: fixed;
+	top: 200px;
+	left: calc(50% - 200px);
+	z-index: 999;
+	width: 400px;
+
+	#mcSettingsButtons {
+		position: absolute;
+		bottom: 15px;
+		right: 10px;
+	}
+	#delez {
+		width: 300px;
+		margin: 5px 10px 0px 60px;
+	}
+	form {
+		padding: 10px;
+	}
+	fieldset {
+		margin: 0px 0px 10px 0px;
+		border: 0;
+		border-top: 1px solid $blue;
+	}
+	legend {
+		color: $blue;
+		font-size: 13px;
+		font-weight: 500;
+		margin: 0;
+		padding: 0 10px;
+	}
+}
+
+@mixin small_popup_multicross(){
+    @include popup_general();
+
+    display: none;
+    position: fixed;
+	left: calc(50% - 275px);
+	top: 40vh;
+	z-index: 999;
+
+	margin: 10px;
+	width: 550px;
+	
+}
+
+/*new table popup*/
+#newMCTable {
+	@include small_popup_multicross();
+}
+
+/*rename table popup*/
+#renameMCTable {
+	@include small_popup_multicross();
+}
+
+/*delete table popup*/
+#deleteMCTable {
+	@include small_popup_multicross();
+}
+
+
+/*tables list popup*/
+#div_mc_tables {
+	display: none;
+
+	width: 350px;
+	height: 280px;
+
+	#mc_tables_left {
+		margin-bottom: 10px;
+	}
+}
+#mc_tables {
+	cursor: pointer;
+	width: 99%;
+	height: 160px;
+	display: inline-block;
+	border: 1px solid gray;
+	.option {
+		padding: 1px;
+	}
+	.active {
+		background-color: $blue;
+		color: white;
+		border-bottom: 1px solid $gray;
+	}
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/components/popup/page_specific/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific/page_specific.scss
index 31d5e3487..284046836 100644
--- a/resources/sass/admin_new/components/popup/page_specific/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific/page_specific.scss
@@ -6,6 +6,7 @@
 @import "consulting";
 @import "dodeljeni_uporabniki";
 
+@import "analysis_multicrosstabs";
 @import "custom_report";
 
 @import "survey_edit";
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss b/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss
index 5d42012d5..ba18614c2 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss
@@ -1,311 +1,324 @@
+#anketa_edit.subpage_multicrosstabs{
+    display: flex;
+    flex-direction: column;
 
-#mc_holder {
-	overflow: hidden;
-	margin-top: 20px;
-	min-height: 500px;
-	.mc_table_bottom_settings {
-		clear: none;
-		float: right;
-		border-collapse: collapse;
-		margin: 0 2% 15px 0;
-		width: 72%;
-	}
-	.custom_report_include {
-		clear: none;
-		float: left;
-		border-collapse: collapse;
-		margin: 0 2% 15px 0;
-	}
-}
-/*drag list of questions*/
-#spr_list {
-	float: left;
-	overflow: auto;
-	position: fixed;
-	width: 20%;
-	max-height: 450px;
-	margin: 15px 0 15px 1%;
-	background-color: white;
-	border: 1px solid silver;
-	border-radius: 7px;
-	-moz-border-radius: 7px 7px 7px 7px;
-	-webkit-border-radius: 7px;
-	ul {
-		padding: 0;
-		padding: 5px 0;
-		z-index: 1;
-	}
-}
-.mc_draggable {
-	width: 180px;
-	margin: 10px 15px;
-	padding: 8px;
-	list-style: none;
-	border: 1px $gray dashed;
-	&:hover {
-		background-color: $gray;
-		cursor: pointer;
-	}
-}
-/*title of table*/
-.mc_table_title {
-	float: right;
-	table-layout: fixed;
-	width: 70%;
-	min-height: 15px;
-	margin: 15px 2% 15px 0;
-	padding: 5px 1%;
-	font-size: 16px;
-	font-weight: bold;
-	border-collapse: collapse;
-	&:hover {
-		cursor: text;
-		background-color: $gray;
-	}
-        .multicrosstab_title_inline:focus {
-                outline: none;
+    // settings links in top left corner
+    .mc_settings_links {
+        align-self: center;
+        display: flex;
+
+        position: relative;
+        width: auto;
+        margin-bottom: 32px;
+
+        .table_list{
+            display: flex;
+
+            .table_item{
+                cursor: pointer;
+
+                padding: 4px 32px;
+                margin-right: 16px;
+
+                line-height: 20px;
+                color: $dark-gray;
+
+                border-bottom: 1px $dark-gray solid;
+
+                transition: 0.2s;
+
+                &.active,
+                &:hover{
+                    color: $blue;
+
+                    border-bottom: 1px $blue solid;
+                }
+            }
+
+            border-right: 1px $gray solid;
         }
-}
-.mc_table_title.writing {
-	background-color: $gray;
-	outline: 1px dashed $gray;
-}
-/*multicrosstab table*/
-.mc_table {
-	float: right;
-	table-layout: fixed;
-	width: 72%;
-	margin: 15px 2% 15px 0;
-	border-collapse: collapse;
-	tr {
-		height: 40px;
-		td {
-			border: 1px $gray solid;
-			text-align: center;
-			table.mc_inner_cell {
-				width: 100%;
-				height: 100%;
-				border-collapse: collapse;
-				tr {
-					width: 100%;
-					height: auto;
-					td {
-						border: 0;
-						border-top: 1px dashed $gray;
-						width: 100%;
-					}
-					&:first-child {
-						td {
-							border: 0;
-						}
-					}
-				}
-			}
-			.delete_var {
-				display: none;
-				position: absolute;
-				width: 16px;
-				height: 16px;
-				margin: -25px 0 0 0;
-				background-image: url("../../../admin/survey/img_0/cross.png");
-			}
-		}
-		td.borderless {
-			border: 0;
-		}
-		td.spr {
-			cursor: pointer;
-			font-weight: bold;
-			background-color: $gray;
-		}
-		td.var {
-			background-color: $gray;
-		}
-		td.sums {
-			color: $yellow;
-		}
-		td.data {
-			background-color: #F9F9F7;
-		}
-		td.crossCheck_EC {
-			background-color: #FFFAE8;
-		}
-		td.crossCheck_RE {
-			background-color: #FFFAE8;
-		}
-		td.crossCheck_SR {
-			background-color: #FFECA2;
-		}
-		td.crossCheck_AR {
-			background-color: #FFDA46;
-		}
-		td.rsdl_bck0 {
-			background-color: white;
-		}
-		td.rsdl_bck1 {
-			background-color: #FFE8E8;
-		}
-		td.rsdl_bck2 {
-			background-color: #FFD1D1;
-		}
-		td.rsdl_bck3 {
-			background-color: #FF8B8B;
-		}
-		td.rsdl_bck4 {
-			background-color: #E8F1FF;
-		}
-		td.rsdl_bck5 {
-			background-color: #B9D5FF;
-		}
-		td.rsdl_bck6 {
-			background-color: #74ACFF;
-		}
-		td.white {
-			background-color: white;
-		}
-		td.red {
-			background-color: #FFD1D1;
-		}
-		td.blue {
-			background-color: #E8F1FF;
-		}
-		td.drophover {
-			background-color: $yellow !important;
-		}
-		td.empty {
-			border: 1px dashed $gray;
-			font-weight: normal;
-		}
-		td.empty.droppable {
-			color: $yellow;
-			border: 1px dashed $yellow;
-			background-color: $yellow;
-		}
-	}
-}
-/*settings links in top left corner*/
-.mc_settings_links {
-	float: none;
-	display: inline-block;
-	position: relative;
-	width: auto;
-	left: 200px;
-	padding: 3px 5px;
-	margin: 0 40px 0 0;
-	background-color: $gray;
-	border: 1px solid silver;
-	border-radius: 3px;
-	-moz-border-radius: 4px 4px 4px 4px;
-	-webkit-border-radius: 4px;
-	ul {
-		margin: 0 !important;
-		padding: 0;
-		li {
-			display: inline-block;
-			list-style: none outside none;
-			margin: 0 !important;
-			padding: 2px 1px;
-                        vertical-align: middle;
-			>span {
-                                vertical-align: middle;
-				cursor: pointer;
-			}
-		}
-		li.space {
-			background: url("../../../admin/survey/img_0/navigation/nav-control-bg.png") no-repeat scroll center top transparent;
-			line-height: 17px;
-			padding: 0 5px;
-			width: 7px;
-		}
-	}
-}
-/*table settings popup*/
-.mc_table_settings {
-    @include popup_general();
 
-	display: none;
-	position: fixed;
-	top: 200px;
-	left: calc(50% - 200px);
-	z-index: 999;
-	width: 400px;
+        .table_settings{
+            display: flex;
+            align-items: center;
 
-	#mcSettingsButtons {
-		position: absolute;
-		bottom: 15px;
-		right: 10px;
-	}
-	#delez {
-		width: 300px;
-		margin: 5px 10px 0px 60px;
-	}
-	form {
-		padding: 10px;
-	}
-	fieldset {
-		margin: 0px 0px 10px 0px;
-		border: 0;
-		border-top: 1px solid $blue;
-	}
-	legend {
-		color: $blue;
-		font-size: 13px;
-		font-weight: 500;
-		margin: 0;
-		padding: 0 10px;
-	}
-}
-/*tables list popup*/
-#div_mc_tables {
-	display: none;
+            .faicon{
 
-	width: 350px;
-	height: 280px;
+                &:before{
+                    cursor: pointer;
+                    
+                    margin-left: 16px;
+                    
+                    font-size: 16px;
+                    color: $blue;
 
-	#mc_tables_left {
-		margin-bottom: 10px;
-	}
-}
-#mc_tables {
-	cursor: pointer;
-	width: 99%;
-	height: 160px;
-	display: inline-block;
-	border: 1px solid gray;
-	.option {
-		padding: 1px;
-	}
-	.active {
-		background-color: $blue;
-		color: white;
-		border-bottom: 1px solid $gray;
-	}
-}
-@mixin small_popup_multicross(){
-    @include popup_general();
+                    transition: 0.2s;
+                }
 
-    display: none;
-    position: fixed;
-	left: calc(50% - 275px);
-	top: 40vh;
-	z-index: 999;
+                &:hover{
+                    &:before{
+                        color: $dark-blue;
+                    }
+                }
+            }
+        }
+    }
 
-	margin: 10px;
-	width: 550px;
-	
-}
-/*new table popup*/
-#newMCTable {
-	@include small_popup_multicross();
-}
-/*rename table popup*/
-#renameMCTable {
-	@include small_popup_multicross();
-}
-/*delete table popup*/
-#deleteMCTable {
-	@include small_popup_multicross();
+
+    #mc_holder {
+        display: flex;
+        flex-direction: column;
+        
+        // drag list of questions
+        #spr_list {
+            box-sizing: border-box;
+            margin-bottom: 50px;
+            padding: 4px;
+
+            border: 1px solid $gray;
+            
+            ul {
+                display: flex;
+                flex-wrap: wrap;
+
+                padding: 0;
+                margin: 0;
+
+                li.mc_draggable{
+                    cursor: pointer;
+
+                    box-sizing: border-box;
+                    width: 210px;
+                    margin: 4px;
+                    padding: 8px;
+
+                    list-style: none;
+                    
+                    background-color: $light-gray;
+
+                    &:hover {
+                        background-color: $gray;  
+                    }
+
+                    .strong{
+                        font-weight: 600;
+
+                        .faicon:before{
+                            margin-right: 8px;
+
+                            color: $dark-gray;
+                            font-size: 14px;
+                        }
+                    }
+                }
+            }   
+        }
+
+        // title of table
+        .mc_table_title {
+            display: none;
+            
+            width: 70%;
+            min-height: 15px;
+
+            font-size: 16px;
+            font-weight: bold;
+
+            &.mc_table_title.writing {
+                background-color: $gray;
+                outline: 1px dashed $gray;
+            }
+
+            &:hover {
+                cursor: text;
+                background-color: $gray;
+            }
+
+            .multicrosstab_title_inline:focus {
+                outline: none;
+            }
+        }
+        
+
+        // multicrosstab table
+        .mc_table {
+            table-layout: fixed;
+            width: 100%;
+
+            tr {
+                height: 40px;
+
+                td {
+                    text-align: center;
+                    font-size: 14px;
+
+                    padding: 8px;
+
+                    border: 1px $gray solid;
+
+                    table.mc_inner_cell {
+                        width: 100%;
+                        height: 100%;
+                        border-collapse: collapse;
+
+                        margin: 0;
+                        padding: 0;
+
+                        tr {
+                            width: 100%;
+                            height: auto;
+
+                            td {
+                                width: 100%;
+
+                                border: 0;
+                                border-top: 1px dashed $gray;
+                            }
+                            &:first-child {
+                                td {
+                                    border: 0;
+                                }
+                            }
+                        }
+                    }
+
+                    .delete_var {
+                        display: none;
+                        position: absolute;
+                        margin: -30px -8px;
+
+                        width: 16px;
+                        height: 16px;
+
+                        .faicon:before{
+                            color: $blue;
+                            font-size: 14px;
+                        }
+                    }
+                }
+
+                td.borderless {
+                    background-color: $light-gray;
+                }
+
+                td.spr {
+                    //position: relative;
+                    cursor: pointer;
+
+                    padding: 16px;
+
+                    font-weight: 600;
+                    font-size: 16px;
+
+                    background-color: $light-gray;
+                }
+
+                td.var {                    
+                    background-color: $light-gray2;
+
+                    &.horizontal{
+                        background-color: $white;
+                    }
+                }
+
+                td.sums {
+                    font-weight: 600;
+                }
+
+                td.data {
+                    padding: 0;
+
+                    background-color: $white;
+                }
+
+                td.crossCheck_EC {
+                    background-color: #FFFAE8;
+                }
+                td.crossCheck_RE {
+                    background-color: #FFFAE8;
+                }
+                td.crossCheck_SR {
+                    background-color: #FFECA2;
+                }
+                td.crossCheck_AR {
+                    background-color: #FFDA46;
+                }
+                td.rsdl_bck0 {
+                    background-color: white;
+                }
+                td.rsdl_bck1 {
+                    background-color: #FFE8E8;
+                }
+                td.rsdl_bck2 {
+                    background-color: #FFD1D1;
+                }
+                td.rsdl_bck3 {
+                    background-color: #FF8B8B;
+                }
+                td.rsdl_bck4 {
+                    background-color: #E8F1FF;
+                }
+                td.rsdl_bck5 {
+                    background-color: #B9D5FF;
+                }
+                td.rsdl_bck6 {
+                    background-color: #74ACFF;
+                }
+                td.white {
+                    background-color: white;
+                }
+                td.red {
+                    background-color: #FFD1D1;
+                }
+                td.blue {
+                    background-color: #E8F1FF;
+                }
+
+                
+                td.empty {
+                    background-color: $light-gray;
+                }
+
+                td.empty.droppable {
+                    border: 1px dashed $yellow;
+                    background-color: rgba(255, 199, 0, 0.05);
+                }
+
+                td.drophover {
+                    background-color: rgba(255, 199, 0, 0.2) !important;
+                }
+            }
+        }
+
+        .mc_table_top_settings {
+            display: flex;
+            justify-content: end;
+
+            margin-bottom: 8px;
+
+            .custom_report_include {
+                a{
+                    text-decoration: none;
+                }
+            }
+        }
+
+        .mc_table_bottom_settings {
+
+            .mc_table_legend {
+                border-collapse: collapse;
+                line-height: 18px;
+                border: 1px solid $gray;
+                background-color: #F9F9F7;
+            }
+        }
+    }
 }
+
+
+
+
+
 .report_element_data {
 	table.mc_table {
 		float: left;
@@ -328,12 +341,5 @@
 		}
 	}
 }
-.mc_table_legend {
-	clear: none;
-	float: right;
-	border-collapse: collapse;
-	padding: 5px 10px;
-	line-height: 18px;
-	border: 1px solid $gray;
-	background-color: #F9F9F7;
-}
+
+