diff --git a/beat/web/reports/static/reports/app/directives/edit/panelContent.js b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
index 9b5090d03bbee96a7f5031277bcd975307eb69d6..589c2c6fd18ea186faecc2f8db40de9c430652c3 100644
--- a/beat/web/reports/static/reports/app/directives/edit/panelContent.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
@@ -67,11 +67,6 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
 				</span>
 			</span>
 		</form>
-		<div
-			group-add-items-menu
-			class="btn-group" role="group" role='tab'
-			group='group'>
-		</div>
 		<div class='btn-group action-buttons'>
 			<span
 				ng-click='deleteGroup(group.name)'
@@ -85,6 +80,11 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
 				<i class='fa fa-arrows fa-lg'></i>
 			</span>
 		</div>
+		<div
+			group-add-items-menu
+			class="btn-group" role="group" role='tab'
+			group='group'>
+		</div>
 	</h4>
 </div>
 <div id="collapse-{{group.name}}"
@@ -93,7 +93,13 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
 	aria-labelledby="{{group.name}}-heading">
 	<div class="panel-body panel-group">
 		<div group-panel-experiments group='group' class='panel panel-default'></div>
-		<div ng-if='group.experiments.length > 0' group-panel-items group='group' class='panel panel-default'></div>
+		<div
+			style='margin-top: 5px;'
+			ng-if='group.experiments.length > 0'
+			group-panel-items
+			group='group'
+			>
+		</div>
 	</div>
 </div>
 `
diff --git a/beat/web/reports/static/reports/app/directives/edit/panelItems.js b/beat/web/reports/static/reports/app/directives/edit/panelItems.js
index 4ad633fee326489f08f703a5ae0dbab915dd9457..0f446ed829bc8431ef67ed490887bbce9c2cd53c 100644
--- a/beat/web/reports/static/reports/app/directives/edit/panelItems.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelItems.js
@@ -36,35 +36,14 @@ angular.module('reportApp').directive("groupPanelItems", [function(){
 			};
 		},
 		template: `
-<div id="{{group.name}}-itemlist-heading" class="panel-heading" role="tab">
-	<h4 class="panel-title">
-		<a
-			class=''
-			role="button"
-			data-toggle="collapse"
-			data-parent="#{{group.name}}-itemlist-heading"
-			href="#collapse-{{group.name}}-itemlist"
-			aria-expanded="true"
-			aria-controls="collapse-{{group.name}}-itemlist">
-			Items
-		</a>
-	</h4>
-</div>
-<div id="collapse-{{group.name}}-itemlist"
-	class="panel-collapse collapse in"
-	role="tabpanel"
-	aria-labelledby="{{group.name}}-itemlist-heading">
-	<div class="panel-body">
-		<div ui-sortable='sortableOptions' ng-model='group._reportItems' class='panel-group'>
-			<div
-				group-item-container
-				ng-repeat='item in group.reportItems'
-				group='group'
-				report-item='item'
-				style='margin-bottom: 5px;'
-				>
-			</div>
-		</div>
+<div ui-sortable='sortableOptions' ng-model='group._reportItems'>
+	<div
+		group-item-container
+		ng-repeat='item in group.reportItems'
+		group='group'
+		report-item='item'
+		style='margin-bottom: 5px;'
+		>
 	</div>
 </div>
 `
diff --git a/beat/web/reports/static/reports/app/directives/edit/plotItem.js b/beat/web/reports/static/reports/app/directives/edit/plotItem.js
index 2d9ecc4379e8f824c512084745e27943b81692e9..cdc7343f779c9264478e2406d473ce3a1b0fbfae 100644
--- a/beat/web/reports/static/reports/app/directives/edit/plotItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/plotItem.js
@@ -48,7 +48,6 @@ angular.module('reportApp')
 			aria-expanded="true"
 			aria-controls="collapse-{{domId}}">
 		</a>
-
 		<div class='btn-group action-buttons'>
 			<span
 				ng-click='group.removeReportItem(id)'
diff --git a/beat/web/reports/static/reports/app/directives/edit/tableItem.js b/beat/web/reports/static/reports/app/directives/edit/tableItem.js
index 2147b6b15e49e4949332b1669ca05f800063aad0..69a4fa74ab732681416d5deae734124c7634d3e6 100644
--- a/beat/web/reports/static/reports/app/directives/edit/tableItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/tableItem.js
@@ -180,7 +180,19 @@ angular.module('reportApp')
 			aria-expanded="true"
 			aria-controls="collapse-{{domId}}">
 		</a>
-
+		<div class='btn-group action-buttons'>
+			<span
+				ng-click='group.removeReportItem(id)'
+				class="btn btn-default btn-delete"
+				data-toggle="tooltip" data-placement="top" title="Delete Table">
+				<i class="fa fa-times fa-lg"></i>
+			</span>
+			<span
+				class='btn btn-default drag-handle'
+				data-toggle='tooltip' data-placement='top' title='Drag to re-order item'>
+				<i class='fa fa-arrows fa-lg'></i>
+			</span>
+		</div>
 		<div class="btn-group" role="group" role='tab'>
 			<div class="btn-group" role="group"
 				group-table-field-selector
@@ -205,19 +217,6 @@ angular.module('reportApp')
 				Toggle CSV View
 			</button>
 		</div>
-		<div class='btn-group action-buttons'>
-			<span
-				ng-click='group.removeReportItem(id)'
-				class="btn btn-default btn-delete"
-				data-toggle="tooltip" data-placement="top" title="Delete Table">
-				<i class="fa fa-times fa-lg"></i>
-			</span>
-			<span
-				class='btn btn-default drag-handle'
-				data-toggle='tooltip' data-placement='top' title='Drag to re-order item'>
-				<i class='fa fa-arrows fa-lg'></i>
-			</span>
-		</div>
 	</h4>
 </div>
 <div id="collapse-{{domId}}"
diff --git a/beat/web/reports/static/reports/app/directives/edit/textItem.js b/beat/web/reports/static/reports/app/directives/edit/textItem.js
index bb55aae5dee6979f4b3c6c033e59e8db0ef4d8e4..c5b0df8d3a5d39b5668dbc9ab119ad3651e3d0a0 100644
--- a/beat/web/reports/static/reports/app/directives/edit/textItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/textItem.js
@@ -91,14 +91,6 @@ angular.module('reportApp')
 			aria-expanded="true"
 			aria-controls="collapse-{{domId}}">
 		</a>
-
-		<div class="btn-group" role="group" role='tab'>
-			<!-- dont show split view, just toggle between html/rst view !-->
-			<button class='btn btn-default' ng-click='isViewingSrc.val = !isViewingSrc.val'>
-				Toggle View
-			</button>
-		</div>
-
 		<div class='btn-group action-buttons'>
 			<span
 				ng-click='group.removeReportItem(item.id)'
@@ -112,6 +104,12 @@ angular.module('reportApp')
 				<i class='fa fa-arrows fa-lg'></i>
 			</span>
 		</div>
+		<div class="btn-group" role="group" role='tab'>
+			<!-- dont show split view, just toggle between html/rst view !-->
+			<button class='btn btn-default' ng-click='isViewingSrc.val = !isViewingSrc.val'>
+				Toggle View
+			</button>
+		</div>
 	</h4>
 </div>
 <div id="collapse-{{domId}}"