diff --git a/app/views/dmsf_files/_file_new_revision.html.erb b/app/views/dmsf_files/_file_new_revision.html.erb
index 61e31411..c735ae0a 100644
--- a/app/views/dmsf_files/_file_new_revision.html.erb
+++ b/app/views/dmsf_files/_file_new_revision.html.erb
@@ -66,13 +66,13 @@
             </div>
           </div>
         </div>
-        <div class="box" id="file_upload_box">
-          <p>
-            <%= label_tag 'file_upload', l(:label_new_content) %>
+        <p>
+          <%= label_tag 'file_upload', l(:label_new_content) %>
+          <span class="dmsf-uploader">
             <%= render partial: 'dmsf_upload/form',
-                       locals: { multiple: false, container: nil, description: false, awf: false } %>
-          </p>
-        </div>
+                     locals: { multiple: false, container: nil, description: false, awf: false } %>
+          </span>
+        </p>
         <p>
           <%= f.text_area :comment, rows: 2, label: l(:label_comment), class: 'wiki-edit dmsf-description' %>
         </p>
diff --git a/assets/javascripts/attachments_dmsf.js b/assets/javascripts/attachments_dmsf.js
index ae5346b7..9680f95d 100644
--- a/assets/javascripts/attachments_dmsf.js
+++ b/assets/javascripts/attachments_dmsf.js
@@ -50,8 +50,9 @@ dmsfAddLink.nextLinkId = 1000;
 function dmsfAddFile(inputEl, file, eagerUpload) {
 
     let attachments = $('#dmsf_attachments_fields');
+    let max = ($(inputEl).attr('multiple') == 'multiple') ? 10 : 1
 
-    if (attachments.children().length < 10) {
+    if (attachments.children().length < max) {
 
         let attachmentId = dmsfAddFile.nextAttachmentId++;
         let fileSpan = $('<span>', { id: 'dmsf_attachments_' + attachmentId, 'class': 'attachment' });
@@ -59,9 +60,9 @@ function dmsfAddFile(inputEl, file, eagerUpload) {
         let fileName = $('<input>', {type: 'text', 'class': 'filename readonly',
             name: 'dmsf_attachments[' + attachmentId + '][filename]', readonly: 'readonly'}).val(file.name);
 
-        if($(inputEl).attr('multiple') == 'multiple') {
+        fileSpan.append(fileName);
 
-            fileSpan.append(fileName);
+        if($(inputEl).attr('multiple') == 'multiple') {
 
             if($(inputEl).data('description')) {
 
@@ -87,7 +88,7 @@ function dmsfAddFile(inputEl, file, eagerUpload) {
             attachments.append(fileSpan);
         }
         else{
-            fileSpan.append(fileName);
+            fileSpan.append(iconDel.click(dmsfRemoveFileLbl));
             attachments.append(fileSpan);
             $('#dmsf_file_revision_name').val(file.name);
         }
@@ -216,15 +217,8 @@ function dmsfAddInputFiles(inputEl) {
         }
     }
 
-    if ($(inputEl).attr('multiple') == 'multiple') {
-
-        clearedFileInput.val('');
-        addFileSpan.prepend(clearedFileInput);
-    }
-    else {
-
-        addFileSpan.hide();
-    }
+    clearedFileInput.val('');
+    addFileSpan.prepend(clearedFileInput);
 }
 
 function dmsfUploadAndAttachFiles(files, inputEl) {
diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css
index 198f0b79..1c9e26eb 100644
--- a/assets/stylesheets/redmine_dmsf.css
+++ b/assets/stylesheets/redmine_dmsf.css
@@ -251,6 +251,11 @@ div[id*="revision_access_"] {
 }
 
 /* DMSF file upload */
+
+span.fileover {
+    background-color: lavender;
+}
+
 .dmsf-uploader {
     padding:10px;
     margin-bottom: 20px;