diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index d9173f3bc..af7f9b451 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -9123,6 +9123,8 @@ class SurveyAdminSettings {
         if( !($admin_type == 1 || $admin_type == 0) )
             return '';
 
+		echo '<p class="bottom16 caps semi-bold">'.$lang['srv_users_add_assigned'].'</p>';
+
         // Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov - ZAENKRAT JE TO ONEMOGOCENO, KASNEJE SE LAHKO OMEJI NA PAKET
         if(false && isVirtual() && $admin_type == 1){
 
@@ -9138,56 +9140,85 @@ class SurveyAdminSettings {
             $managed_accounts_count = mysqli_num_rows($sql);
 
 
-            echo '<p class="bold" style="padding-left:0px;">';
-            echo $lang['srv_users_add_assigned_max_1'].' <span class="red bold">'.$managed_accounts_limit.'</span> '.$lang['srv_users_add_assigned_max_2'];
+            echo '<p class="bold bottom16">';
+            echo $lang['srv_users_add_assigned_max_1'].' <span class="red bold">'.$managed_accounts_limit.'</span> '.$lang['srv_users_add_assigned_max_2'].'</p>';
 
             // Manager na virtualkah ima omejitev koliko uporabnikov lahko pregleduje
             if($managed_accounts_count >= $managed_accounts_limit){
-                echo '<br /><br />';
+                echo '<p>';
                 echo $lang['srv_users_add_assigned_max_reached'];
                 echo '</p>';
                 
                 return;
             }
             elseif($managed_accounts_count > 0){             
-                echo '<br /><br />';
-                echo $lang['srv_users_add_assigned_current'].' <span class="red bold">'.$managed_accounts_count.' '.$lang['of'].' '.$managed_accounts_limit.'</span>';
+                echo '<p>';
+                echo $lang['srv_users_add_assigned_current'].' <span class="red bold">'.$managed_accounts_count.' '.$lang['of'].' '.$managed_accounts_limit.'</span></p>';
             }
-
-            echo '</p>';
         }
 
         echo '<div id="dodajanje">';
+        echo '<div id="dodajanje_horizontal">';
 
         // Dodajanje novih uporabnikov - ustvari racun, doda uporabnika pod pregled in mu poslje mail
+        echo '<div id="dodajanje_left">';
         echo '<form class="manager_add_user" name="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">';
-        echo '<h3><b>'.$lang['srv_users_add_assigned_title'].'</b></h3>';
-        echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>';
-        echo '<p><label for="name">'.$lang['name'].':</label><input type="text" id="name" name="name"></p>';
-        echo '<p><label for="surname">'.$lang['surname'].':</label><input type="text" id="surname" name="surname"></p>';
-        echo '<p><label for="password">'.$lang['password'].':</label><input type="password" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'').'</p>';
-        echo '<p><label for="password2">'.$lang['again'].':</label><input type="password" id="password2" name="password2"></p>';
         
-        echo '<p><div class="buttonwrapper floatLeft">';
-        echo '  <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.manager_add_user.submit();">'.$lang['create_add'].'</a>';
-        echo '</div></p>';
+		echo '<p class="semi-bold">'.$lang['srv_users_add_assigned_title'].'</p>';
 
+		echo '<div class="add_user_fields_wrapper">';
+
+		echo '<div class="setting_holder">';
+		echo '<p>'.$lang['email'].':</p>';
+		echo '<input type="email" class="text large" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'');
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<p>'.$lang['name'].':</p>';
+		echo '<input type="text" class="text large" id="name" name="name">';
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<p>'.$lang['surname'].':</p>';
+		echo '<input type="text" class="text large" id="surname" name="surname">';
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<p>'.$lang['password'].':</p>';
+		echo '<input type="password" class="text large" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'');
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<p>'.$lang['again'].':</p>';
+		echo '<input type="password" class="text large" id="password2" name="password2">';
+		echo '</div>';
+
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium blue" onClick="document.manager_add_user.submit();">'.$lang['create_add'].'</button>';
+        echo '</div>';
         echo '</form>';
 
+		echo '</div>'; // #dodajaje_left
+
+        echo '<div id="dodajanje_right">';
+
         // admini si lahko dodajajo ze obstojece uporabnike
         if ($admin_type == 0) {
 
-            echo '<br /><br /><br />';
-
             echo '<form class="manager_add_user" name="admin_add_dostop" action="ajax.php?t=dostop&a=admin_add_user" method="post">';
 
-            echo '<h3><b>'.$lang['srv_manager_add_user2'].'</b></h3>';
-            echo '<p><select name="uid" class="js-obstojeci-uporabniki-admin-ajax" style="width: 500px;"></select></p>';
-            
-            //echo '<p><button type="submit">'.$lang['add'].'</button></p>';
-            echo '<p><div class="buttonwrapper floatLeft">';
-            echo '  <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.admin_add_dostop.submit();">'.$lang['add'].'</a>';
-            echo '</div></p>';
+            echo '<p class="bottom8 semi-bold">'.$lang['srv_manager_add_user2'].'</p>';
+
+			echo '<div class="setting_holder">';
+			echo '<p class="bottom4">'.$lang['srv_manager_add_user_label'].':</p>';
+			echo '<select name="uid" class="js-obstojeci-uporabniki-admin-ajax drowpdown large" style="width: 460px;"></select>';
+			echo '</div>';
+
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onCclick="document.admin_add_dostop.submit();">'.$lang['add'].'</button>';
+			echo '</div>';
 
             echo '</form>';
         }
@@ -9207,6 +9238,9 @@ class SurveyAdminSettings {
         }*/
 
         echo '</div>';
+        echo '</div>';
+        echo '</div>';
+
     }
 
 	/**
@@ -9260,9 +9294,18 @@ class SurveyAdminSettings {
         $sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'");
         $rowU = mysqli_fetch_array($sqlU);
 
+        // Dodajanje uporabnikov
+        echo '<div class="add_user">';
 
-        // Naslov
-        echo '<h2 style="margin-bottom:30px;">';
+        // Manager ali admin lahko doda novega uporabnika pod pregled
+		$this->dodeljeniUporabniki();
+
+        echo '</div>';
+
+		//PREGLED NAD UPORABNIKI - TABELA
+
+		// Naslov
+        /*echo '<h2 style="margin-bottom:30px;">';
 
         if($admin_type == 0)
             echo $lang['administrator'];
@@ -9275,15 +9318,15 @@ class SurveyAdminSettings {
 
         echo ' <a href="#" onclick="edit_user(\''.$global_user_id.'\'); return false;" title="Uredi"><i class="fa fa-pencil-alt link-moder"></i></a>';
 
-        echo '</h2>';
+        echo '</h2>'; */
 
+		echo '<p class="bottom16 caps semi-bold">'.$lang['srv_users_assigned_title'].'</p>';
 
         // Tabela
-        echo '<fieldset style="max-width: 100% !important;"><legend>'.$lang['srv_users_assigned_title'].'</legend>';
-        //echo '<h4 style="margin-bottom: 10px;">'.$lang['srv_users_assigned_title'].'</h4>';
         echo '<table id="my_users_list" class="usersTable">';
 
         echo '<thead><tr>';
+        echo '<th>'.$lang['edit2'].'</th>';
         echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
         echo '<th>' . $lang['srv_survey_list_users_email'] . '</th>';
         echo '<th>' . $lang['admin_type'] . '</th>';
@@ -9294,22 +9337,9 @@ class SurveyAdminSettings {
         echo '<th>' . $lang['users_gdpr_title'] . '</th>';
         echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
         echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
-        echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>';
         echo '</tr></thead>';
 
         echo '</table>';
-        echo '</fieldset>';
-
-
-        // Dodajanje uporabnikov
-        echo '<div class="add_user">';
-
-        // Manager ali admin lahko doda novega uporabnika pod pregled
-        echo '<fieldset class="assign_user"><legend>'.$lang['srv_users_add_assigned'].'</legend>';
-		$this->dodeljeniUporabniki();
-        echo '</fieldset>';
-
-        echo '</div>';
 	}
 
 	/**
diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php
index 1b35a5b07..139b445b9 100644
--- a/admin/survey/classes/class.Dostop.php
+++ b/admin/survey/classes/class.Dostop.php
@@ -1311,6 +1311,9 @@ class Dostop {
 
             foreach ($vsi as $uporabnik) {
                 $seznam[] = [
+					'<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
+                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
+                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>',
                     iconv(mb_detect_encoding( $uporabnik->name, mb_detect_order(), true), "UTF-8", $uporabnik->name) .' '.iconv(mb_detect_encoding( $uporabnik->surname, mb_detect_order(), true), "UTF-8", $uporabnik->surname),
                     (!empty($uporabnik->second_email) ? iconv(mb_detect_encoding(  $uporabnik->second_email, mb_detect_order(), true), "UTF-8", $uporabnik->second_email) : iconv(mb_detect_encoding(  $uporabnik->email, mb_detect_order(), true), "UTF-8", $uporabnik->email)),
                     $this->userTypeToText($uporabnik->type),
@@ -1320,10 +1323,7 @@ class Dostop {
                     (!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
                     $lang["users_gdpr".$uporabnik->gdpr_agree],
                     $uporabnik->registriran,
-                    $uporabnik->last_login,
-                    '<a href="#" onclick="edit_user(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_info_modify'].'"><i class="fa fa-pencil-alt link-sv-moder"></i></a>'.
-                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'ban\'); return false;" title="'.$lang[($uporabnik->status == 0 ? 'srv_user_banned' : 'srv_user_notbanned')].'"><i class="fa fa-ban '.($uporabnik->status == 0 ? 'link-rdec' : 'link-sv-moder').'"></i></a>'.
-                    ' | <a href="#" onclick="vsiUporabnikiAkcija(\''.$uporabnik->id.'\', \'delete\'); return false;" title="'.$lang['srv_multicrosstabs_tables_delete_short'].'"><i class="fa fa-times link-sv-moder"></i></a>'
+                    $uporabnik->last_login
                 ];
 
             }
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index aac2fd91a..40f4057cf 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -519,7 +519,7 @@ class CrossRoad {
                     // Uporabniki
                     if($_GET['t'] == 'uporabniki'){
                         $layout_width = 'narrow';
-                        if($_GET['m'] == 'all'){
+                        if($_GET['m'] == 'all' || $_GET['m'] == ''){
                             $layout_width = 'fullwidth';  
                         } 
                     }
diff --git a/lang/1.php b/lang/1.php
index db9428735..dfa01178c 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5845,9 +5845,10 @@ $lang = array (
 	"srv_demografija_text"						=>	'Na konec ankete lahko dodate že pripravljena demografska vprašanja',
 	"srv_demografska_vprasanja"					=>	'Demografska vprašanja',
 	"srv_head_demografska_vprasanja"			=>	'Priporočamo standardna socio-demografska vprašanja (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Podrobnosti</span></a>)',
-	"srv_manager_add_user"						=>	'Dodajte novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail</span>',
-	"srv_manager_add_user2"						=>	'Dodajte si obstoječega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
-	"srv_manager_add_user3"						=>	'Dodajte si obstoječega uporabnika nad katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
+	"srv_manager_add_user_label"				=>	'Izberite uporabnika',
+	"srv_manager_add_user"						=>	'Dodajte novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo o podrobnostih dostopa obveščen na e-mail.</span>',
+	"srv_manager_add_user2"						=>	'Dodajte si obstoječega uporabnika nad, katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail.</span>',
+	"srv_manager_add_user3"						=>	'Dodajte si obstoječega uporabnika nad, katerim boste imeli pregled (dodajate lahko samo uporabnike registrirane z emaili %s)',
 	"srv_manager_add_user4"						=>	'<span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail</span>',
 	"srv_manager_rem_user2"						=>	'Odstranite uporabnika iz svojega pregleda',
 	"srv_manager_manager"						=>	'Uporabniki, ki imajo managerski pregled nad vašimi anketami',
@@ -6544,7 +6545,7 @@ $lang = array (
 	'srv_users_add_assigned_max_reached'		=>  'Dosegli ste maksimalno število uporabnikov v pregledu.',
 	'srv_users_add_assigned_max_1'				=>  'Dostop do vaše domene lahko dodelite največ',
 	'srv_users_add_assigned_max_2'			    =>  'uporabnikom.',
-	"srv_users_add_assigned_title"				=>	'Ustvarite novega uporabnika nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
+	"srv_users_add_assigned_title"				=>	'Ustvarite novega uporabnika, nad katerim boste imeli pregled <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span></span>',
 	"srv_users_assigned_title"				    =>	'Uporabniki nad katerimi imate pregled',
 	'srv_uredniske_nastavitve'					=>	'Uredniške nastavitve',
 	'srv_q_inicialke'							=>	'Respondenti naj vnesejo tudi svoje inicialke',
diff --git a/lang/2.php b/lang/2.php
index 109a1479b..814e0752d 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5740,6 +5740,7 @@ $lang = array (
 	"srv_demografija_text"						=>	'You can add demographic questions to the end of the survey',
 	"srv_demografska_vprasanja"					=>	'Demographic questions',
 	"srv_head_demografska_vprasanja"			=>	'We recommend using standard socio-demographic questions (<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/standardna-demografija" target="_blank"><span class="bold">Details</span></a>)', //NEJC
+	"srv_manager_add_user_label"				=>	'Select user',
 	"srv_manager_add_user"						=>	'Add new user',
 	"srv_manager_add_user2"						=>	'Add existing user',
 	"srv_manager_add_user3"						=>	'Add existing user (you can add users with email %s)',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 90fdfb876..0348375e8 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9208,7 +9208,7 @@ label.empty {
   font-size: 0;
 }
 
-input[type=text], input[type=password], input[type=number] {
+input[type=text], input[type=email], input[type=password], input[type=number] {
   border: 1px solid #C4C4C4;
   box-sizing: border-box;
   border-radius: 2px;
@@ -9216,40 +9216,40 @@ input[type=text], input[type=password], input[type=number] {
   margin-top: 4px;
   font-family: Source Sans Pro, sans-serif;
 }
-input[type=text].w200, input[type=password].w200, input[type=number].w200 {
+input[type=text].w200, input[type=email].w200, input[type=password].w200, input[type=number].w200 {
   width: 200px;
 }
-input[type=text].w300, input[type=password].w300, input[type=number].w300 {
+input[type=text].w300, input[type=email].w300, input[type=password].w300, input[type=number].w300 {
   width: 300px;
 }
-input[type=text].w400, input[type=password].w400, input[type=number].w400 {
+input[type=text].w400, input[type=email].w400, input[type=password].w400, input[type=number].w400 {
   width: 400px;
 }
-input[type=text].wauto, input[type=password].wauto, input[type=number].wauto {
+input[type=text].wauto, input[type=email].wauto, input[type=password].wauto, input[type=number].wauto {
   width: auto;
 }
-input[type=text].large, input[type=password].large, input[type=number].large {
+input[type=text].large, input[type=email].large, input[type=password].large, input[type=number].large {
   height: 40px;
   font-size: 16px;
   padding: 9px 7px;
 }
-input[type=text].medium, input[type=password].medium, input[type=number].medium {
+input[type=text].medium, input[type=email].medium, input[type=password].medium, input[type=number].medium {
   height: 32px;
   font-size: 14px;
   padding: 6px 7px;
 }
-input[type=text].small, input[type=password].small, input[type=number].small {
+input[type=text].small, input[type=email].small, input[type=password].small, input[type=number].small {
   height: 26px;
   font-size: 14px;
   padding: 3px 7px;
 }
-input[type=text]:focus, input[type=password]:focus, input[type=number]:focus {
+input[type=text]:focus, input[type=email]:focus, input[type=password]:focus, input[type=number]:focus {
   outline-style: none;
   box-shadow: none;
   border-color: transparent;
   border-color: #1E88E5;
 }
-input[type=text][readonly=true], input[type=password][readonly=true], input[type=number][readonly=true] {
+input[type=text][readonly=true], input[type=email][readonly=true], input[type=password][readonly=true], input[type=number][readonly=true] {
   cursor: pointer;
 }
 input[type=radio], input[type=checkbox] {
@@ -10480,6 +10480,41 @@ div.subpage_uporabniki .data_table_top_holder #end {
   display: flex;
   justify-content: flex-end;
 }
+div.subpage_uporabniki div.users_list_box {
+  padding: 0 12px;
+}
+div.subpage_uporabniki div.add_user {
+  margin-bottom: 32px;
+}
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal {
+  display: flex;
+  flex-direction: row;
+  gap: 64px;
+  width: fit-content;
+  align-self: center;
+}
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.add_user_fields_wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  width: fit-content;
+  margin-top: 8px;
+}
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal div.button_holder {
+  margin: 32px 0 0 0;
+}
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder {
+  margin-bottom: 16px;
+}
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder:last-of-type {
+  margin-bottom: 0;
+}
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder select.dropdown {
+  width: 500px;
+}
+div.subpage_uporabniki div.add_user div#dodajanje_horizontal .setting_holder p.bottom4 {
+  margin-bottom: 4px;
+}
 
 div#user_info_segment_narocila {
   background-color: #F8F8F8;
diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss
index 88dfa3300..be15d6469 100644
--- a/resources/sass/admin_new/components/form/input.scss
+++ b/resources/sass/admin_new/components/form/input.scss
@@ -18,6 +18,7 @@ label{
 input {
 
     &[type="text"],
+    &[type="email"],
     &[type="password"],
     &[type="number"] {
         border: 1px solid $dark-gray;
diff --git a/resources/sass/admin_new/pages/settings/uporabniki.scss b/resources/sass/admin_new/pages/settings/uporabniki.scss
index b361d74bc..f9b7d509e 100644
--- a/resources/sass/admin_new/pages/settings/uporabniki.scss
+++ b/resources/sass/admin_new/pages/settings/uporabniki.scss
@@ -77,4 +77,53 @@ div.subpage_uporabniki {
             justify-content: flex-end;
         }
     }
+
+    //Pregled in dodajanje
+
+    div.users_list_box {
+        padding: 0 12px;
+    }
+
+    div.add_user {
+        margin-bottom: 32px;
+        
+        div#dodajanje_horizontal {
+            display: flex;
+            flex-direction: row;
+            gap: 64px;
+            width: fit-content;
+            align-self: center;
+
+            div.add_user_fields_wrapper {
+                display: flex;
+                flex-direction: column;
+                align-items: flex-end;
+                width: fit-content;
+    
+                margin-top: 8px;
+            }
+
+            div.button_holder {
+                margin: 32px 0 0 0;
+            }
+    
+            .setting_holder {
+                margin-bottom: 16px;
+        
+                &:last-of-type {
+                    margin-bottom: 0;
+                }
+
+                select.dropdown {
+                    width: 500px;
+                }
+
+                p.bottom4 {
+                    margin-bottom: 4px;
+                }
+            }
+
+        }
+    }
+    
 }
\ No newline at end of file