diff --git a/app/ui/epg_dialog.glade b/app/ui/epg_dialog.glade
index 8033b983..f3e9c66b 100644
--- a/app/ui/epg_dialog.glade
+++ b/app/ui/epg_dialog.glade
@@ -170,6 +170,7 @@ Author: Dmitriy Yefremov
           <object class="GtkLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">center</property>
             <property name="label" translatable="yes">Service names source:</property>
           </object>
           <packing>
@@ -207,7 +208,7 @@ Author: Dmitriy Yefremov
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="xml_radiobutton">
-                    <property name="label" translatable="yes">XML  file</property>
+                    <property name="label" translatable="yes">XML file</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
@@ -235,6 +236,7 @@ Author: Dmitriy Yefremov
                 <property name="sensitive">False</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">2</property>
                 <child>
                   <object class="GtkFileChooserButton" id="xml_chooser_button">
                     <property name="visible">True</property>
@@ -250,24 +252,9 @@ Author: Dmitriy Yefremov
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="web_grid">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_top">10</property>
-                    <property name="row_spacing">2</property>
-                    <property name="column_homogeneous">True</property>
-                    <child>
-                      <object class="GtkSwitch" id="use_web_source_switch">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="halign">end</property>
-                        <signal name="state-set" handler="on_use_web_source_switch" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
@@ -277,8 +264,22 @@ Author: Dmitriy Yefremov
                         <property name="label" translatable="yes">Use web source</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch" id="use_web_source_switch">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="halign">end</property>
+                        <signal name="state-set" handler="on_use_web_source_switch" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
@@ -300,12 +301,12 @@ Author: Dmitriy Yefremov
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Url to channels*.xml.gz file:</property>
+                        <property name="label" translatable="yes">Url to *.xml.gz file:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
@@ -318,7 +319,7 @@ Author: Dmitriy Yefremov
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -357,6 +358,7 @@ Author: Dmitriy Yefremov
                   <object class="GtkSwitch" id="enable_filtering_switch">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="halign">end</property>
                     <signal name="state-set" handler="on_enable_filtering_switch" swapped="no"/>
                   </object>
                   <packing>
@@ -384,7 +386,8 @@ Author: Dmitriy Yefremov
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Epg.dat file source:</property>
+                    <property name="halign">center</property>
+                    <property name="label" translatable="yes">Paths to the epg.dat file:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -397,7 +400,7 @@ Author: Dmitriy Yefremov
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Local:</property>
+                    <property name="label" translatable="yes">Local path:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -427,7 +430,7 @@ Author: Dmitriy Yefremov
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">STB:</property>
+                    <property name="label" translatable="yes">STB path:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/app/ui/epg_dialog.py b/app/ui/epg_dialog.py
index e7c710b1..90bb7e64 100644
--- a/app/ui/epg_dialog.py
+++ b/app/ui/epg_dialog.py
@@ -217,9 +217,10 @@ class EpgDialog:
 
     def on_auto_configuration(self, item):
         """ Simple mapping of services by name. """
-        use_cyrillic = locale.getdefaultlocale()[0] in ("ru_RU",)  # "be_BY", "uk_UA", "sr_RS"
+        use_cyrillic = locale.getdefaultlocale()[0] in ("ru_RU", "be_BY", "uk_UA", "sr_RS")
         tr = None
         if use_cyrillic:
+            # TODO add characters for: "be_BY", "uk_UA", "sr_RS"
             symbols = (u"АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯTB",
                        u"ABVGDEEJZIJKLMNOPRSTUFHZCSS_Y_EUATV")
             tr = {ord(k): ord(v) for k, v in zip(*symbols)}
diff --git a/app/ui/iptv.glade b/app/ui/iptv.glade
index 4764e7fd..f27c997f 100644
--- a/app/ui/iptv.glade
+++ b/app/ui/iptv.glade
@@ -615,7 +615,7 @@ Author: Dmitriy Yefremov
     <property name="use-header-bar">1</property>
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
-    <property name="title"> IPTV streams list configuration</property>
+    <property name="title" translatable="yes">IPTV streams list configuration</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>