diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js
index 514730051badc6b5de2d883fae2717bf831d5d3f..92a25e9a0e5b371fa947ee7d77ce23db5804cc7a 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js
@@ -164,6 +164,9 @@ function ServerFacade(openbisServer) {
 		}
 	}
 	
+	this.deleteDataSets = function(datasetIds, reason, callback) {
+		this.openbisServer.deleteDataSets(datasetIds, reason, "TRASH", callback);
+	}
 	
 	this.deleteSamples = function(sampleIds, reason, callback) {
 		this.openbisServer.deleteSamples(sampleIds, reason, "TRASH", callback);
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormController.js
index 3b8cf1b5f807594217ba8bb40bf3091726c124bb..44cd2758d37ca0081a675a654a43814514f98843 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormController.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-function DataSetFormController(mainController, mode, sample, dataset) {
+function DataSetFormController(mainController, mode, sample, dataSet) {
 	this._mainController = mainController;
-	this._dataSetFormModel = new DataSetFormModel(mode, sample, dataset);
+	this._dataSetFormModel = new DataSetFormModel(mode, sample, dataSet);
 	this._dataSetFormView = new DataSetFormView(this, this._dataSetFormModel);
 	
 	this.init = function($container) {
@@ -42,6 +42,18 @@ function DataSetFormController(mainController, mode, sample, dataset) {
 		return null;
 	}
 	
+	this.deleteDataSet = function(reason) {
+		var _this = this;
+		mainController.serverFacade.deleteDataSets([this._dataSetFormModel.dataSet.code], reason, function(data) {
+			if(data.error) {
+				Util.showError(data.error.message);
+			} else {
+				Util.showSuccess("Data Set Deleted");
+				mainController.changeView('showViewSamplePageFromPermId', _this._dataSetFormModel.sample.permId);
+			}
+		});
+	}
+	
 	//
 	// Form Submit
 	//
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormView.js
index 10e547078cc5ea0c01b357d14e27b04270e50630..5cc83be555b30ef9ec7505a5733bb2786a94d88a 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormView.js
@@ -26,15 +26,29 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 		var $wrapper = $('<form>', { class : 'form-horizontal ', 'id' : 'mainDataSetForm', 'role' : 'form'});
 		$wrapper.submit(function(event) {_this._dataSetFormController.submitDataSet(); event.preventDefault();});
 		
+		//Title
 		var titleText = null;
-		var $editButton = "";
 		if(this._dataSetFormModel.mode === FormMode.CREATE) {
-			titleText = 'Create Dataset ';
+			titleText = 'Create Dataset';
 		} else if(this._dataSetFormModel.mode === FormMode.EDIT) {
-			titleText = 'Update Dataset ';
+			titleText = 'Update Dataset';
 		} else if(this._dataSetFormModel.mode === FormMode.VIEW) {
-			titleText = 'View Dataset ';
-			
+			titleText = 'View Dataset';
+		}
+		var $title = $('<h2>').text(titleText);
+		$wrapper.append($title);
+		
+		//Delete Button
+		if(this._dataSetFormModel.mode !== FormMode.CREATE) {
+			$title.append("&nbsp;");
+			$title.append(FormUtil.getDeleteButton(function(reason) {
+				_this._dataSetFormController.deleteDataSet(reason);
+			}, true));
+		}
+		
+		//Edit Button
+		if(this._dataSetFormModel.mode === FormMode.VIEW) {
+			$title.append("&nbsp;");
 			var $editButton = $("<a>", { 'class' : 'btn btn-default'} )
 				.append($('<span>', { 'class' : 'glyphicon glyphicon-edit' }))
 				.append(' Enable Editing');
@@ -42,11 +56,10 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 			$editButton.click(function() {
 				mainController.changeView('showEditDataSetPageFromPermId', _this._dataSetFormModel.dataSet.code);
 			});
+			
+			$title.append($editButton)
 		}
 		
-		//Edit button;
-		$wrapper.append($('<h2>').text(titleText).append($editButton));
-		
 		//Drop Down DataSetType Field Set
 		var $dataSetTypeFieldSet = $('<div>');
 		$dataSetTypeFieldSet.append($('<legend>').text('Type Info'));
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormController.js
index 942109a956763a0200fef9cb68cb0f30b6904ea5..278609e3aad4fe0e89117a57d870984bbd2fddfd 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormController.js
@@ -30,8 +30,12 @@ function ExperimentFormController(mainController, mode, experiment) {
 	this.deleteExperiment = function(reason) {
 		var _this = this;
 		mainController.serverFacade.deleteExperiments([this._experimentFormModel.experiment.id], reason, function(data) {
-			Util.showSuccess("Experiment Deleted");
-			mainController.sideMenu.deleteUniqueIdAndMoveToParent(_this._experimentFormModel.experiment.identifier);
+			if(data.error) {
+				Util.showError(data.error.message);
+			} else {
+				Util.showSuccess("Experiment Deleted");
+				mainController.sideMenu.deleteUniqueIdAndMoveToParent(_this._experimentFormModel.experiment.identifier);
+			}
 		});
 	}
 	
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormController.js
index 2a2d1757223add2dae5cbcf79b0d3a9bc3d5e17b..1adcc78d5b158a0b40475e2c3100689f27586d3c 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormController.js
@@ -50,6 +50,23 @@ function SampleFormController(mainController, mode, sample) {
 		this._storageControllers.push(storageController);
 	}
 	
+	this.deleteSample = function(reason) {
+		var _this = this;
+		mainController.serverFacade.deleteSamples([this._sampleFormModel.sample.id], reason, function(data) {
+			if(data.error) {
+				Util.showError(data.error.message);
+			} else {
+				Util.showSuccess("Sample Deleted");
+				if(_this._sampleFormModel.isELNSubExperiment) {
+					mainController.sideMenu.refreshSubExperiment(_this._sampleFormModel.sample.experimentIdentifierOrNull);
+					mainController.changeView("showExperimentPageFromIdentifier", _this._sampleFormModel.sample.experimentIdentifierOrNull);
+				} else {
+					mainController.changeView('showSamplesPage', ":" + _this._sampleFormModel.sample.experimentIdentifierOrNull);
+				}
+			}
+		});
+	}
+	
 	this.createUpdateCopySample = function(isCopyWithNewCode, linkParentsOnCopy, copyChildrenOnCopy) {
 		Util.blockUI();
 		var _this = this;
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
index 627f1cd3b366fd5199c936edc9c47713b3691768..9e40205651e9619cc2e52f0643eea503b52e892c 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
@@ -68,15 +68,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
 		if(this._sampleFormModel.mode !== FormMode.CREATE) {
 			//Delete
 			$formTitle.append(FormUtil.getDeleteButton(function(reason) {
-				mainController.serverFacade.deleteSamples([_this._sampleFormModel.sample.id], reason, function(data) {
-					Util.showSuccess("Sample Deleted");
-					if(_this._sampleFormModel.isELNSubExperiment) {
-						mainController.sideMenu.refreshSubExperiment(_this._sampleFormModel.sample.experimentIdentifierOrNull);
-						mainController.changeView("showExperimentPageFromIdentifier", _this._sampleFormModel.sample.experimentIdentifierOrNull);
-					} else {
-						mainController.changeView('showSamplesPage', ":" + _this._sampleFormModel.sample.experimentIdentifierOrNull);
-					}
-				});
+				_this._sampleFormController.deleteSample(reason);
 			}, true));
 			//Pin
 			$formTitle.append("&nbsp;");