diff --git a/beat/web/reports/templates/reports/panels/viewer.html b/beat/web/reports/templates/reports/panels/viewer.html
index f9a84262c203ba58e16ae9051c97a90ad153f540..adefaff89be1691242e04c37cf6aea02065f6c78 100644
--- a/beat/web/reports/templates/reports/panels/viewer.html
+++ b/beat/web/reports/templates/reports/panels/viewer.html
@@ -20,6 +20,7 @@
 * You should have received a copy of the GNU Affero Public License along
 * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
 {% endcomment %}
+{% load experiment_tags %}
 {% load ui_tags %}
 {% with object.get_status_display as status %}
 
@@ -45,34 +46,20 @@
 				</div>{# collapse #}
 			</div>{# panel #}
 
-			{% if status != 'Locked' %}
 			<div class="panel panel-default" ng-if="report.experiments.length != 0" >
 				<div class="panel-heading" role="tab" id="info-heading">
 					<h4 class="panel-title">
-						<a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-info" aria-expanded="true" aria-controls="collapse-info">Configuration</a>
+						<a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-info" aria-expanded="true" aria-controls="collapse-info">Experiments List</a>
 					</h4>
 				</div>{# panel-heading #}
 				<div id="collapse-info" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading">
 					<div class="panel-body">
-						<myreportinfo urlprefix={{URL_PREFIX}}></myreportinfo>
-
-						{% if status == 'Editable' and owner %}
-						<div ng-controller='GroupsController as groupsCtrl' class="input-group">
-							<span class="input-group-btn">
-								<button ng-click='groupsCtrl.createGroup(groupsCtrl.newGroupName)' class="btn btn-default" type="button">Create</button>
-							</span>
-							<input ng-model='groupsCtrl.newGroupName' type="text" class="form-control" placeholder="Group name...">
-						</div>
-						{% endif %}
+						{% experiment_table exps owner "experiment-list-test" %}
 					</div>{# panel-body #}
 				</div>{# collapse #}
 			</div>{# panel #}
-			{% endif %}
 
 		</div>{# panel-group #}
-		<div ng-if="report.experiments.length != 0" class="alert alert-success"{% if not owner or status != 'Editable' %}style="display:none;"{% endif %}>
-			<a class="btn btn-success btn-sm add_item" data-toggle="tooltip" data-placement="bottom" title="Add item" addreportitem><i class="fa fa-plus fa-lg"></i> Add a report item</a>
-		</div>
 		<div ng-if="report.experiments.length == 0" class="alert alert-warning"{% if not owner or status != 'Editable' %}style="display:none;"{% endif %}>
 			<i class="fa fa-warning fa-lg"></i> You have <strong>not added any experiments</strong> in this report yet. You may add experiments from <a href="{{ URL_PREFIX }}/experiments/{{ object.author.username }}/">any experiment list page</a> to unlock editing features for this report.
 		</div>
diff --git a/beat/web/reports/templatetags/report_tags.py b/beat/web/reports/templatetags/report_tags.py
index 5ae90d30f05f9c30e530d18705bf2fa7f7011142..5b0e0b6996e614a82e8534aea85600765cc995cb 100644
--- a/beat/web/reports/templatetags/report_tags.py
+++ b/beat/web/reports/templatetags/report_tags.py
@@ -125,6 +125,7 @@ def report_viewer(context, object, owner):
             request=context['request'],
             object=object,
             owner=owner,
+            exps=object.experiments.all(),
             URL_PREFIX=context['URL_PREFIX'],
             )