diff --git a/frontend/static/css/composer.css b/frontend/static/css/composer.css
index 81e41cf..8eebf37 100644
--- a/frontend/static/css/composer.css
+++ b/frontend/static/css/composer.css
@@ -344,7 +344,7 @@ span.text-edit.badge.badge-warning {
     content: "  \0040";
 }
 
-.tool.configured {
+.tool,.tool.configured {
     display: inline;
 }
 
@@ -405,7 +405,8 @@ span.text-edit.badge.badge-warning {
 #report-composition .dataviz-container{
     padding-left : 20px;
     padding-right : 20px;
-    padding-top:45px;
+    padding-top:5px;
+    padding-bottom:5px;
 }
 #report-composition .customBaseColumn {
     padding: 0;
diff --git a/frontend/static/js/composer.js b/frontend/static/js/composer.js
index 2305a21..b1d2044 100644
--- a/frontend/static/js/composer.js
+++ b/frontend/static/js/composer.js
@@ -90,12 +90,12 @@ composer = (function () {
         '<i class="fas fa-arrows-alt"></i>',
         '<p id="drag-tag"> drag</p>',
         '</span>',
-        '<span>{{dvz}}</span>',
         '<div class="tool">',
         '<button class="btn btn-default" data-toggle="modal" data-component="report" data-related-id="{{id}}" data-target="#wizard-panel">',
         '<i class="fas fa-cog"></i>',
         '</button>',
         '</div>',
+        '<span>{{dvz}}</span>',
         '<code class="dataviz-definition"></code>',
         '</li>'
     ];