diff --git a/app/ui/epg/dialog.glade b/app/ui/epg/dialog.glade
index 84540400..569eac83 100644
--- a/app/ui/epg/dialog.glade
+++ b/app/ui/epg/dialog.glade
@@ -846,7 +846,7 @@ Author: Dmitriy Yefremov
                         <property name="image">filter_image</property>
                         <property name="always-show-image">True</property>
                         <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
-                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
+                        <accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | Primary"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -982,6 +982,10 @@ Author: Dmitriy Yefremov
           <object class="GtkPaned" id="main_paned">
             <property name="visible">True</property>
             <property name="can-focus">True</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
             <property name="border-width">5</property>
             <property name="wide-handle">True</property>
             <child>
@@ -989,156 +993,118 @@ Author: Dmitriy Yefremov
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="label-xalign">0.49000000953674316</property>
-                <property name="shadow-type">in</property>
+                <property name="shadow-type">none</property>
                 <child>
-                  <object class="GtkBox" id="source_box">
-                    <property name="width-request">240</property>
+                  <object class="GtkViewport" id="source_viewport">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-end">5</property>
-                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="shadow-type">in</property>
-                        <child>
-                          <object class="GtkTreeView" id="source_view">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="model">service_sort_model</property>
-                            <property name="search-column">0</property>
-                            <property name="fixed-height-mode">True</property>
-                            <property name="enable-grid-lines">both</property>
-                            <property name="tooltip-column">4</property>
-                            <signal name="button-press-event" handler="on_popup_menu" object="source_popup_menu" swapped="no"/>
-                            <signal name="drag-begin" handler="on_drag_begin" swapped="no"/>
-                            <signal name="drag-data-get" handler="on_drag_data_get" swapped="no"/>
-                            <signal name="key-press-event" handler="on_key_press" swapped="no"/>
-                            <signal name="query-tooltip" handler="on_source_view_query_tooltip" swapped="no"/>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection"/>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="service_column">
-                                <property name="resizable">True</property>
-                                <property name="sizing">fixed</property>
-                                <property name="min-width">50</property>
-                                <property name="title" translatable="yes">Service</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <property name="sort-column-id">0</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="source_service_renderertext">
-                                    <property name="xpad">5</property>
-                                    <property name="ellipsize">end</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="pos_column">
-                                <property name="sizing">fixed</property>
-                                <property name="min-width">70</property>
-                                <property name="title" translatable="yes">Pos</property>
-                                <property name="alignment">0.5</property>
-                                <property name="sort-column-id">1</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="source_pos_renderertext">
-                                    <property name="xpad">5</property>
-                                    <property name="xalign">0.5099999904632568</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">1</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="ref_column">
-                                <property name="resizable">True</property>
-                                <property name="sizing">fixed</property>
-                                <property name="min-width">50</property>
-                                <property name="title" translatable="yes">Reference</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="source_reference_renderertext">
-                                    <property name="xpad">10</property>
-                                    <property name="xalign">0.5099999904632568</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">2</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="source_info_bar_box">
-                        <property name="height-request">24</property>
+                      <object class="GtkBox" id="source_box">
+                        <property name="width-request">240</property>
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="spacing">2</property>
+                        <property name="margin-start">10</property>
+                        <property name="margin-end">10</property>
+                        <property name="margin-top">10</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkImage">
+                          <object class="GtkScrolledWindow">
                             <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="icon-name">document-properties-symbolic</property>
-                            <property name="icon_size">1</property>
+                            <property name="can-focus">True</property>
+                            <property name="shadow-type">in</property>
+                            <child>
+                              <object class="GtkTreeView" id="source_view">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="model">service_sort_model</property>
+                                <property name="search-column">0</property>
+                                <property name="fixed-height-mode">True</property>
+                                <property name="enable-grid-lines">both</property>
+                                <property name="tooltip-column">4</property>
+                                <signal name="button-press-event" handler="on_popup_menu" object="source_popup_menu" swapped="no"/>
+                                <signal name="drag-begin" handler="on_drag_begin" swapped="no"/>
+                                <signal name="drag-data-get" handler="on_drag_data_get" swapped="no"/>
+                                <signal name="key-press-event" handler="on_key_press" swapped="no"/>
+                                <signal name="query-tooltip" handler="on_source_view_query_tooltip" swapped="no"/>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="service_column">
+                                    <property name="resizable">True</property>
+                                    <property name="sizing">fixed</property>
+                                    <property name="min-width">50</property>
+                                    <property name="title" translatable="yes">Service</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <property name="sort-column-id">0</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="source_service_renderertext">
+                                        <property name="xpad">5</property>
+                                        <property name="ellipsize">end</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="pos_column">
+                                    <property name="sizing">fixed</property>
+                                    <property name="min-width">70</property>
+                                    <property name="title" translatable="yes">Pos</property>
+                                    <property name="alignment">0.5</property>
+                                    <property name="sort-column-id">1</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="source_pos_renderertext">
+                                        <property name="xpad">5</property>
+                                        <property name="xalign">0.5099999904632568</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">1</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="ref_column">
+                                    <property name="resizable">True</property>
+                                    <property name="sizing">fixed</property>
+                                    <property name="min-width">50</property>
+                                    <property name="title" translatable="yes">Reference</property>
+                                    <property name="alignment">0.5</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="source_reference_renderertext">
+                                        <property name="xpad">10</property>
+                                        <property name="xalign">0.5099999904632568</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">2</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="source_count_label">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="label" translatable="yes">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="source_info_box">
-                            <property name="height-request">26</property>
+                          <object class="GtkBox" id="source_info_bar_box">
+                            <property name="height-request">24</property>
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
                             <property name="spacing">2</property>
                             <child>
-                              <object class="GtkLabel" id="source_info_label">
+                              <object class="GtkImage">
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="label" translatable="yes">info</property>
-                                <property name="justify">center</property>
-                                <property name="ellipsize">end</property>
-                                <property name="single-line-mode">True</property>
-                                <property name="track-visited-links">False</property>
+                                <property name="icon-name">document-properties-symbolic</property>
+                                <property name="icon_size">1</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1147,12 +1113,10 @@ Author: Dmitriy Yefremov
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkProgressBar" id="xml_download_progress_bar">
+                              <object class="GtkLabel" id="source_count_label">
+                                <property name="visible">True</property>
                                 <property name="can-focus">False</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <property name="margin-end">15</property>
-                                <property name="pulse-step">0.01</property>
+                                <property name="label" translatable="yes">0</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1160,46 +1124,92 @@ Author: Dmitriy Yefremov
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinner" id="src_load_spinner">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="tooltip-text" translatable="yes">Loading data...</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
+                            <child>
+                              <object class="GtkBox" id="source_info_box">
+                                <property name="height-request">26</property>
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="halign">center</property>
+                                <property name="valign">center</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <object class="GtkLabel" id="source_info_label">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="label" translatable="yes">info</property>
+                                    <property name="justify">center</property>
+                                    <property name="ellipsize">end</property>
+                                    <property name="single-line-mode">True</property>
+                                    <property name="track-visited-links">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkProgressBar" id="xml_download_progress_bar">
+                                    <property name="can-focus">False</property>
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-end">15</property>
+                                    <property name="pulse-step">0.01</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinner" id="src_load_spinner">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="tooltip-text" translatable="yes">Loading data...</property>
+                                <property name="halign">center</property>
+                                <property name="valign">center</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="pack-type">end</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="pack-type">end</property>
-                            <property name="position">3</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
+                    <style>
+                      <class name="view"/>
+                    </style>
                   </object>
                 </child>
                 <child type="label">
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-top">2</property>
                     <property name="margin-bottom">2</property>
                     <property name="label" translatable="yes">EPG source</property>
                     <attributes>
-                      <attribute name="weight" value="semibold"/>
+                      <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
                 </child>
@@ -1214,230 +1224,264 @@ Author: Dmitriy Yefremov
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="label-xalign">0.49000000953674316</property>
-                <property name="shadow-type">in</property>
+                <property name="shadow-type">none</property>
                 <child>
-                  <object class="GtkBox" id="bouquet_box">
-                    <property name="width-request">240</property>
+                  <object class="GtkViewport" id="bouquet_viewport">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-end">5</property>
-                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkScrolledWindow" id="fav_scrolled_window">
-                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="shadow-type">in</property>
-                        <child>
-                          <object class="GtkTreeView" id="bouquet_view">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="model">bouquet_list_store</property>
-                            <property name="search-column">2</property>
-                            <property name="rubber-banding">True</property>
-                            <property name="enable-grid-lines">both</property>
-                            <property name="tooltip-column">9</property>
-                            <signal name="button-press-event" handler="on_bouquet_popup_menu" object="bouquet_popup_menu" swapped="no"/>
-                            <signal name="cursor-changed" handler="on_bq_cursor_changed" swapped="no"/>
-                            <signal name="drag-data-received" handler="on_drag_data_received" swapped="no"/>
-                            <signal name="key-release-event" handler="on_key_press" swapped="no"/>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="bouquet_view_selection">
-                                <property name="mode">multiple</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="num_column">
-                                <property name="resizable">True</property>
-                                <property name="sizing">fixed</property>
-                                <property name="min-width">30</property>
-                                <property name="title" translatable="yes">Num</property>
-                                <property name="alignment">0.5</property>
-                                <property name="sort-column-id">0</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="num_cellrenderertext">
-                                    <property name="xalign">0.20000000298023224</property>
-                                    <property name="width-chars">5</property>
-                                    <property name="max-width-chars">5</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="cell-background-rgba">10</attribute>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="fav_service_column">
-                                <property name="resizable">True</property>
-                                <property name="sizing">fixed</property>
-                                <property name="min-width">50</property>
-                                <property name="title" translatable="yes">Service</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <property name="sort-column-id">2</property>
-                                <child>
-                                  <object class="GtkCellRendererPixbuf" id="fav_picon_cellrendererpixbuf">
-                                    <property name="xpad">2</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="cell-background-rgba">10</attribute>
-                                    <attribute name="pixbuf">8</attribute>
-                                  </attributes>
-                                </child>
-                                <child>
-                                  <object class="GtkCellRendererPixbuf" id="fav_coded_cellrendererpixbuf">
-                                    <property name="xpad">2</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="cell-background-rgba">10</attribute>
-                                    <attribute name="pixbuf">1</attribute>
-                                  </attributes>
-                                </child>
-                                <child>
-                                  <object class="GtkCellRendererText" id="fav_service_cellrenderertext">
-                                    <property name="ellipsize">end</property>
-                                    <property name="width-chars">25</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="cell-background-rgba">10</attribute>
-                                    <attribute name="text">2</attribute>
-                                  </attributes>
-                                </child>
-                                <child>
-                                  <object class="GtkCellRendererPixbuf" id="fav_locked_cellrendererpixbuf">
-                                    <property name="xpad">2</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="cell-background-rgba">10</attribute>
-                                    <attribute name="pixbuf">3</attribute>
-                                  </attributes>
-                                </child>
-                                <child>
-                                  <object class="GtkCellRendererPixbuf" id="fav_hide_cellrendererpixbuf">
-                                    <property name="xpad">2</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="cell-background-rgba">10</attribute>
-                                    <attribute name="pixbuf">4</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="fav_type_column">
-                                <property name="resizable">True</property>
-                                <property name="sizing">fixed</property>
-                                <property name="min-width">40</property>
-                                <property name="title" translatable="yes">Type</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="type_cellrenderertext">
-                                    <property name="xalign">0.5099999904632568</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="cell-background-rgba">10</attribute>
-                                    <attribute name="text">5</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="fav_pos_column">
-                                <property name="visible">False</property>
-                                <property name="resizable">True</property>
-                                <property name="sizing">fixed</property>
-                                <property name="min-width">10</property>
-                                <property name="title" translatable="yes">Pos</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="pos_cellrenderertext">
-                                    <property name="xalign">0.5099999904632568</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="cell-background-rgba">10</attribute>
-                                    <attribute name="text">6</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="fav_id_column">
-                                <property name="visible">False</property>
-                                <property name="sizing">fixed</property>
-                                <property name="title">fav_id</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="fav_id_cellrenderertext4"/>
-                                  <attributes>
-                                    <attribute name="text">7</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="fav_extra_column">
-                                <property name="visible">False</property>
-                                <property name="sizing">fixed</property>
-                                <property name="title" translatable="yes">extra</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="fav_tooltip_cellrenderertext"/>
-                                  <attributes>
-                                    <attribute name="text">9</attribute>
-                                  </attributes>
-                                </child>
-                                <child>
-                                  <object class="GtkCellRendererPixbuf" id="fav_background_cellrenderertext"/>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="bouquet_info_bar_box">
-                        <property name="height-request">26</property>
+                      <object class="GtkBox" id="bouquet_box">
+                        <property name="width-request">240</property>
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="spacing">2</property>
+                        <property name="margin-start">10</property>
+                        <property name="margin-end">10</property>
+                        <property name="margin-top">10</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkImage">
+                          <object class="GtkScrolledWindow" id="fav_scrolled_window">
                             <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="icon-name">document-properties-symbolic</property>
-                            <property name="icon_size">1</property>
+                            <property name="can-focus">True</property>
+                            <property name="shadow-type">in</property>
+                            <child>
+                              <object class="GtkTreeView" id="bouquet_view">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="model">bouquet_list_store</property>
+                                <property name="search-column">2</property>
+                                <property name="rubber-banding">True</property>
+                                <property name="enable-grid-lines">both</property>
+                                <property name="tooltip-column">9</property>
+                                <signal name="button-press-event" handler="on_bouquet_popup_menu" object="bouquet_popup_menu" swapped="no"/>
+                                <signal name="cursor-changed" handler="on_bq_cursor_changed" swapped="no"/>
+                                <signal name="drag-data-received" handler="on_drag_data_received" swapped="no"/>
+                                <signal name="key-release-event" handler="on_key_press" swapped="no"/>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="num_column">
+                                    <property name="resizable">True</property>
+                                    <property name="sizing">fixed</property>
+                                    <property name="min-width">30</property>
+                                    <property name="title" translatable="yes">Num</property>
+                                    <property name="alignment">0.5</property>
+                                    <property name="sort-column-id">0</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="num_cellrenderertext">
+                                        <property name="xalign">0.20000000298023224</property>
+                                        <property name="width-chars">5</property>
+                                        <property name="max-width-chars">5</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="cell-background-rgba">10</attribute>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="fav_service_column">
+                                    <property name="resizable">True</property>
+                                    <property name="sizing">fixed</property>
+                                    <property name="min-width">50</property>
+                                    <property name="title" translatable="yes">Service</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <property name="sort-column-id">2</property>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf" id="fav_picon_cellrendererpixbuf">
+                                        <property name="xpad">2</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="cell-background-rgba">10</attribute>
+                                        <attribute name="pixbuf">8</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf" id="fav_coded_cellrendererpixbuf">
+                                        <property name="xpad">2</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="cell-background-rgba">10</attribute>
+                                        <attribute name="pixbuf">1</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="fav_service_cellrenderertext">
+                                        <property name="ellipsize">end</property>
+                                        <property name="width-chars">25</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="cell-background-rgba">10</attribute>
+                                        <attribute name="text">2</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf" id="fav_locked_cellrendererpixbuf">
+                                        <property name="xpad">2</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="cell-background-rgba">10</attribute>
+                                        <attribute name="pixbuf">3</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf" id="fav_hide_cellrendererpixbuf">
+                                        <property name="xpad">2</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="cell-background-rgba">10</attribute>
+                                        <attribute name="pixbuf">4</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="fav_type_column">
+                                    <property name="resizable">True</property>
+                                    <property name="sizing">fixed</property>
+                                    <property name="min-width">40</property>
+                                    <property name="title" translatable="yes">Type</property>
+                                    <property name="expand">True</property>
+                                    <property name="alignment">0.5</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="type_cellrenderertext">
+                                        <property name="xalign">0.5099999904632568</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="cell-background-rgba">10</attribute>
+                                        <attribute name="text">5</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="fav_pos_column">
+                                    <property name="visible">False</property>
+                                    <property name="resizable">True</property>
+                                    <property name="sizing">fixed</property>
+                                    <property name="min-width">10</property>
+                                    <property name="title" translatable="yes">Pos</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="pos_cellrenderertext">
+                                        <property name="xalign">0.5099999904632568</property>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="cell-background-rgba">10</attribute>
+                                        <attribute name="text">6</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="fav_id_column">
+                                    <property name="visible">False</property>
+                                    <property name="sizing">fixed</property>
+                                    <property name="title">fav_id</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="fav_id_cellrenderertext4"/>
+                                      <attributes>
+                                        <attribute name="text">7</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="fav_extra_column">
+                                    <property name="visible">False</property>
+                                    <property name="sizing">fixed</property>
+                                    <property name="title" translatable="yes">extra</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="fav_tooltip_cellrenderertext"/>
+                                      <attributes>
+                                        <attribute name="text">9</attribute>
+                                      </attributes>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCellRendererPixbuf" id="fav_background_cellrenderertext"/>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="bouquet_count_label">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="label" translatable="yes">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSeparator">
+                          <object class="GtkBox" id="bouquet_info_bar_box">
+                            <property name="height-request">26</property>
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
-                            <property name="margin-right">5</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-end">5</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="icon-name">document-properties-symbolic</property>
+                                <property name="icon_size">1</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="bouquet_count_label">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSeparator">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-left">5</property>
+                                <property name="margin-right">5</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkImage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-left">2</property>
+                                <property name="stock">gtk-index</property>
+                                <property name="icon_size">1</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="bouquet_epg_count_label">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="halign">center</property>
+                                <property name="label" translatable="yes">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1445,51 +1489,21 @@ Author: Dmitriy Yefremov
                             <property name="position">2</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkImage">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="margin-left">2</property>
-                            <property name="stock">gtk-index</property>
-                            <property name="icon_size">1</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="bouquet_epg_count_label">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="halign">center</property>
-                            <property name="label" translatable="yes">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">4</property>
-                          </packing>
-                        </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
+                    <style>
+                      <class name="view"/>
+                    </style>
                   </object>
                 </child>
                 <child type="label">
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-top">2</property>
                     <property name="margin-bottom">2</property>
                     <property name="label" translatable="yes">Bouquet details</property>
                     <attributes>
-                      <attribute name="weight" value="semibold"/>
+                      <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
                 </child>