diff --git a/winixd/html/fun_ckeditor.html b/winixd/html/fun_ckeditor.html
index 650f7bb..c07180d 100644
--- a/winixd/html/fun_ckeditor.html
+++ b/winixd/html/fun_ckeditor.html
@@ -1,75 +1,80 @@
 <div class="winix">
 
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
-	
-	[if mount_type_is "cms"]
-		<div class="winix_input_a">
-		<label for="winix_title_id">{title}:</label>
-		<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
-		</div>
 
-		<div class="winix_input_a">
-		<label for="winix_url_id">{suggested_url}:</label>
-		<input id="winix_url_id" type="text" name="url" value="[item_url]">
+<form class="uk-form-stacked">
+	
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
 		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
-		<div class="winix_input_a">
-		<label for="winix_title_id">{title}:</label>
-		<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
-		</div>
-		
-		<div class="winix_input_a">
-		<label for="winix_url_id">{suggested_url}:</label>
-		<input id="winix_url_id" type="text" name="url" value="[item_url]">
-		</div>
-	[end]
 	
-	<div class="winix_input_a">
-	[if mount_type_is "cms"]<label for="winix_content_id">{form_emacs_content_cms}</label>[end]
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	[if mount_type_is "ticket"]<label for="winix_content_id">{form_emacs_content_ticket}</label>[end]
+	<div class="uk-margin">
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
 	[# template fun_ls.html uses the name: itemcontent to refer to this textarea item]
 
-
-	<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
-
+	<div class="uk-form-controls">
+		<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
+	</div>
 	
 	</div>
 
-	<input id="contenttype" type="hidden" name="contenttype" value="2">
-	
+	<div class="uk-form-controls">
+		<input id="contenttype" type="hidden" name="contenttype" value="2">
+	</div>
 
 	[if not user_logged]
-		<div class="winix_input_a">
-		<label for="winix_nick_id">{nick}:</label>
-		<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
 		</div>
 
-		<div class="winix_input_a">
-		<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</p>
-		<input id="winix_rebus_id" type="text" name="rebus">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
 		</div>
 		
 		[include "antispam.html"]
 	[end]
 	
 
-	<div class="winix-update-button-container">
-		<button class="winix_update_button" data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]ckeditor"
-											data-winix-content-ckeditor-instances="winix-editor-content"
-											data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
-											data-winix-progressbar-id="winix-editor-progressbar"
-											data-winix-messages-status-success-id="winix-editor-messages-status-success"
-											data-winix-messages-status-error-id="winix-editor-messages-status-error"
-											>
-			Aktualizuj
-		</button>
+	<div class="uk-margin">
+		<div class="uk-form-controls uk-inline">
+
+			<button class="uk-button uk-button-primary winix_update_button"
+				data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]ckeditor"
+				data-winix-content-ckeditor-instances="winix-editor-content"
+				data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
+				data-winix-progressbar-id="winix-editor-progressbar"
+				data-winix-messages-status-success-id="winix-editor-messages-status-success"
+				data-winix-messages-status-error-id="winix-editor-messages-status-error"
+				>
+				{ckeditor_update_button}
+			</button>
+
+			<div id="winix-editor-progressbar" class="uk-invisible uk-position-center-right-out uk-margin-small-left">
+				<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="{ckeditor_update_progressbar_img_alt}">
+			</div>
 
-		<div id="winix-editor-progressbar" class="winix-progressbar">
-			<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="progress bar">
 		</div>
 
 		<div id="winix-editor-messages-status-success" class="winix-editor-messages-status-success">
@@ -88,4 +93,6 @@
 	[ckeditor_old_browsers_support]
 	[ckeditor "winix-editor-content"]
 
+</form>
+
 </div>
diff --git a/winixd/locale/en b/winixd/locale/en
index 20a6d30..e85b552 100644
--- a/winixd/locale/en
+++ b/winixd/locale/en
@@ -102,6 +102,12 @@ create_ticket_header = Create a new ticket
 
 
 
+
+ckeditor_update_button = Update
+
+
+
+
 form_ticket_type = Ticket type
 form_ticket_status = Status
 form_ticket_priority = Priority
diff --git a/winixd/locale/pl b/winixd/locale/pl
index f4c291e..ccebf9f 100644
--- a/winixd/locale/pl
+++ b/winixd/locale/pl
@@ -108,6 +108,13 @@ create_ticket_header = Nowe zgłoszenie
 
 
 
+
+
+ckeditor_update_button = Aktualizuj
+
+
+
+
 form_ticket_type = Rodzaj zgłoszenia
 form_ticket_status = Status
 form_ticket_priority = Priorytet