diff --git a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html
index b03d1a0..1e59387 100644
--- a/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html
+++ b/src/VirtoCommerce.ExportModule.Web/Scripts/blades/export-generic-viewer.tpl.html
@@ -1,21 +1,16 @@
-<div class="blade-static" ng-style="blade.exportDataRequest.restrictDataSelectivity && {'height': '140px'}" ng-if="blade.isExpanded">
-    <div class="form-group">
-        <div class="inner-block">
-            <p ng-if="blade.exportDataRequest.restrictDataSelectivity" class="text __note"><span>{{ 'export.blades.export-generic-viewer.labels.important' | translate }}</span> {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}</p>
+<div class="blade-static" ng-if="blade.isExpanded">
+    <div class="form-group searchrow">
+        <div class="form-input column-half">
+            <input placeholder="{{'platform.placeholders.search-keyword' | translate}}" ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()">
+            <button class="btn" title="Clear" ng-click="filter.resetKeyword();filter.criteriaChanged()"></button>
         </div>
-        <div class="form-input __search">
-            <input placeholder="{{'platform.placeholders.search-keyword' | translate}}" ng-model="filter.keyword" ng-keyup="$event.which === 13 && filter.criteriaChanged()" style="width: 190px">
-            <button class="btn __other" style="position: relative;right: 45px;">
-                <i class="btn-ico fa fa-remove" title="Clear" ng-click="filter.resetKeyword();filter.criteriaChanged()"></i>
-            </button>
-            <ui-select ng-model="filter.current" ng-change="filter.change()" style="left: 220px;position: absolute;width: 190px;top: 0px;">
-                <ui-select-match allow-clear="true" placeholder="{{'export.blades.export-generic-viewer.placeholders.select-filter' | translate}}">{{$select.selected.name | translate}}</ui-select-match>
-                <ui-select-choices repeat="x in exportSearchFilters | filter: $select.search">
-                    <span ng-bind-html="x.name | translate | highlight: $select.search"></span>
-                </ui-select-choices>
-            </ui-select>
-            <a href="" ng-click="filter.edit()" style="left: 416px; position:absolute;" class="form-edit"><i class="form-ico fa fa-pencil"></i></a>
-        </div>        
+        <ui-select ng-model="filter.current" ng-change="filter.change()" class="column-half">
+            <ui-select-match allow-clear="true" placeholder="{{'export.blades.export-generic-viewer.placeholders.select-filter' | translate}}">{{$select.selected.name | translate}}</ui-select-match>
+            <ui-select-choices repeat="x in exportSearchFilters | filter: $select.search">
+                <span ng-bind-html="x.name | translate | highlight: $select.search"></span>
+            </ui-select-choices>
+        </ui-select>
+        <a href="" ng-click="filter.edit()" class="filter-edit"><i class="fa fa-pencil"></i></a>
     </div>
 </div>
 <div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel.tpl.html'"></div>
@@ -36,6 +31,7 @@
                         },
                         { name: 'name', displayName: 'export.blades.export-generic-viewer.labels.name', cellTemplate: 'export-item-list-name.cell.html' },
                     ]})">
+            <p ng-if="blade.exportDataRequest.restrictDataSelectivity" class="text __note"><span>{{ 'export.blades.export-generic-viewer.labels.important' | translate }}</span> {{ 'export.blades.export-generic-viewer.labels.important-description' | translate }}</p>
             <div class="table-wrapper" ng-if="items.length > 0">
                 <div ui-grid="gridOptions" ui-grid-auto-resize ui-grid-save-state ui-grid-selection ui-grid-resize-columns ui-grid-move-columns ui-grid-pinning ui-grid-height ui-grid-infinite-scroll></div>
             </div>