diff --git a/winixd/html/fun_template.html b/winixd/html/fun_template.html
index f6a01dc..578598a 100644
--- a/winixd/html/fun_template.html
+++ b/winixd/html/fun_template.html
@@ -44,28 +44,33 @@
 
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]template">
-<fieldset>
-	<legend>{template_form_legend}</legend>
-	
-	{template_form_info}:
-	
-	<select name="template" class="template">
-	
-	[# the first should be an empty string (value="") which means: a first template from the mount point]
-	<option value="-1">({template_form_from_mount_point})</option>
-	
-	[for template_tab]
-		<option value="[template_tab_index]"[if template_tab_isdefault] selected[end]>[template_tab_file_name]</option>
-	[end]
-	</select>
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]template">
+
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_select_template">{template_form_info}</label>
+
+		<div class="uk-form-controls">
+			<select class="uk-select" id="winix_select_template" name="template">
+
+			[# the first should be an empty string (value="") which means: a first template from the mount point]
+			<option value="-1">({template_form_from_mount_point})</option>
+
+			[for template_tab]
+				<option value="[template_tab_index]"[if template_tab_isdefault] selected[end]>[template_tab_file_name]</option>
+			[end]
+			</select>
+		</div>
+	</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="{change}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
 </form>
 
 
diff --git a/winixd/locale/en b/winixd/locale/en
index cd7b52a..bc5eb48 100644
--- a/winixd/locale/en
+++ b/winixd/locale/en
@@ -307,7 +307,6 @@ template_header = Template
 template_info_file = Current html template for this file
 template_info_dir = Current html template for this directory
 template_from_mount_point = is taken from the mount point
-template_form_legend = Template form
 template_form_info = Select a new template
 template_form_from_mount_point = from the mount point
 
diff --git a/winixd/locale/pl b/winixd/locale/pl
index 7a20268..3effbc5 100644
--- a/winixd/locale/pl
+++ b/winixd/locale/pl
@@ -327,7 +327,6 @@ template_header = Szablon
 template_info_file = Bieżący szablon dla tego pliku
 template_info_dir = Bieżący szablon dla tego katalogu
 template_from_mount_point = jest brany z punktu montowania
-template_form_legend = Formularz zmiany szablonu
 template_form_info = Wybierz nowy szablon
 template_form_from_mount_point = z punktu montowania