diff --git a/admin/survey/classes/class.SurveyStatusProfiles.php b/admin/survey/classes/class.SurveyStatusProfiles.php
index c00a00006..8a9f49142 100644
--- a/admin/survey/classes/class.SurveyStatusProfiles.php
+++ b/admin/survey/classes/class.SurveyStatusProfiles.php
@@ -225,8 +225,18 @@ class SurveyStatusProfiles
         echo '<div id="statusProfileCoverDiv"></div>';
         
         // div za shranjevanje novega profila
-        echo '<div id="newProfile">'.$lang['srv_missing_profile_name'].': ';
-        echo '<input id="newProfileName" name="newProfileName" type="text" size="45"  />';
+        echo '<div id="newProfile">';
+		
+		echo '<div class="setting_holder">';
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+		
         $button = new PopUpButton($lang['srv_save_profile']);
         echo $button -> setFloat('right')
         		->setButtonColor('orange')
@@ -234,12 +244,26 @@ class SurveyStatusProfiles
         $button = new PopUpButton($lang['srv_cancel']);
         echo $button -> setFloat('right')
         		-> addAction('onClick','statusProfileAction(\'newCancel\'); return false;');
+		
+		echo '</div>';
+
         echo '</div>';
 
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" size="45"  />';
+        echo '<div id="renameProfileDiv">';
+		
+		echo '<div class="setting_holder">';
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" class="text large"  />';
         echo '<input id="renameProfileId" type="hidden" value="' . $pid . '"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+		
+		
         $button = new PopUpButton($lang['srv_rename_profile_yes']);
         echo $button -> setFloat('right')
         		->setButtonColor('orange')
@@ -249,10 +273,16 @@ class SurveyStatusProfiles
         echo $button -> setFloat('right')
         		-> addAction('onClick','statusProfileAction(\'renameCancel\'); return false;');
         echo '</div>';
+        echo '</div>';
 
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . self::$profiles[$pid]['name'] . '</b>?';
-        echo '<input id="deleteProfileId" type="hidden" value="' . $pid . '"  />';
+        echo '<div id="deleteProfileDiv">';
+
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . self::$profiles[$pid]['name'] . '</span>?';
+		
+		echo '<input id="deleteProfileId" type="hidden" value="' . $pid . '"  />';
+
+        echo '<div class="button_holder">';
 
         $button = new PopUpButton($lang['srv_delete_profile_yes']);
         echo $button -> setButtonColor('orange')
@@ -261,6 +291,7 @@ class SurveyStatusProfiles
         $button = new PopUpButton($lang['srv_cancel']);
         echo $button -> addAction('onClick','statusProfileAction(\'deleteCancel\'); return false;');
         
+        echo '</div>';
         echo '</div>';
         
         $content = ob_get_clean();
@@ -317,9 +348,9 @@ class SurveyStatusProfiles
 				echo '</tr><tr>';
 			}
 			echo '<td style="width:50%">';
-			echo '<label><input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
+			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
-			 ($disabled || ( (int)$collect_all_status == 0 && $index < 5  )  ? ' disabled="true"' : '' ). '/>';
+			 ($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++;
@@ -329,9 +360,9 @@ class SurveyStatusProfiles
 			if ($cnt&1) 
 				echo '</tr><tr>';
 			echo '<td style="width:50%">';
-			echo '<label><input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
+			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') . 
-			 ($disabled  || ( (int)$collect_all_status == 0 && $index < 5  ) ? ' disabled="true"' : '' ) . '/>';
+			 ($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>';
@@ -343,9 +374,9 @@ class SurveyStatusProfiles
 			if ($cnt&1) 
 				echo '</tr><tr>';
 			echo '<td style="width:50%">';
-			echo '<label><input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
+			echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
 			 ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
-			 ($disabled  || ( (int)$collect_all_status == 0 && $index < 5  ) ? ' disabled="true"' : '' ) . '/>';
+			 ($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>';
@@ -359,7 +390,7 @@ class SurveyStatusProfiles
 		
 		if ($disabled ) {
 			$html_disabled = ' disabled="true"';
-			$css_disabled = ' class="gray"';
+			$css_disabled = ' disabled';
 		}
 		
 		
@@ -368,19 +399,51 @@ class SurveyStatusProfiles
 		
 		// lurkerji
 		# lurker = 0 - obveezno ni lurker, lurker = 1 - obvezno je lurker, lurker = 2 - je ali ni lurker
-		#echo '<hr><label><input type="checkbox" name="srv_userstatus[]" id="lurker" '.($curentProfileData['statuslurker'] == 1 ? ' checked="checked"' : '') . ($disabled ? ' disabled="true"' : '' ) . '> '.$lang['srv_lurkers'].'</label>';
-		echo '<label'.$css_disabled.'>'.$lang['srv_lurkers'].'</label>';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_lurker" value="0" '.((int)$curentProfileData['statuslurker'] == 0 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['no'].'</label>';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_lurker" value="1" '.((int)$curentProfileData['statuslurker'] == 1 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_only_empty'].'</label>';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_lurker" value="2" '.((int)$curentProfileData['statuslurker'] == 2 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_also'].'</label>';
-		echo '<br/><label class="small">'.$lang['srv_lurkers_subnote'].'</label>';
+		#echo '<hr><label><input type="checkbox" name="srv_userstatus[]" id="lurker" '.($curentProfileData['statuslurker'] == 1 ? ' checked="checked"' : '') . ($disabled ? ' disabled' : '' ) . '> '.$lang['srv_lurkers'].'</label>';
+		
+		echo '<div class="setting_holder '.$css_disabled.'">';
+		echo '<p class="setting_title">'.$lang['srv_lurkers'];
+		echo '<br><span class="italic">'.$lang['srv_lurkers_subnote'].'</span></p>';
+		
+		echo '<div class="horizontal">';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_lurker0" name="srv_us_lurker" value="0" '.((int)$curentProfileData['statuslurker'] == 0 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_lurker0">'.$lang['no'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_lurker1" name="srv_us_lurker" value="1" '.((int)$curentProfileData['statuslurker'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_lurker1">'.$lang['srv_only_empty'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_lurker2" name="srv_us_lurker" value="2" '.((int)$curentProfileData['statuslurker'] == 2 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_lurker2">'.$lang['srv_also'].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>';
 		
 		// testni vnosi
 		# testni = 0 - obveezno ni testni, testni = 1 - obvezno je tesni, testni = 2 - je ali ni testni
-		echo '<br/><br/><label'.$css_disabled.'>'.$lang['srv_testni_vnos'].'</label>';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_testni" value="0" '.((int)$curentProfileData['statustestni'] == 0 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['no'].'</label>';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_testni" value="1" '.((int)$curentProfileData['statustestni'] == 1 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_only_test'].'</label>';
-		echo '<label'.$css_disabled.'><input type="radio" name="srv_us_testni" value="2" '.((int)$curentProfileData['statustestni'] == 2 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_also'].'</label>';
+
+		echo '<div class="setting_holder '.$css_disabled.'">';
+		echo '<p class="setting_title">'.$lang['srv_testni_vnos'].'</p>';
+
+		echo '<div class="horizontal">';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_testni0" name="srv_us_testni" value="0" '.((int)$curentProfileData['statustestni'] == 0 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_testni0">'.$lang['no'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_testni1" name="srv_us_testni" value="1" '.((int)$curentProfileData['statustestni'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_testni1">'.$lang['srv_only_test'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="srv_us_testni2" name="srv_us_testni" value="2" '.((int)$curentProfileData['statustestni'] == 2 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_testni2">'.$lang['srv_also'].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>';
 
 		echo '</fieldset>';
 		
@@ -390,10 +453,25 @@ class SurveyStatusProfiles
 		echo '<legend>' . $lang['srv_usableResp_usable_unit'] . '</legend>';
 		
 		// 2->uporabni, 1->delno uporabni, 0->neuporabni
-		echo '<label'.$css_disabled.'><input type="checkbox" name="srv_us_nonusable" value="1" '.((int)$curentProfileData['statusnonusable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '> '.$lang['srv_usableResp_unusable'].'</label>';
-		echo '<span class="spaceLeft"></span><label'.$css_disabled.'><input type="checkbox" name="srv_us_partusable" value="1" '.((int)$curentProfileData['statuspartusable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>'.$lang['srv_usableResp_partusable'].'</label>';
-		echo '<span class="spaceLeft"></span><label'.$css_disabled.'><input type="checkbox" name="srv_us_usable" value="1" '.((int)$curentProfileData['statususable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>'.$lang['srv_usableResp_usable'].'</label>';
+
+		echo '<div class="setting_holder '.$css_disabled.'">';
 		
+		echo '<div class="horizontal">';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="srv_us_nonusable" name="srv_us_nonusable" value="1" '.((int)$curentProfileData['statusnonusable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_nonusable">'.$lang['srv_usableResp_unusable'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="srv_us_partusable" name="srv_us_partusable" value="1" '.((int)$curentProfileData['statuspartusable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_partusable">'.$lang['srv_usableResp_partusable'].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="checkbox" id="srv_us_usable" name="srv_us_usable" value="1" '.((int)$curentProfileData['statususable'] == 1 ? ' checked="checked"' : '') .$html_disabled. '>';
+		echo '<label for="srv_us_usable">'.$lang['srv_usableResp_usable'].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+		echo '</div>';
 		
 		echo '</fieldset>';
 		echo '</form>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 741600735..33b54338e 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8332,6 +8332,26 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
   display: inline-block;
 }
 
+fieldset.statusProfileFieldset table {
+  white-space: nowrap;
+}
+fieldset.statusProfileFieldset table td input[type=checkbox][disabled] + label:before {
+  color: #C4C4C4;
+  pointer-events: none;
+}
+fieldset.statusProfileFieldset .setting_holder .horizontal {
+  display: flex;
+  flex-direction: row;
+}
+fieldset.statusProfileFieldset .setting_holder.disabled {
+  pointer-events: none;
+  color: #C4C4C4;
+}
+fieldset.statusProfileFieldset .setting_holder.disabled .setting_item label {
+  pointer-events: none;
+  color: #C4C4C4;
+}
+
 /* 
     Header scss - top line, menu...
 */
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 09703704b..a710c9bd4 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -271,4 +271,44 @@ div#div_analiza_archive_name {
         outline: 1px solid $dark-gray;
         display: inline-block;
     }
+}
+
+//Statusi
+fieldset.statusProfileFieldset {
+
+    table {
+
+        white-space: nowrap;
+
+        td {
+            input {
+                &[type=checkbox][disabled] + label:before {
+                    color: $dark-gray;
+                    pointer-events: none;
+                }
+            }
+        }
+    }
+
+    .setting_holder {
+        
+        .horizontal {
+            display: flex;
+            flex-direction: row;
+        }
+
+        &.disabled {
+            pointer-events: none;
+            color: $dark-gray;
+
+            .setting_item {
+    
+                label {
+                    pointer-events: none;
+                    color: $dark-gray;
+                }
+            }
+
+        }
+    }
 }
\ No newline at end of file