diff --git a/js/app/controllers/InteropModule.js b/js/app/controllers/InteropModule.js
index d8aa463..6878050 100644
--- a/js/app/controllers/InteropModule.js
+++ b/js/app/controllers/InteropModule.js
@@ -407,6 +407,7 @@ Ext.define('amdaDesktop.InteropModule', {
 				layout: 'anchor',
 				width: 800,
 				height: 600,
+				minWidth: 700,
 				modal: true,
 				minimizable: false,
 				iconCls: this.icon,
diff --git a/js/app/views/EpnTapUI.js b/js/app/views/EpnTapUI.js
index 6f42115..43a22e0 100644
--- a/js/app/views/EpnTapUI.js
+++ b/js/app/views/EpnTapUI.js
@@ -197,29 +197,25 @@ Ext.define('amdaUI.EpnTapUI', {
 			defaults: { margin: 5 },
 			items: [{ // Left part
 				xtype : 'container',
-				flex: 3,
+				flex: 1,
 				items: [
 					this.createTargetNameCB(),
-					this.createProductTypeCB(),
-					{
-						xtype: 'panel',
-						layout: { type: 'hbox', pack: 'start', align: 'stretch' },
-						border: false,
-						items: [
-							this.createRowPerPageNf(),
-							this.createNavigationPanel()
-						]
-					}
+					this.createProductTypeCB()
 				]
-			}, { // Right part
-				xtype : 'form',
-				id: 'epnTapIntervalSelector',
-				layout: 'form',
-				border: 'false',
-				flex: 2,
+			}, { // Middle part
+				xtype : 'container',
+				flex: 1,
 				items: [
 					this.createTimeSelector()
 				]
+			}, { // Right part
+				xtype : 'container',
+				flex: 1,
+				items: [
+					this.createRowPerPageNf(),
+					this.createNavigationPanel()
+				]
+
 			}]
 		};
 	},
@@ -242,7 +238,7 @@ Ext.define('amdaUI.EpnTapUI', {
 			valueField: 'id',
 			multiSelect: true,
 			displayField: 'name',
-			maxWidth: 100,
+			labelWidth: 80,
 			editable: false,
 			listeners: {
 				select: function(combo, records) {
@@ -279,7 +275,8 @@ Ext.define('amdaUI.EpnTapUI', {
 			queryParam: 'input',
 			displayField: 'name',
 			valueField: 'id',
-			maxWidth: 100,
+			labelWidth: 80,
+			minWidth: 20,
 			minChars: 2,
 			hideTrigger: true,
 			listConfig: {
@@ -363,9 +360,6 @@ Ext.define('amdaUI.EpnTapUI', {
 			margin: '2 0 2 50',
 			defaults: { margin: '0 5 0 5', width: 20, xtype: 'button', disabled: true},
 			items: [{
-				xtype: 'label',
-				text: 'Page:'
-			}, {
 				id: 'epnTapFirstPageBtn',
 				text: '|<',
 				tooltip: 'First page'
--
libgit2 0.21.2