diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 6f9af758..a5dd2f88 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -188,7 +188,7 @@ class DmsfFolder < ActiveRecord::Base
 
   def self.file_list(files)
     options = Array.new
-    options.push ['', nil]
+    options.push ['', nil, :label => 'none']
     files.each do |f|
       options.push [f.title, f.id]
     end
diff --git a/app/views/dmsf/_dir.html.erb b/app/views/dmsf/_dir.html.erb
index 09335a85..de2714cc 100644
--- a/app/views/dmsf/_dir.html.erb
+++ b/app/views/dmsf/_dir.html.erb
@@ -24,7 +24,7 @@
 <% locked = subfolder && subfolder.locked? %>    
 
 <td class="check"><%= check_box_tag(name, id, false, 
-  :title => l(:title_check_for_zip_download_or_email)) %></td>
+  :title => l(:title_check_for_zip_download_or_email), :id => "subfolder_#{id}") %></td>
 <td class="title">                
   <%= link_to(h(title),          
     dmsf_folder_path(:id => project, :folder_id => subfolder),
diff --git a/app/views/dmsf/_dir_trash.html.erb b/app/views/dmsf/_dir_trash.html.erb
index 904592c5..3867abbf 100644
--- a/app/views/dmsf/_dir_trash.html.erb
+++ b/app/views/dmsf/_dir_trash.html.erb
@@ -21,7 +21,7 @@
 %>
 
 <td class="check"><%= check_box_tag(name, id, false, 
-  :title => l(:title_check_for_restore_or_delete)) %></td>
+  :title => l(:title_check_for_restore_or_delete), :id => "subfolder_#{id}") %></td>
 <td class="title">                  
   <%= content_tag(:span, h(title), 
     :title => h(title), 
diff --git a/app/views/dmsf/_file.html.erb b/app/views/dmsf/_file.html.erb
index c90eb28a..3dda59b7 100644
--- a/app/views/dmsf/_file.html.erb
+++ b/app/views/dmsf/_file.html.erb
@@ -25,7 +25,7 @@
 <% wf = DmsfWorkflow.find_by_id(file.last_revision.dmsf_workflow_id) %>
 
 <td class="check"><%= check_box_tag(name, id, false, 
-  :title => l(:title_check_for_zip_download_or_email)) %></td>
+  :title => l(:title_check_for_zip_download_or_email), :id => "file_#{id}") %></td>
 <td class="title">
   <% file_view_url = url_for({:only_path => false, :controller => :dmsf_files, :action => 'view', :id => file}) %>
   <%= link_to(h(title),
diff --git a/app/views/dmsf/_file_trash.html.erb b/app/views/dmsf/_file_trash.html.erb
index d4327977..9c25af8d 100644
--- a/app/views/dmsf/_file_trash.html.erb
+++ b/app/views/dmsf/_file_trash.html.erb
@@ -21,7 +21,7 @@
 %>
 
 <td class="check"><%= check_box_tag(name, id, false, 
-  :title => l(:title_check_for_restore_or_delete)) %></td>
+  :title => l(:title_check_for_restore_or_delete), :id => "file_#{id}") %></td>
 <td class="title">  
   <%= content_tag(:span, h(title), 
     :title => h(title), 
diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb
index e7d8a42c..3e457f87 100644
--- a/app/views/dmsf/trash.html.erb
+++ b/app/views/dmsf/trash.html.erb
@@ -153,11 +153,8 @@
 </script>
 
 <%
-  if I18n.locale && !I18n.locale.to_s.match(/^en.*/)
-    sUrl = "jquery.dataTables/#{I18n.locale.to_s.downcase}.json" 
-  else
-    sUrl = 'jquery.dataTables/en.json'
-  end    
+  sUrl = "jquery.dataTables/#{I18n.locale.to_s.downcase}.json"
+  sUrl = 'jquery.dataTables/en.json' unless File.exist?(sUrl)
 %>
 
 <% content_for :header_tags do %>      
@@ -171,7 +168,7 @@
         'oLanguage': {
                 'sUrl': "<%= plugin_asset_path(:redmine_dmsf, 'javascripts', sUrl) %>"
         },
-                'bAutoWidth': false,
+        'bAutoWidth': false,
         'bPaginate': false,
         'aaSorting': [[1,'asc']],
         'aaSortingFixed': [[8,'asc']],
diff --git a/app/views/dmsf_files/_file_new_revision.html.erb b/app/views/dmsf_files/_file_new_revision.html.erb
index 79be53f7..5470c50d 100644
--- a/app/views/dmsf_files/_file_new_revision.html.erb
+++ b/app/views/dmsf_files/_file_new_revision.html.erb
@@ -52,7 +52,7 @@
       </div>
       <div class="splitcontentleft">
         <p>
-          <%= label_tag('fileMinorVersionRadio', "#{l(:label_version)}:") %>
+          <%= label_tag('version_0', "#{l(:label_version)}:") %>
 	</p>
       <div class="data clear">
 	<%= radio_button_tag('version', 0, 
@@ -79,7 +79,7 @@
          </p>
          <span class="add_attachment">           
            <%= file_field_tag 'file_upload',
-                :id => nil,
+                :id => 'file_upload',
                 :class => 'file_selector',
                 :multiple => false,
                 :onchange => "$('#dmsf_file_revision_name').val(this.files[0].name)",
diff --git a/app/views/dmsf_links/_form.html.erb b/app/views/dmsf_links/_form.html.erb
index 666a842a..f35a6df1 100644
--- a/app/views/dmsf_links/_form.html.erb
+++ b/app/views/dmsf_links/_form.html.erb
@@ -37,7 +37,7 @@
   <div class="box dmsf_detail">
     <% if @type == 'link_from' %>
       <p>
-        <%= radio_button_tag(:external_link, 'false', @link_external == false) %> <%= l(:label_internal) %></br>
+        <%= radio_button_tag(:external_link, 'false', @link_external == false) %> <%= l(:label_internal) %><br/>
         <%= radio_button_tag(:external_link, 'true', @link_external) %>  <%= l(:label_external) %>
       </p>
     <% end %>    
@@ -82,7 +82,7 @@
       </div>      
       <%= label_tag('dmsf_link[name]', l(:label_link_name), :class => 'required') %>      
       <%= text_field_tag 'dmsf_link[name]', @dmsf_link.name, :size => 40, :maxlength => 255 %>
-    </p>
+    <!--</p>-->
   </div>
   <%= f.submit l(:button_create) %>
 <% end %>