diff --git a/layouts/v7/modules/Documents/resources/Documents.js b/layouts/v7/modules/Documents/resources/Documents.js
index 2c27c221e5165929d1d3732c13f442f6ba491ab1..5d1795d776f37c81f784fd9209a06f5ba1e2fb2d 100644
--- a/layouts/v7/modules/Documents/resources/Documents.js
+++ b/layouts/v7/modules/Documents/resources/Documents.js
@@ -487,45 +487,6 @@ Vtiger.Class('Documents_Index_Js', {
 		});
 	},
 
-	loadQuickCreateContents : function(container) {
-		var self = this;
-		var params = {
-			'module' : container.find('[name="module"]').val(),
-			'view' : 'AjaxView',
-			'mode' : 'showContents'
-		};
-		var quickCreateForm = jQuery('.recordEditView');
-
-		var textAreaElement = quickCreateForm.find('textarea[name="notecontent"]');
-		if(textAreaElement.length){
-			if(CKEDITOR.instances.Documents_editView_fieldName_notecontent_popup) {
-				var notecontent = CKEDITOR.instances.Documents_editView_fieldName_notecontent_popup.getData();
-				textAreaElement.val(notecontent);
-			}
-		}
-
-		var formData = quickCreateForm.serializeFormData();
-		params = jQuery.extend(params, formData);
-		delete params['action'];
-		app.helper.showProgress();
-		app.request.post({'data' : params}).then(function(err, data) {
-			if(!err) {
-				app.helper.hideProgress();
-				container.find('.quickCreateContent').html(data);
-				if(formData.operation == 'CreateDocument') {
-					if(container.find('input[name="type"]').val() === 'W') {
-						 //change id of text area to workaround multiple instances of ckeditor on same element
-						 self.applyEditor(
-							 container.find('#Documents_editView_fieldName_notecontent')
-							 .attr('id','Documents_editView_fieldName_notecontent_popup')
-						 );
-					 }
-				 }
-				vtUtils.applyFieldElementsView(container.find('.quickCreateContent'));
-			} 
-		 });
-	},
-
 	_uploadToExternalStorage : function(container) {
 		var self = this;
 		if(!self.getFile()) {
@@ -572,41 +533,9 @@ Vtiger.Class('Documents_Index_Js', {
 		{'autoHideScrollbar': true});
 	},
 
-	showUploadToExternalStorageModal : function(service,parentId,relatedModule) {
-		var self = this;
-		var url = 'index.php?module=Documents&view=ExternalStorage&operation=UploadTo'+service;
-		if(typeof parentId !== 'undefined' && typeof relatedModule !== 'undefined') {
-			url += '&relationOperation=true&sourceModule='+relatedModule+'&sourceRecord='+parentId;
-		}
-		var relationField = jQuery('div.related-tabs').find('li').filter('.active').data('relatedfield');
-		if (relationField && parentId) {
-			url += '&'+relationField+"="+parentId;
-		}
-		app.helper.showProgress();
-		app.request.get({'url':url}).then(function(e,resp) {
-			app.helper.hideProgress();
-			if(!e) {
-				app.helper.showModal(resp, {
-					'cb' : function(modalContainer) {
-						self.registerUploadToExternalStorageEvents(modalContainer);
-						self.applyScrollToModal(modalContainer);
-					}
-				});
-			}
-		});
-	},
-
-	showUploadDocumentModal : function(service,parentId,relatedModule) {
-		if(service === 'Vtiger') {
-			this.showUploadToVtigerModal(parentId,relatedModule);
-		} else {
-			this.showUploadToExternalStorageModal(service,parentId,relatedModule);
-		}
-	},
-
 	uploadTo : function(service,parentId,relatedModule) {
 		this.setFile(false);
-		this.showUploadDocumentModal(service,parentId,relatedModule);
+		this.showUploadToVtigerModal(service,parentId,relatedModule);
 	},
 
 	createExternalDocument : function(container) {
@@ -1039,7 +968,7 @@ Vtiger.Class('Documents_Index_Js', {
 
 	showCreateDocumentModal : function(type,parentId,relatedModule) {
 		var self = this;
-		var url = 'index.php?module=Documents&view=AjaxView&operation=CreateDocument&type='+type;
+		var url = 'index.php?module=Documents&view=QuickCreateAjax&operation=CreateDocument&type='+type;
 		if(typeof parentId !== 'undefined' && typeof relatedModule !== 'undefined') {
 			url += '&relationOperation=true&sourceModule='+relatedModule+'&sourceRecord='+parentId;
 		}
diff --git a/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl b/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
index ba6c6b4ffee7ded592e38fab6bd940765dd2896d..df7d6dc63f6ddca58314d655241a37cc5125e556 100644
--- a/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
+++ b/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
@@ -552,7 +552,7 @@
 		</div>
 	</li>
 
-	<div class="modal-dialog addBlockModal hide">
+	<div class="modal-dialog modal-content addBlockModal hide">
 		{assign var=HEADER_TITLE value={vtranslate('LBL_ADD_CUSTOM_BLOCK', $QUALIFIED_MODULE)}}
 		{include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
 		<form class="form-horizontal addCustomBlockForm">
diff --git a/layouts/v7/modules/Vtiger/resources/Field.js b/layouts/v7/modules/Vtiger/resources/Field.js
index 538859cab6d7dd0d546ed069e90068a25b22a184..c1f00df1d28ca685d19031b0e43e6a66620e9a23 100644
--- a/layouts/v7/modules/Vtiger/resources/Field.js
+++ b/layouts/v7/modules/Vtiger/resources/Field.js
@@ -237,7 +237,10 @@ Vtiger_Field_Js('Vtiger_Picklist_Field_Js',{},{
 		var html = '<select class="select2 inputElement inlinewidth" name="'+ this.getName() +'" id="field_'+this.getModuleName()+'_'+this.getName()+'">';
 		var pickListValues = this.getPickListValues();
 		var selectedOption = app.htmlDecode(this.getValue());
-            html += '<option value="">Select an Option</option>';
+		
+		if(typeof pickListValues[' '] == 'undefined' || pickListValues[' '].length <= 0) {
+			html += '<option value="">Select an Option</option>';
+		}
 		for(var option in pickListValues) {
 			html += '<option value="'+option+'" ';
 			if(option == selectedOption) {