diff --git a/winixd/html/fun_env.html b/winixd/html/fun_env.html
index 4114669..090ec35 100644
--- a/winixd/html/fun_env.html
+++ b/winixd/html/fun_env.html
@@ -5,51 +5,61 @@
 
 [if user_super_user]
 
-	[if winix_function_param_is "a"]
-		<p class="withnext">{env_change_admin_env_for_user}:</p>
-	[else]
-		<p class="withnext">{env_change_env_for_user}:</p>
-	[end]
+	<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
 
-	<form class="envchangeuser" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
-	<fieldset>
-		<legend>{form_env_legend}</legend>
-		
-		<select name="userid">
-			[for env_user_tab]
-				<option value="[env_user_tab_id]" [if env_user_tab_is_current]selected="selected"[end]>[env_user_tab_name]</option>
-			[end]
-		</select>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_env_user_select">
+				[if winix_function_param_is "a"]
+					{env_change_admin_env_for_user}
+				[else]
+					{env_change_env_for_user}
+				[end]
+			</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_env_user_select" name="userid">
+					[for env_user_tab]
+						<option value="[env_user_tab_id]" [if env_user_tab_is_current]selected="selected"[end]>[env_user_tab_name]</option>
+					[end]
+				</select>
+			</div>
+		</div>
 
 		<input type="hidden" name="changeuser">
-		<input class="submit" type="submit" value="{env_change_user}">
+
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{env_change_user}">
+		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 
-
-	</fieldset>
 	</form>
-	
+
 [end]
 
 
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
-<fieldset>
-	<legend>{form_env_legend}</legend>
-	
-		<textarea class="multitext" rows="30" cols="60" name="envvar">[if winix_function_param_is "a"][env_user_admin_env_str][else][env_user_env_str][end]</textarea>
-		<input type="hidden" name="userid" value="[env_user_id]">
-		<input class="submit" type="submit" value="{change}">
+<form class="uk-margin-medium uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
 
-		[if winix_function_param_is "postredirect"]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-		[end]
+	<div class="uk-margin">
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" rows="20" name="envvar">[if winix_function_param_is "a"][env_user_admin_env_str][else][env_user_env_str][end]</textarea>
+		</div>
+	</div>
 	
-</fieldset>
+	<input type="hidden" name="userid" value="[env_user_id]">
+
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
+	[if winix_function_param_is "postredirect"]
+		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+	[end]
+
 </form>
 
 
diff --git a/winixd/locale/en b/winixd/locale/en
index bc5eb48..05c5981 100644
--- a/winixd/locale/en
+++ b/winixd/locale/en
@@ -130,7 +130,6 @@ form_ticket_edit_submit = Edit a ticket
 
 
 env_header = Environment variables for a user
-form_env_legend = Environment variables form
 env_change_env_for_user = Change environment variables for user
 env_change_admin_env_for_user = Change admin environment variables for user
 env_change_user = Change user
diff --git a/winixd/locale/pl b/winixd/locale/pl
index 3effbc5..fcb56c3 100644
--- a/winixd/locale/pl
+++ b/winixd/locale/pl
@@ -135,7 +135,6 @@ form_ticket_create_submit = Załóż zgłoszenie
 form_ticket_edit_submit = Edytuj zgłoszenie
 
 env_header = Zmienne środowiskowe
-form_env_legend = Formularz zmiany zmiennych środowiskowych dla użytkownika
 env_change_env_for_user = Zmień zmienne środowiskowe dla użytkownika
 env_change_admin_env_for_user = Zmień zmienne środowiskowe administracyjne dla użytkownika
 env_change_user = Zmień użytkownika