diff --git a/app/views/dmsf/_user_pref.html.erb b/app/views/dmsf/_user_pref.html.erb
index 4f53dac4..1dd70be3 100644
--- a/app/views/dmsf/_user_pref.html.erb
+++ b/app/views/dmsf/_user_pref.html.erb
@@ -1,15 +1,13 @@
 <div class="box">
 	<% form_tag({:controller => "dmsf_state", :action => "user_pref", :id => @project, :current => URI.escape(request.url)},
 		:method=>:post) do %>
-	<div style="padding-top: 0px; float: right;">
-		<%= submit_tag("Save", :title => "Save preferences", :style => "font-size: 0.9em;", :tabindex => 10) %>
-	</div>
 	<h3>Your <%= l(:dmsf) %> preferences for project</h3>
 	<div>
 		Notifications: 
 		<%= select_tag("email_notify", 
 				options_for_select([["Default", nil], ["Activated", true], ["Deactivated", false]], 
-					:selected => DmsfUserPref.for(@project, User.current).email_notify), :tabindex => 1) %>
+					:selected => DmsfUserPref.for(@project, User.current).email_notify)) %>
+		<%= submit_tag("Save", :title => "Save preferences") %>
 	</div>
 	<% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/dmsf/index.html.erb b/app/views/dmsf/index.html.erb
index 897a5f85..3adb0a34 100644
--- a/app/views/dmsf/index.html.erb
+++ b/app/views/dmsf/index.html.erb
@@ -3,8 +3,9 @@
 <div class="contextual">
 	<% if User.current.allowed_to?(:folder_manipulation, @project) %>
 		<% unless @folder.nil? %>
-			<%= link_to(l(:link_details),
-		          {:controller => "dmsf_detail", :action => "folder_detail", :id => @project, :folder_id => @folder}) %> |
+			<%= link_to(image_tag("filedetails.png", :plugin => "redmine_dmsf", :style => "vertical-align: text-top;"), 
+						{:controller => "dmsf_detail", :action => "folder_detail", :id => @project, :folder_id => @folder },
+						:title => l(:link_details, :title => h(@folder.name))) %> | 
 		<% end %>
 		<% form_for(DmsfFolder.new, :url => {:controller => "dmsf_detail", :action => "create_folder", :id => @project, :folder_id => @folder}, :html => {:method=>:post}) do |f| %>
 			Title: <%= f.text_field(:name) %><%= f.submit(l(:submit_create_folder)) %>
@@ -32,7 +33,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 				<th style="width: 17px; padding: 2px; text-align: left;">
 					<input id="check_all_entries" title="<%= l(:title_check_uncheck_all_for_zip_download_or_email) %>" type="checkbox" />
 				</th>
-				<%= sort_header_tag("title", :caption => l(:link_title)) %>
+				<%= sort_header_tag("title", :caption => l(:link_title), :style => "width: 50%") %>
 				<%= sort_header_tag("size", :caption => l(:link_size)) %>
 				<%= sort_header_tag("modified", :caption => l(:link_modified)) %>
 				<%= sort_header_tag("version", :caption => l(:link_ver)) %>
@@ -84,8 +85,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 		        	{:action => "download_file", :id => @project, :file_id => file},
 		        	:class => "icon icon-file #{Redmine::MimeType.css_class_of(file.name)}",
 					:title => l(:title_title_version_version_download, :title => h(file.last_revision.title), :version => file.last_revision.version)) %>
-				<div class="filename">
-					(<%= h(file.display_name) %>)</div><br class="clear" />
+				<div class="filename"><%= h(file.display_name) %></div><br class="clear" />
 			</td>
 			<td class="size"><%= number_to_human_size(file.last_revision.size) unless file.last_revision.nil?  %></td>
 			<td class="modified">
@@ -115,7 +115,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 				<div class="right_icon_box">
 					<%= link_to(image_tag("filedetails.png", :plugin => "redmine_dmsf"), 
 						{:controller => "dmsf_detail", :action => "file_detail", :id => @project, :file_id => file },
-						:title => "#{h(file.last_revision.title)} details") %>
+						:title => l(:link_details, :title =>h(file.last_revision.title))) %>
 					&nbsp;	
 					<% unless file.locked_for_user? && !User.current.allowed_to?(:force_file_unlock, @project)%>
 						<% 	if file.locked? %>
@@ -156,20 +156,19 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 		<!-- <button type="button" id="EntriesDeleteButton" title="Delete checked">Delete</button> -->
 		<%= submit_tag("Email", :title => "Send checked by email", :name => "email_entries") %>
 	</div>
-	<br style="clear: both"/>
+	<br />
 <% end %>
 
 <div class="box">
-<h3>File Upload</h3>
-<% form_tag({:controller => "dmsf_detail", :action => "upload_files", :id => @project, :folder_id => @folder},
-	:id => "uploadform", :method=>:post, :multipart => true) do %>
-<div style="padding-bottom: 6px; line-height: 1.4em; font-size: 0.9em;">
+	<% form_tag({:controller => "dmsf_detail", :action => "upload_files", :id => @project, :folder_id => @folder},
+		:id => "uploadform", :method=>:post, :multipart => true) do %>
 <% if Setting.attachment_max_size.to_i >= 102400 %> 
 	<div class="upload_select">
 		File size: <select id="uploader_select"><option value="1">&lt; 100 MB</option><option value="2">> 100 MB</option></select>
 	</div>
-	<br style="clear: both" />
 <% end %>
+<h3>File Upload</h3>
+<div style="padding-bottom: 6px; line-height: 1.4em; font-size: 0.9em;">
 <span>
 	<% if Setting.plugin_redmine_dmsf["dmsf_max_file_upload"].to_i > 0 %>There can be uploaded maximum of <%= Setting.plugin_redmine_dmsf["dmsf_max_file_upload"].to_i %> files at once.<% end %>
 	<% if Setting.attachment_max_size.to_i >= 2097151 %>To upload files greater than 2GB you must have 64b browser.<% end %>
@@ -189,6 +188,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 </div>
 <% end %>
 </div> 
+<br />
 
 <%= render(:partial => 'user_pref') %>
 
@@ -221,10 +221,10 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 			
 			jQuery("#check_all_entries").click(function(event) {
 				var $this = jQuery(this);
-				if($this.attr("checked")) {
-					jQuery("input[type=checkbox]", jQuery("#browser > tbody")).attr("checked", true);
+				if($this.prop("checked")) {
+					jQuery("input[type=checkbox]", jQuery("#browser > tbody")).prop("checked", true);
 				} else {
-					jQuery("input[type=checkbox]", jQuery("#browser > tbody")).attr("checked", false);
+					jQuery("input[type=checkbox]", jQuery("#browser > tbody")).prop("checked", false);
 				}
 			})
 			
diff --git a/assets/stylesheets/dmsf.css b/assets/stylesheets/dmsf.css
index 1c2aae98..e4a109a7 100644
--- a/assets/stylesheets/dmsf.css
+++ b/assets/stylesheets/dmsf.css
@@ -1,7 +1,11 @@
-table.list tbody td, table.list tbody tr:hover td {
+table.entries tbody td, table.entries tbody tr:hover td {
 	border: solid 1px #D7D7D7;
 }
 
+table.entries  {
+	margin-bottom: 10px;
+}
+
 #sidebar h3 {
 	border: none;
 }
@@ -18,7 +22,6 @@ form.dmfs_entries {
 }
 
 form.dmfs_entries div.controls {
-	float: right;
 	font-size: 0.9em;
 }
 
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7b735573..fe7285fb 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -36,7 +36,7 @@ cs:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  :link_details: "Details"
+  :link_details: "%{title} details"
   :submit_create_folder: "Create folder"
   :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
   :link_title: "Title"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d0f5439b..86e81b61 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -36,7 +36,7 @@ de:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  :link_details: "Details"
+  :link_details: "%{title} details"
   :submit_create_folder: "Create folder"
   :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
   :link_title: "Title"
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 5ac06d66..371e86a8 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -36,7 +36,7 @@ en-GB:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  :link_details: "Details"
+  :link_details: "%{title} details"
   :submit_create_folder: "Create folder"
   :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
   :link_title: "Title"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4c739d7c..de47a3bc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -36,7 +36,7 @@ en:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  :link_details: "Details"
+  :link_details: "%{title} details"
   :submit_create_folder: "Create folder"
   :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
   :link_title: "Title"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a10abd11..13eff156 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -36,7 +36,7 @@ es:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  :link_details: "Details"
+  :link_details: "%{title} details"
   :submit_create_folder: "Create folder"
   :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
   :link_title: "Title"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d9d287c2..7e1af875 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -36,7 +36,7 @@ fr:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  :link_details: "Details"
+  :link_details: "%{title} details"
   :submit_create_folder: "Create folder"
   :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
   :link_title: "Title"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 45ff608d..1ee78e93 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -36,7 +36,7 @@ ru:
   :notice_file_notifications_activated: "File notifications activated"
   :warning_file_notifications_already_deactivated: "File notifications already deactivated"
   :notice_file_notifications_deactivated: "File notifications deactivated"
-  :link_details: "Details"
+  :link_details: "%{title} details"
   :submit_create_folder: "Create folder"
   :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
   :link_title: "Title"