diff --git a/html/fun_login.html b/html/fun_login.html
index 3e5fa19..217c069 100755
--- a/html/fun_login.html
+++ b/html/fun_login.html
@@ -6,19 +6,28 @@
 	<p>{logged_as_long}: [user_name]<br>
 	<a href="[doc_base_url][if-one dir_can_read_exec][dir][if-any item_is item_can_read][item_url]/[end][else]/[end]logout">{logout}</a></p>
 [else]
-	<form id="additem" method="post" action="[login_path]login">
-	<fieldset>
-	<legend>{form_login_legend}:</legend>
-	<input class="editshort" type="text" name="login">
-	<input class="editshort" type="password" name="password">
-	<label><input class="remember" type="checkbox" name="rememberme">{remember_me}</label>
-	<input class="submit" type="submit" value="{button_login}">
+	<form method="post" action="[login_path]login">
+
+	<div class="winix_input_b">
+		<input class="winix_editshort" type="text" name="login">
+	</div>
+
+	<div class="winix_input_b">
+		<input class="editshort" type="password" name="password">
+	</div>
+
+	<div class="winix_input_b">
+		<input id="winix_login_rememberme_id" type="checkbox" name="rememberme">
+		<label for="winix_login_rememberme_id">{remember_me}</label>
+	</div>
+
+	<input type="submit" value="{button_login}">
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	</fieldset>
+
 	</form>
 [end]
 
diff --git a/html/fun_ls.html b/html/fun_ls.html
index c8c11f5..e7ffad4 100755
--- a/html/fun_ls.html
+++ b/html/fun_ls.html
@@ -59,7 +59,7 @@
 
 			[if-one dir_childs_tab item_tab]
 
-				<table class="winix_table_withoutborder">
+				<table>
 				[for dir_childs_tab]
 					<tr>
 						<td>d</td>
diff --git a/html/fun_passwd.html b/html/fun_passwd.html
index 73919cc..c568885 100755
--- a/html/fun_passwd.html
+++ b/html/fun_passwd.html
@@ -2,34 +2,40 @@
 
 <h1>{passwd_header}</h1>
 
-<form id="additem" method="post" action="[doc_base_url][dir]passwd">
-<fieldset>
-	<legend>{passwd_form_legend}</legend>
+<form method="post" action="[doc_base_url][dir]passwd">
 
 	[if user_super_user]
-		<p class="withnext">{passwd_login}:</p>
-		<select name="login" class="users">
-		[for user_tab]
-			<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
-		[end]
+		<div class="winix_input_a">
+			<label for="winix_users_id">{passwd_login}:</label>
+			<select name="login" id="winix_users_id">
+			[for user_tab]
+				<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
+			[end]
+		</div>
 	</select>
 	[else]
-		<p class="withnext">{passwd_current_password}:</p>
-		<input class="edit" type="password" name="passwordcur" value="">
+		<div class="winix_input_a">
+			<label for="winix_current_pass_id">{passwd_current_password}:</label>
+			<input id="winix_current_pass_id" type="password" name="passwordcur" value="">
+		</div>
 	[end]
 	
-	<p class="withnext">{passwd_new_password}:</p>
-	<input class="edit" type="password" name="passwordnew" value="">
+	<div class="winix_input_a">
+		<label for="winix_pass_new_id">{passwd_new_password}:</label>
+		<input id="winix_pass_new_id" type="password" name="passwordnew" value="">
+	</div>
 
-	<p class="withnext">{passwd_confirm_new_password}:</p>
-	<input class="edit" type="password" name="passwordconfirm" value="">
+	<div class="winix_input_a">
+		<label for="winix_pass_new_confirm_id">{passwd_confirm_new_password}:</label>
+		<input id="winix_pass_new_confirm_id" type="password" name="passwordconfirm" value="">
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	<input class="submit" type="submit" value="{passwd_submit}">
-</fieldset>
+	<input type="submit" value="{passwd_submit}">
+
 </form>
 
 </div>
diff --git a/locale/en b/locale/en
index 32f3a3f..94cf59e 100755
--- a/locale/en
+++ b/locale/en
@@ -28,7 +28,6 @@ email_sent_to = An email has been sent to:
 
 logout = logout
 
-form_login_legend = Loging
 
 remember_me = Remember me
 
@@ -168,7 +167,6 @@ language_orphans = ()
 
 
 passwd_header = Passwd
-passwd_form_legend = Changing password form
 passwd_login = Select a user
 passwd_current_password = Current password
 passwd_new_password = New password
diff --git a/locale/pl b/locale/pl
index d3017af..3102c02 100755
--- a/locale/pl
+++ b/locale/pl
@@ -30,7 +30,6 @@ email_sent_to = Wiadomość została wysłana do:
 
 logout = wyloguj
 
-form_login_legend = Logowanie
 
 remember_me = Zapamiętaj mnie
 
@@ -188,7 +187,6 @@ language_orphans  = ( "(np.", "a", "al.", "ale", "aż", "aŻ", "bo", "bp", "by",
 
 
 passwd_header = Zmień swoje hasło
-passwd_form_legend = Formularz zmiany hasła
 passwd_login = Wybierz użytkownika
 passwd_current_password = Podaj obecne hasło
 passwd_new_password = Podaj nowe hasło