diff --git a/src/css/plugin.css b/src/css/plugin.css
index 4842e95..af8ede9 100644
--- a/src/css/plugin.css
+++ b/src/css/plugin.css
@@ -1,5 +1,5 @@
-.group-by-tag-checkbox input+label::before,
-.group-by-tag-checkbox input+label::after {
+.group-by-tag-checkbox input + label::before,
+.group-by-tag-checkbox input + label::after {
     transition: none !important;
     background: #292929 none;
 }
@@ -8,19 +8,19 @@
     margin-left: -3px;
 }
 
-.group-by-tag-checkbox input+label::before {
+.group-by-tag-checkbox input + label::before {
     color: #eb6618;
 }
 
-.group-by-tag-checkbox:hover input+label::before {
+.group-by-tag-checkbox:hover input + label::before {
     color: #eb6618;
 }
 
-.group-by-tag-checkbox input+label::after {
+.group-by-tag-checkbox input + label::after {
     color: #5bbf00;
 }
 
-.group-by-tag-checkbox:hover input+label::after {
+.group-by-tag-checkbox:hover input + label::after {
     color: #5bbf00;
 }
 
@@ -44,9 +44,11 @@
 .red {
     color: #F44336;
 }
+
 .darkgray {
     color: darkgray;
 }
+
 .orange {
     color: #eb6618;
 }
@@ -71,11 +73,19 @@
     cursor: pointer;
 }
 
+.fa {
+    text-align: center;
+}
+
 .disabled .fa, .enabled .fa {
     color: white;
 }
 
-.italic{
+.fa-exclamation-triangle {
+    padding-right: 4px;
+}
+
+.italic {
     font-style: italic;
 }
 
@@ -84,7 +94,7 @@
     margin: 0 5px;
 }
 
-.highlight .separator{
+.highlight .separator {
     border-right: 2px solid lightgoldenrodyellow;
 }
 
@@ -102,16 +112,16 @@
     padding: 2px 10px;
     margin-left: 5px;
     margin-right: 5px;
-    margin-top: -3px;
+    margin-top: 5px;
     height: 23px;
 }
 
 .custom-tag-value > span {
     margin-left: 5px;
+    margin-top: -5px;
 }
 
 .tag-value-input {
-    margin-top: -9px;
 }
 
 .filter-error {
@@ -148,3 +158,7 @@
 .gf-form-label.error {
     color: red !important;
 }
+
+.padding-left-4 {
+    padding-left: 4px !important;
+}
diff --git a/src/partials/feature.component.html b/src/partials/feature.component.html
index ec71505..6497aff 100644
--- a/src/partials/feature.component.html
+++ b/src/partials/feature.component.html
@@ -1,4 +1,4 @@
-<div class="gf-form">
+<div class="gf-form padding-left-4">
     <label class="gf-form-label feature-label query-keyword width-11 offset-width-11" data-placement="left">
         {{ctrl.component.label}}
     </label>
diff --git a/src/partials/filters.editor.html b/src/partials/filters.editor.html
index 87818f0..1e933a7 100644
--- a/src/partials/filters.editor.html
+++ b/src/partials/filters.editor.html
@@ -1,7 +1,7 @@
 <div class="gf-form-inline"
      ng-repeat="(filterIndex, filter) in ctrl.filters"
      ng-class="{'filter-error': !filter.name || (filter.name && filter.values.length === 0) }">
-    <div class="gf-form offset-width-11">
+    <div class="gf-form padding-left-4 offset-width-11">
         <label ng-if="!filter.showInput"
                class="gf-form-label min-width-10"
                ng-click="ctrl.showInput(filterIndex)"
@@ -39,9 +39,9 @@
             <i class="fa fa-times"></i>
         </a>
     </label>
-    <div class="gf-form gf-form--grow">
-        <div class="gf-form-label gf-form-label--grow">
-            <label class="filter-error-label" ng-if="!filter.name || (filter.name && filter.values.length === 0)">
+    <div class="gf-form gf-form--grow" ng-if="!filter.name || (filter.name && filter.values.length === 0)">
+        <div class="gf-form-label">
+            <label class="filter-error-label">
                 You must choose a tag name and at least one value to apply this filter to the query
             </label>
         </div>
diff --git a/src/partials/tags.select.html b/src/partials/tags.select.html
index 55404a5..cc9d8b4 100644
--- a/src/partials/tags.select.html
+++ b/src/partials/tags.select.html
@@ -1,4 +1,4 @@
-<div class="gf-form">
+<div class="gf-form padding-left-4">
     <div class="tags-container offset-width-11">
         <div class="gf-form">
             <label class="gf-form-label width-10"