diff --git a/admin/survey/classes/class.SurveyStatusProfiles.php b/admin/survey/classes/class.SurveyStatusProfiles.php
index 218394290..64d1a7073 100644
--- a/admin/survey/classes/class.SurveyStatusProfiles.php
+++ b/admin/survey/classes/class.SurveyStatusProfiles.php
@@ -349,50 +349,42 @@ class SurveyStatusProfiles
 		# preverimo kaere statuse disejblamo na podlagi izbire načina kreiranja datoteke (samo 5,6 / vsi satusi)
 		list($collect_all_status) = mysqli_fetch_row(sisplet_query("SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'"));
 
-		echo '<table>';
+		
+		echo '<div class="valid_units_wrap">';
 
-		echo '<tr>';
 		// dodamo veljavne
 		foreach (self::$appropriateStatus as $index) {
-			echo '<td style="width:50%">';
+			echo '<div class="valid_units_box">';
 			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
 			 ($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' disabled' : '' ). '/><label for="' . $index . '">';
 			echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
-			echo '</label></td>';
-			$cnt++;
+			echo '</label></div>';
 		}
-		echo '</tr>';
 
 		// dodamo neveljavne
-		echo '<tr>';
 		foreach (self::$unAppropriateStatus as $index) {
-			echo '<td style="width:50%">';
+			echo '<div class="valid_units_box">';
 			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') . 
 			 ($disabled  || ( (int)$collect_all_status == 0 && $index < 5  ) ? ' disabled' : '' ) . '/><label for="' . $index . '">';
 			//echo $lang['srv_userstatus_' . $index]. " (".$index.")";
 			echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
-			echo '</label></td>';
-			$cnt++;
+			echo '</label></div>';
 		}
-		echo '</tr>';
 
 		// dodamo null
-		echo '<tr>';
 		foreach (self::$unKnownStatus as $index) {
-			echo '<td style="width:50%">';
+			echo '<div class="valid_units_box">';
 			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
 			 ($disabled  || ( (int)$collect_all_status == 0 && $index < 5  ) ? ' disabled' : '' ) . '/><label for="' . $index . '">';
 			//echo $lang['srv_userstatus_' . $index]. " (".$index.")";
 			echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
-			echo '</label></td>';
-			$cnt++;
+			echo '</label></div>';
 		}
-		echo '</tr>';
 		
-		echo '</table>';
+		echo '</div>'; #valid_units_wrap
 		
 		echo '</fieldset>';
 		
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 338b61f99..b04431e44 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8420,11 +8420,19 @@ div#testiranje_preview_settings .testiranje_preview_settings_right .setting_hold
   display: inline-block;
 }
 
-fieldset.statusProfileFieldset table {
-  font-size: 14px !important;
-  white-space: nowrap;
+fieldset.statusProfileFieldset div.valid_units_wrap {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  width: 500px;
+  margin-top: -8px;
 }
-fieldset.statusProfileFieldset table td input[type=checkbox][disabled] + label:before {
+fieldset.statusProfileFieldset div.valid_units_wrap div.valid_units_box {
+  width: 50%;
+  margin-top: 8px;
+}
+fieldset.statusProfileFieldset div.valid_units_wrap div.valid_units_box input[type=checkbox][disabled] + label:before {
   color: #C4C4C4;
   pointer-events: none;
 }
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 599d81af0..5a6a4d8e0 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -340,11 +340,18 @@ div#testiranje_preview_settings {
 //Statusi
 fieldset.statusProfileFieldset {
 
-    table {
-        font-size: 14px !important;
-        white-space: nowrap;
+    div.valid_units_wrap {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        width: 500px;
+        margin-top: -8px;
+
+        div.valid_units_box {
+            width: 50%;
+            margin-top: 8px;
 
-        td {
             input {
                 &[type=checkbox][disabled] + label:before {
                     color: $dark-gray;