diff --git a/winixd/html/fun_login.html b/winixd/html/fun_login.html
index 6bfe1dc..74d516d 100644
--- a/winixd/html/fun_login.html
+++ b/winixd/html/fun_login.html
@@ -9,7 +9,7 @@
 		</p>
 
 		<div class="uk-margin-top">
-			<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout" class="uk-button uk-button-primary uk-border-pill uk-width-small">{login_logout_button}</a>
+			<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout" class="uk-button uk-button-primary uk-width-small">{login_logout_button}</a>
 		</div>
 	</div>
 [else]
@@ -21,45 +21,44 @@
 		</div>
 	[else]
 
-
+		[# login template: https://zzseba78.github.io/Kick-Off/login.html, a little modified: removed pills from borders ]
 		<div class="uk-width-medium uk-padding-small">
 			<!-- login -->
 			<form class="toggle-class" action="[login_path]login" method="POST">
-				<fieldset class="uk-fieldset">
-					<div class="uk-margin-small">
-						<div class="uk-inline uk-width-1-1">
-							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: user"></span>
-							<input class="uk-input uk-border-pill" required placeholder="{login_username}" type="text" name="login">
-						</div>
-					</div>
-					<div class="uk-margin-small">
-						<div class="uk-inline uk-width-1-1">
-							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lock"></span>
-							<input class="uk-input uk-border-pill" required placeholder="{login_password}" type="password" name="password">
-						</div>
-					</div>
 
-					[if login_should_use_captcha]
-					<div class="uk-margin-small">
-						<div class="uk-inline uk-width-1-1">
-							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lifesaver"></span>
-							<input class="uk-input uk-border-pill" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
-						</div>
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: user"></span>
+						<input class="uk-input" required placeholder="{login_username}" type="text" name="login">
 					</div>
-					[end]
-
-					<div class="uk-margin-small">
-						<label><input class="uk-checkbox" type="checkbox" name="rememberme"> {login_remember_me}</label>
+				</div>
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lock"></span>
+						<input class="uk-input" required placeholder="{login_password}" type="password" name="password">
 					</div>
-					<div class="uk-margin-bottom">
-						<button type="submit" class="uk-button uk-button-primary uk-border-pill uk-width-1-1">{login_button}</button>
+				</div>
+
+				[if login_should_use_captcha]
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lifesaver"></span>
+						<input class="uk-input" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
 					</div>
+				</div>
+				[end]
 
-					[if winix_function_param_is "postredirect"]
-						<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-					[end]
+				<div class="uk-margin-small">
+					<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="rememberme">{login_remember_me}</label>
+				</div>
+				<div class="uk-margin-bottom">
+					<button type="submit" class="uk-button uk-button-primary uk-width-1-1">{login_button}</button>
+				</div>
+
+				[if winix_function_param_is "postredirect"]
+					<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+				[end]
 
-				</fieldset>
 			</form>
 			<!-- /login -->
 
@@ -69,11 +68,11 @@
 				<div class="uk-margin-small">
 					<div class="uk-inline uk-width-1-1">
 						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: mail"></span>
-						<input class="uk-input uk-border-pill" placeholder="{login_forgot_password_email}" required type="text">
+						<input class="uk-input" placeholder="{login_forgot_password_email}" required type="text">
 					</div>
 				</div>
 				<div class="uk-margin-bottom">
-					<button type="submit" class="uk-button uk-button-primary uk-border-pill uk-width-1-1">{login_forgot_password_button}</button>
+					<button type="submit" class="uk-button uk-button-primary uk-width-1-1">{login_forgot_password_button}</button>
 				</div>
 			</form>
 			<!-- /recover password -->