diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade
index 365ef2ac..a27da077 100644
--- a/app/ui/dialogs.glade
+++ b/app/ui/dialogs.glade
@@ -170,6 +170,8 @@ Author: Dmitriy Yefremov
           <object class="GtkBox" id="download_dialog_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_left">2</property>
+            <property name="margin_right">2</property>
             <property name="orientation">vertical</property>
             <property name="spacing">2</property>
             <child>
@@ -180,6 +182,7 @@ Author: Dmitriy Yefremov
                 <property name="margin_left">2</property>
                 <property name="margin_right">2</property>
                 <property name="column_spacing">2</property>
+                <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkLabel" id="label9">
                     <property name="visible">True</property>
@@ -237,7 +240,7 @@ Author: Dmitriy Yefremov
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
@@ -429,7 +432,7 @@ Author: Dmitriy Yefremov
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
diff --git a/app/ui/iptv.py b/app/ui/iptv.py
index f5889798..a9ef5ee1 100644
--- a/app/ui/iptv.py
+++ b/app/ui/iptv.py
@@ -223,7 +223,7 @@ class SearchUnavailableDialog:
                     return
                 future.result()
             self._download_task = False
-        self._dialog.destroy()
+        self.on_close()
 
     def get_unavailable(self, row):
         if not self._download_task:
@@ -252,7 +252,8 @@ class SearchUnavailableDialog:
 
         return self._to_delete if response not in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT) else False
 
-    def on_close(self, item, event=None):
+    @run_idle
+    def on_close(self, item=None, event=None):
         if self._download_task and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
             return
         self._download_task = False
diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index eee1813d..6235a127 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -522,6 +522,17 @@ class MainAppWindow:
     def on_view_popup_menu(self, menu, event):
         """ Shows popup menu for any view """
         if event.get_event_type() == Gdk.EventType.BUTTON_PRESS and event.button == Gdk.BUTTON_SECONDARY:
+            name = Gtk.Buildable.get_name(menu)
+            if name == "services_popup_menu":
+                self.delete_selection(self._fav_view, self._bouquets_view)
+                self.on_view_focus(self._services_view, None)
+            elif name == "fav_popup_menu":
+                self.delete_selection(self._services_view, self._bouquets_view)
+                self.on_view_focus(self._fav_view, None)
+            elif name == "bouquets_popup_menu":
+                self.delete_selection(self._services_view, self._fav_view)
+                self.on_view_focus(self._bouquets_view, None)
+
             menu.popup(None, None, None, None, event.button, event.time)
 
     @run_idle
@@ -590,7 +601,7 @@ class MainAppWindow:
         except Exception as e:
             print(e)
             log("Append services error: " + str(e))
-            show_dialog(DialogType.ERROR, self._main_window, "Reading data error!\n" + e)
+            show_dialog(DialogType.ERROR, self._main_window, "Reading data error!\n" + str(e))
         else:
             if services:
                 for srv in services:
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 369167af..16e19c99 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -662,7 +662,7 @@ Author: Dmitriy Yefremov
     <signal name="delete-event" handler="on_close_app" swapped="no"/>
     <signal name="window-state-event" handler="on_main_window_state" swapped="no"/>
     <child type="titlebar">
-      <object class="GtkHeaderBar">
+      <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">1</property>
@@ -672,13 +672,13 @@ Author: Dmitriy Yefremov
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkMenuButton">
+              <object class="GtkMenuButton" id="file_header_button">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="popover">left_header_popover_menu</property>
                 <child>
-                  <object class="GtkImage">
+                  <object class="GtkImage" id="file_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">find-location-symbolic</property>
@@ -692,7 +692,7 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkSeparator">
+              <object class="GtkSeparator" id="left_header_box_separator">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
@@ -704,14 +704,14 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkButton">
+              <object class="GtkButton" id="download_header_button">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip_text" translatable="yes">FTP-transfer</property>
                 <signal name="clicked" handler="on_download" swapped="no"/>
                 <child>
-                  <object class="GtkImage">
+                  <object class="GtkImage" id="download_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">network-transmit-receive</property>
@@ -725,14 +725,14 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkButton">
+              <object class="GtkButton" id="save_header_button">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="tooltip_text" translatable="yes">Save</property>
                 <signal name="clicked" handler="on_data_save" swapped="no"/>
                 <child>
-                  <object class="GtkImage">
+                  <object class="GtkImage" id="save_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="stock">gtk-save</property>
@@ -746,7 +746,7 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkSeparator">
+              <object class="GtkSeparator" id="left_header_box_separator_2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
@@ -758,13 +758,13 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkToggleButton">
+              <object class="GtkToggleButton" id="filter_header_button">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
                 <child>
-                  <object class="GtkImage">
+                  <object class="GtkImage" id="filter_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="stock">gtk-spell-check</property>
@@ -778,13 +778,13 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkToggleButton">
+              <object class="GtkToggleButton" id="search_header_button">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <signal name="toggled" handler="on_search_toggled" swapped="no"/>
                 <child>
-                  <object class="GtkImage">
+                  <object class="GtkImage" id="search_header_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="stock">gtk-find</property>
@@ -798,7 +798,7 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkSeparator">
+              <object class="GtkSeparator" id="left_header_box_separator_3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
@@ -818,7 +818,7 @@ Author: Dmitriy Yefremov
                 <property name="tooltip_text" translatable="yes">Parent lock On/Off     Ctrl + L</property>
                 <signal name="clicked" handler="on_locked" swapped="no"/>
                 <child>
-                  <object class="GtkImage">
+                  <object class="GtkImage" id="locked_tool_button_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">changes-prevent-symbolic</property>