diff --git a/winixd/functions/ls.cpp b/winixd/functions/ls.cpp
index 500525b..9b01de3 100644
--- a/winixd/functions/ls.cpp
+++ b/winixd/functions/ls.cpp
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,13 @@ Ls::Ls()
 
 void Ls::MakeGet()
 {
+	// !! IMPROVE ME
+	// this should be moved to ckeditor function (similarly the html content from fun_ls.html)
+	if( cur->request->IsParam(L"ckeditor_browse") )
+	{
+		cur->request->index_template = config->templates_index_generic;
+	}
+
 	if( !cur->request->is_item )
 	{
 		DbItemQuery iq;
diff --git a/winixd/html/fun_ls.html b/winixd/html/fun_ls.html
index 1826445..f0e883b 100644
--- a/winixd/html/fun_ls.html
+++ b/winixd/html/fun_ls.html
@@ -1,24 +1,40 @@
-<div class="winix">
-
+<div class="winix"[if winix_function_param_is "ckeditor_browse"] style="padding: 1.5em;"[end]>
 
 
+[# !! IMPROVE ME: move this html code to a ckeditor template]
 [if winix_function_param_is "ckeditor_browse"]
 	<script type="text/javascript">function select(link) \{ window.opener.CKEDITOR.tools.callFunction([ls_ckeditor_funnum_browse], link); window.close(); \} </script>
-	
-	<div id="winix_ls_browse_leftcolumn">
+
+	<div class="uk-margin">
+		<ul class="uk-breadcrumb">
+		[for dir_tab]
+			<li>
+				<a href="[doc_base_url][dir_tab_link]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">
+				[if cmp dir_tab_url ""]
+					[# !! IMPROVE ME it would be better to have a flag of some kind to indicate that this is a root dir]
+					{ls_root_dir_name}
+				[else]
+					[dir_tab_url]
+				[end]
+				</a>
+			</li>
+		[end]
+		</ul>
+	</div>
+
+	<div class="uk-flex uk-margin-medium">
+	<div class="uk-width-1-4">
 	
 		[if dir_childs_tab "with_parent"]
-			<h2>[for dir_tab]<a href="[doc_base_url][dir_tab_link]ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_tab_url]/</a>[end]</h2>
-			
-			<ul>
+			<ul class="uk-list uk-list-disc uk-list-collapse">
 			[for dir_childs_tab "with_parent"]
 				<li>
 				[if dir_childs_is_parent]
 				[# make sure the name of the textarea in fun_ckeditor.html is called: itemcontent]
 				[# is it needed?]
-					<a href="[doc_base_url][dir_parent]ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">../</a>
+					<a href="[doc_base_url][dir_parent]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">../</a>
 				[else]
-					<a href="[doc_base_url][dir][dir_childs_tab_url]/ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_childs_tab_url]/</a>
+					<a href="[doc_base_url][dir][dir_childs_tab_url]/ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_childs_tab_url]/</a>
 				[end]
 				</li>
 			[end]
@@ -27,15 +43,14 @@
 
 	</div>
 	
-	<div id="winix_ls_browse_rightcolumn">
+	<div class="">
 		
 		[if item_tab]
-		
-			<h2>{ls_pictures_in_dir} [dir]</h2>
-			<ul>
+
+			<ul class="uk-list uk-list-collapse" data-uk-grid>
 			
 			[for item_tab]
-				<li><a href="javascript:select('[item_tab_link]')"><img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]" height="120"></a></li>
+				<li><a href="javascript:select('[item_tab_link]')"><img data-src="[item_tab_link]/-/thumb" alt="[item_tab_subject]" height="120" data-uk-img></a></li>
 			[end]
 			
 			</ul>
@@ -44,11 +59,12 @@
 		[end]
 
 	</div>
-	
+	</div>
 [else]
 
 	<h1>{ls_header}</h1>
 
+	[# !! improve me: we need a 'l' flag to a file too, now it's working for dirs only]
 	[if not item_is]
 
 		[if winix_function_param_is "l"]
@@ -59,7 +75,15 @@
 
 			[if one dir_childs_tab item_tab]
 
-				<table>
+				<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-table-responsive">
+				<tr>
+					<th>{ls_type}</th>
+					<th>{ls_permissions}</th>
+					<th>{ls_owner}</th>
+					<th>{ls_group}</th>
+					<th>{ls_name}</th>
+				</tr>
+				
 				[for dir_childs_tab]
 					<tr>
 						<td>d</td>
@@ -95,7 +119,7 @@
 			[dir_childs_tab "with_parent"]
 
 			[if dir_childs_tab]
-				<ul>
+				<ul class="uk-list uk-list-disc uk-list-collapse">
 				[for dir_childs_tab]
 					<li>
 					[if dir_childs_is_parent]
@@ -107,9 +131,9 @@
 				[end]
 				</ul>
 			[end]
-					
+			[# !! IMPROVE ME those two lists (above and below) can be combined together
 			[if item_tab]
-				<ul>
+				<ul class="uk-list uk-list-disc uk-list-collapse">
 					[for item_tab]
 						<li><a href="[doc_base_url][dir][item_tab_url]">[item_tab_url]</a></li>
 					[end]
@@ -120,8 +144,9 @@
 
 	[else]
 	
-		<ul>
-		<li><a href="[doc_base_url][dir][item_url]">[item_url]</a></li>
+		[!! improve me: may it would be better to not use a list here?]
+		<ul class="uk-list uk-list-disc uk-list-collapse">
+			<li><a href="[doc_base_url][dir][item_url]">[item_url]</a></li>
 		</ul>
 
 	[end]
diff --git a/winixd/locale/en b/winixd/locale/en
index f710efe..cd7b52a 100644
--- a/winixd/locale/en
+++ b/winixd/locale/en
@@ -171,8 +171,13 @@ last_none = There is no anything information.
 
 
 ls_header = Directory listing
-ls_pictures_in_dir = Pictures in directory 
 ls_no_picture = There are not any pictures in this directory
+ls_type = Type
+ls_permissions = Permissions
+ls_owner = Owner
+ls_group = Group
+ls_name = Name
+ls_root_dir_name = Root dir
 
 ipban_header = IP Banned
 ipban_col_id = Id
@@ -418,6 +423,7 @@ mv_dir_content_can_be_moved_to_dir = Directory content can be moved only to an o
 mv_cannot_move_to_inside = A directory cannot be moved to inside it
 mv_incorrect_dst_path = Incorrect destination path
 mv_incorrect_dir = Incorrect directory
+mv_file_exists = Such file already exists
 
 
 timezone_header = Time Zone
diff --git a/winixd/locale/pl b/winixd/locale/pl
index 5201eaf..7a20268 100644
--- a/winixd/locale/pl
+++ b/winixd/locale/pl
@@ -175,9 +175,13 @@ last_none = Nie ma dostępnych żadnych informacji.
 
 
 ls_header = Zawartość katalogu
-ls_pictures_in_dir = Obrazy w katalogu
 ls_no_picture = W tym katalogu nie ma żadnego obrazu
-
+ls_type = Typ
+ls_permissions = Uprawnienia
+ls_owner = Właściciel
+ls_group = Grupa
+ls_name = Nazwa
+ls_root_dir_name = Katalog główny
 
 ipban_header = Lista zbanowanych adresów IP
 ipban_col_id = L.p.
@@ -438,7 +442,7 @@ mv_dir_content_can_be_moved_to_dir = Zawartość katalogu może zostać przenies
 mv_cannot_move_to_inside = Nie mogę przenieść katalogu do jego środka
 mv_incorrect_dst_path = Nieprawidłowa ścieżka docelowa
 mv_incorrect_dir = Nieprawidłowy katalog
-
+mv_file_exists = Podany plik już istnieje
 
 timezone_header = Strefa czasowa
 timezone_select = Wybierz swoją strefę czasową