diff --git a/js/components/ascribe_detail/further_details.js b/js/components/ascribe_detail/further_details.js
index 8167a690..84684592 100644
--- a/js/components/ascribe_detail/further_details.js
+++ b/js/components/ascribe_detail/further_details.js
@@ -125,7 +125,7 @@ let FileUploader = React.createClass({
         return (
             <Form>
                 <Property
-                    label="Additional files">
+                    label="Additional files (max. 10MB)">
                     <ReactS3FineUploader
                         keyRoutine={{
                             url: AppConstants.serverUrl + 's3/key/',
diff --git a/js/components/ascribe_uploader/file_drag_and_drop.js b/js/components/ascribe_uploader/file_drag_and_drop.js
index fc7a9d27..b95d4a19 100644
--- a/js/components/ascribe_uploader/file_drag_and_drop.js
+++ b/js/components/ascribe_uploader/file_drag_and_drop.js
@@ -113,7 +113,7 @@ let FileDragAndDrop = React.createClass({
         this.props.handleResumeFile(fileId);
     },
 
-    handleOnClick() {
+    handleOnClick(event) {
         // when multiple is set to false and the user already uploaded a piece,
         // do not propagate event
         if(this.props.dropzoneInactive) {
@@ -128,6 +128,7 @@ let FileDragAndDrop = React.createClass({
             bubbles: true,
             cancelable: true
         });
+
         evt.stopPropagation();
         this.refs.fileinput.getDOMNode().dispatchEvent(evt);
     },
diff --git a/js/components/ascribe_uploader/file_drag_and_drop_dialog.js b/js/components/ascribe_uploader/file_drag_and_drop_dialog.js
index 62ada865..d8b3dc1e 100644
--- a/js/components/ascribe_uploader/file_drag_and_drop_dialog.js
+++ b/js/components/ascribe_uploader/file_drag_and_drop_dialog.js
@@ -22,11 +22,11 @@ let FileDragAndDropDialog = React.createClass({
                     <span className="file-drag-and-drop-dialog">
                         <p>Drag a file here</p>
                         <p>or</p>
-                        <button
+                        <span
                             className="btn btn-default"
                             onClick={this.props.onClick}>
                                 choose a file to upload
-                        </button>
+                        </span>
                     </span>
                 );
             }
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index 9d60e3ba..1414b853 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -197,7 +197,8 @@ var ReactS3FineUploader = React.createClass({
                 onProgress: this.onProgress,
                 onDeleteComplete: this.onDeleteComplete,
                 onSessionRequestComplete: this.onSessionRequestComplete,
-                onError: this.onError
+                onError: this.onError,
+                onValidate: this.onValidate
             }
         };
     },
@@ -235,6 +236,7 @@ var ReactS3FineUploader = React.createClass({
 
     createBlob(file) {
         let defer = new fineUploader.Promise();
+
         window.fetch(this.props.createBlobRoutine.url, {
             method: 'post',
             headers: {
@@ -312,6 +314,14 @@ var ReactS3FineUploader = React.createClass({
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
+    onValidate(data) {
+        if(data.size > this.props.validation.sizeLimit) {
+            this.state.uploader.cancelAll();
+            let notification = new GlobalNotificationModel('Your file is bigger than 10MB', 'danger', 5000);
+            GlobalNotificationActions.appendGlobalNotification(notification);
+        }
+    },
+
     onCancel(id) {
         this.removeFileWithIdFromFilesToUpload(id);
 
diff --git a/js/components/register_piece.js b/js/components/register_piece.js
index e5f36c8e..f0bd441a 100644
--- a/js/components/register_piece.js
+++ b/js/components/register_piece.js
@@ -142,7 +142,7 @@ let RegisterPiece = React.createClass( {
     },
 
     getSpecifyEditions() {
-        if (this.state.whitelabel.acl_editions) {
+        if(this.state.whitelabel.acl_editions || Object.keys(this.state.whitelabel).length === 0) {
             return (
                 <PropertyCollapsible
                     name="num_editions"