diff --git a/code/GridFieldBulkImageUpload.php b/code/GridFieldBulkImageUpload.php
index 01abf1c..8a16d57 100644
--- a/code/GridFieldBulkImageUpload.php
+++ b/code/GridFieldBulkImageUpload.php
@@ -159,20 +159,19 @@ class GridFieldBulkImageUpload implements GridField_HTMLProvider, GridField_URLH
 		
 		Requirements::css(BULK_EDIT_TOOLS_PATH . '/css/GridFieldBulkImageUpload.css');
 		
-		/*
-		$data = new ArrayData(array(
-			'NewLink' => $gridField->Link('bulkimageupload'),
-			'ButtonName' => 'Bulk Upload'
-		));	
-		*/
-		$html = '
-		<a id="bulkImageUploadGFButton" href="'.$gridField->Link('bulkimageupload').'"  class="action action-detail ss-ui-action-constructive ss-ui-button ui-button ui-widget ui-state-default ui-corner-all new new-link" data-icon="add">
-			Bulk Upload
-		</a>';
+		$targetFragment = 'before';
+		if ( $gridField->getConfig()->getComponentByType('GridFieldButtonRow') )
+		{
+			$targetFragment = 'buttons-before-right';
+		}
+
+		$bulkUploadBtn = new ArrayData(array(
+			'Link' => $gridField->Link('bulkimageupload'),
+			'Label' => 'Bulk Upload',
+		));
 		
 		return array(
-			//'bulk-edit-tools' => $data->renderWith('GridFieldAddNewbutton')
-			'bulk-edit-tools' => $html
+			$targetFragment => $bulkUploadBtn->renderWith('BulkUploadButton')
 		);
 	}
 	
diff --git a/templates/BulkUploadButton.ss b/templates/BulkUploadButton.ss
new file mode 100644
index 0000000..584da5b
--- /dev/null
+++ b/templates/BulkUploadButton.ss
@@ -0,0 +1,3 @@
+<a id="bulkImageUploadGFButton" href="$Link" class="action action-detail ss-ui-action-constructive ss-ui-button ui-button ui-widget ui-state-default ui-corner-all new new-link" data-icon="add">
+$Label
+</a>
\ No newline at end of file