diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c
index 0ee60fc..02ddd8f 100644
--- a/source/ubl-settings-update.c
+++ b/source/ubl-settings-update.c
@@ -29,12 +29,8 @@ repo_window *setup_repo_window(){
 
     widgets->repoTypeLabel=yon_gtk_builder_get_widget(widgets->builder, "repoTypeLabel");
     widgets->repoTypeEntry=yon_gtk_builder_get_widget(widgets->builder, "repoTypeEntry");
-    widgets->repoURILabel=yon_gtk_builder_get_widget(widgets->builder, "repoURILabel");
-    widgets->repoURIMeanLabel=yon_gtk_builder_get_widget(widgets->builder, "repoURIMeanLabel");
     widgets->repoDistributionLabel=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionLabel");
-    widgets->repoDistributionMeanLabel=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionMeanLabel");
-    widgets->repoSectionsLabel=yon_gtk_builder_get_widget(widgets->builder, "repoSectionsLabel");
-    widgets->repoSectionsMeanlabel=yon_gtk_builder_get_widget(widgets->builder, "repoSectionsMeanlabel");
+    widgets->repoDistributionEntry=yon_gtk_builder_get_widget(widgets->builder, "repoDistributionEntry");
 
     widgets->repoCancelButton=yon_gtk_builder_get_widget(widgets->builder, "repoCancelButton");
     widgets->repoAcceptButton=yon_gtk_builder_get_widget(widgets->builder, "repoAcceptButton");
@@ -43,18 +39,13 @@ repo_window *setup_repo_window(){
     g_signal_connect(G_OBJECT(widgets->repoAcceptButton), "clicked", G_CALLBACK(on_close_subwindow), NULL);
 
 
-    gtk_window_set_title(GTK_WINDOW(widgets->window),_("System update"));
+    gtk_window_set_title(GTK_WINDOW(widgets->window),TITLE_LABEL);
 
-    gtk_label_set_text(GTK_LABEL(widgets->repoTypeLabel),_("Type: "));
-    gtk_label_set_text(GTK_LABEL(widgets->repoURILabel),_("URI: "));
-    gtk_label_set_text(GTK_LABEL(widgets->repoURIMeanLabel),_(" "));
-    gtk_label_set_text(GTK_LABEL(widgets->repoDistributionLabel),_("Distribution: "));
-    gtk_label_set_text(GTK_LABEL(widgets->repoDistributionMeanLabel),_(" "));
-    gtk_label_set_text(GTK_LABEL(widgets->repoSectionsLabel),_("Sections: "));
-    gtk_label_set_text(GTK_LABEL(widgets->repoSectionsMeanlabel),_(" "));
+    gtk_label_set_text(GTK_LABEL(widgets->repoTypeLabel),ADRESS_LABEL);
+    gtk_label_set_text(GTK_LABEL(widgets->repoDistributionLabel),DISTRIBUTION_LABEL);
 
-    gtk_button_set_label(GTK_BUTTON(widgets->repoCancelButton),_("Cancel"));
-    gtk_button_set_label(GTK_BUTTON(widgets->repoAcceptButton),_("Save"));
+    gtk_button_set_label(GTK_BUTTON(widgets->repoCancelButton),CANCEL_LABEL);
+    gtk_button_set_label(GTK_BUTTON(widgets->repoAcceptButton),SAVE_LABEL);
     gtk_widget_show_all(widgets->window);
 }
 
@@ -108,47 +99,47 @@ main_window *setup_window(){
 
     widgets->mainCheckForUpdatesButton=yon_gtk_builder_get_widget(widgets->builder,"checkForUpdatesButton");
 
-    gtk_window_set_title(GTK_WINDOW(widgets->window),_("System update"));
+    gtk_window_set_title(GTK_WINDOW(widgets->window),TITLE_LABEL);
 
-    gtk_label_set_text(GTK_LABEL(widgets->HeaderTopic),_("System update"));
+    gtk_label_set_text(GTK_LABEL(widgets->HeaderTopic),TITLE_LABEL);
 
-    gtk_label_set_text(GTK_LABEL(widgets->generalSettingsTabLabel),_("General"));
-    gtk_label_set_text(GTK_LABEL(widgets->repositoriesSettingsTabLabel),_("Repositories"));
-    gtk_label_set_text(GTK_LABEL(widgets->extraSettingsTabLabel),_("Extra"));
+    gtk_label_set_text(GTK_LABEL(widgets->generalSettingsTabLabel),GENERAL_LABEL);
+    gtk_label_set_text(GTK_LABEL(widgets->repositoriesSettingsTabLabel),REPOSITORIES_LABEL);
+    gtk_label_set_text(GTK_LABEL(widgets->extraSettingsTabLabel),EXTRA_LABEL);
 
-    gtk_label_set_text(GTK_LABEL(widgets->generalSettingsUpdatesCheckFreqLabel),_("Update checking frequency"));
-    gtk_button_set_label(GTK_BUTTON(widgets->generalSettingsHideNoUpdatesCheck),_("Hide icon of no updates found"));
-    gtk_button_set_label(GTK_BUTTON(widgets->generalSettingsDownloadAutoCheck),_("Download updates automatically"));
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),_("Every 1 hour"));
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),_("Every 2 hours"));
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),_("Every 3 hours"));
+    gtk_label_set_text(GTK_LABEL(widgets->generalSettingsUpdatesCheckFreqLabel),CHECK_FREQUENCY_LABEL);
+    gtk_button_set_label(GTK_BUTTON(widgets->generalSettingsHideNoUpdatesCheck),HIDE_NO_UPDATES_LABEL);
+    gtk_button_set_label(GTK_BUTTON(widgets->generalSettingsDownloadAutoCheck),AUTO_UPDATE_LABEL);
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),EVERY_1_HOUR_LABEL);
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),EVERY_2_HOURS_LABEL);
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->generalSettingsUpdatesCheckFreqCombo),EVERY_3_HOURS_LABEL);
 
-    gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsActivateAURCheck),_("Activate AUR"));
-    gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsActivateUBURCheck),_("Activate UBUR"));
-    gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsCreateButton),_("Create"));
-    gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsEditButton),_("Edit"));
-    gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsDeleteButton),_("Delete"));
-    gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsEnabledColumn),_("Enabled"));
-    gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsURIColumn),_("URI"));
+    gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsActivateAURCheck),AUR_LABEL);
+    gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsActivateUBURCheck),UBUR_LABEL);
+    // gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsCreateButton),_("Create"));
+    // gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsEditButton),_("Edit"));
+    // gtk_button_set_label(GTK_BUTTON(widgets->repositoriesSettingsDeleteButton),_("Delete"));
+    gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsEnabledColumn),ENABLED_LABEL);
+    gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(widgets->repositoriesSettingsURIColumn),URI_LABEL);
 
-    gtk_label_set_text(GTK_LABEL(widgets->extraSettingsPackageManagerLabel),_("Package manager: "));
-    gtk_label_set_text(GTK_LABEL(widgets->extraSettingsUpdateCommandLabel),_("Update command: "));
-    gtk_label_set_text(GTK_LABEL(widgets->extraSettingsCacheCleanlabel),_("Cache clean command: "));
-    gtk_button_set_label(GTK_BUTTON(widgets->extraSettingsLaunchPackageManagerButton),_("Launch package manager"));
+    gtk_label_set_text(GTK_LABEL(widgets->extraSettingsPackageManagerLabel),PACKAGE_MANAGER_LABEL);
+    gtk_label_set_text(GTK_LABEL(widgets->extraSettingsUpdateCommandLabel),UPDATE_COMMAND_LABEL);
+    gtk_label_set_text(GTK_LABEL(widgets->extraSettingsCacheCleanlabel),CACHE_CLEAN_LABEL);
+    gtk_button_set_label(GTK_BUTTON(widgets->extraSettingsLaunchPackageManagerButton),LAUNCH_PACKAGE_MANAGER_LABEL);
 
-    gtk_label_set_text(GTK_LABEL(widgets->headerLoadConfigLabel),_("load"));
-    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerLoadGlobalConfigButton),_("Load global configuration"));
-    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerLoadLocalConfigButton),_("Load local configuration"));
+    gtk_label_set_text(GTK_LABEL(widgets->headerLoadConfigLabel),LOAD_LABEL);
+    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerLoadGlobalConfigButton),LOAD_GLOBAL_LABEL);
+    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerLoadLocalConfigButton),LOAD_LOCAL_LABEL);
 
-    gtk_label_set_text(GTK_LABEL(widgets->headerSaveConfigLabel),_("Save"));
-    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveGlobalLocalConfigButton),_("Save to global and local configuration"));
-    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveGlobalConfigButton),_("Save to global configuration"));
-    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveLocalConfigButton),_("Save to local configuration"));
+    gtk_label_set_text(GTK_LABEL(widgets->headerSaveConfigLabel),SAVE_LABEL);
+    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveGlobalLocalConfigButton),SAVE_LABEL);
+    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveGlobalConfigButton),SAVE_GLOBAL_LABEL);
+    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerSaveLocalConfigButton),SAVE_LOCAL_LABEL);
 
-    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerDocumentationButton),_("Documentation"));
-    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerAboutButton),_("About"));
+    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerDocumentationButton),DOCUMENTATION_LABEL);
+    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->headerAboutButton),ABOUT_LABEL);
 
-    gtk_button_set_label(GTK_BUTTON(widgets->mainCheckForUpdatesButton),_("Check for updates"));
+    gtk_button_set_label(GTK_BUTTON(widgets->mainCheckForUpdatesButton),CHECK_FOR_UPDATES_LABEL);
 
     
 
@@ -163,7 +154,7 @@ main_window *setup_window(){
     yon_ubl_header_setup(Overlay,Header,Image,image_path);
     gtk_overlay_add_overlay(GTK_OVERLAY(UnderNoteOverlay),checkForUpdatesButton);
 
-    gtk_label_set_text(GTK_LABEL(headLabel),_("System update parameter configuration"));
+    gtk_label_set_text(GTK_LABEL(headLabel),TITLE_LABEL);
     gtk_widget_show_all(widgets->window);
 
 
diff --git a/source/ubl-settings-update.h b/source/ubl-settings-update.h
index e5129f0..69c7296 100644
--- a/source/ubl-settings-update.h
+++ b/source/ubl-settings-update.h
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <libintl.h>
+#include "ubl-settings-update-strings.h"
 
 #define _(String) gettext(String)
 
@@ -75,12 +76,8 @@ typedef struct {
 
     GtkWidget *repoTypeLabel;
     GtkWidget *repoTypeEntry;
-    GtkWidget *repoURILabel;
-    GtkWidget *repoURIMeanLabel;
     GtkWidget *repoDistributionLabel;
-    GtkWidget *repoDistributionMeanLabel;
-    GtkWidget *repoSectionsLabel;
-    GtkWidget *repoSectionsMeanlabel;
+    GtkWidget *repoDistributionEntry;
 
     GtkWidget *repoCancelButton;
     GtkWidget *repoAcceptButton;
diff --git a/ubl-settings-update.desktop b/ubl-settings-update.desktop
index c67c7c4..74138da 100644
--- a/ubl-settings-update.desktop
+++ b/ubl-settings-update.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=ubl-settings-update
-Name[ru]=Настройки обновлений
+Name[ru]=Обновление системы
 GenericName=ubl-settings-quotas
-GenericName[ru]=Настройки обновлений
+GenericName[ru]=Обвноление системы
 Comment=ubl-settings-update
 Comment[ru]=Приложение для управления настройками обновлений
 Type=Application
diff --git a/ubl-settings-update.glade b/ubl-settings-update.glade
index 6e72350..d89d9df 100644
--- a/ubl-settings-update.glade
+++ b/ubl-settings-update.glade
@@ -66,6 +66,7 @@
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="ahre"/>
   <object class="GtkBox" id="boxColor">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -211,43 +212,6 @@
             <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">5</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkLabel" id="repoURILabel">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">URI:</property>
-                    <property name="xalign">0</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="repoURIMeanLabel">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="xalign">0</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">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
@@ -267,13 +231,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="repoDistributionMeanLabel">
+                  <object class="GtkEntry">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="can-focus">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
@@ -285,43 +248,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkLabel" id="repoSectionsLabel">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">Sections:</property>
-                    <property name="xalign">0</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="repoSectionsMeanlabel">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="xalign">0</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">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -397,12 +323,10 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="ahre">
+  <object class="GtkSizeGroup">
     <widgets>
-      <widget name="repoSectionsLabel"/>
-      <widget name="repoDistributionLabel"/>
-      <widget name="repoURILabel"/>
       <widget name="repoTypeLabel"/>
+      <widget name="repoDistributionLabel"/>
     </widgets>
   </object>
   <object class="GtkImage" id="image3">
@@ -425,6 +349,21 @@
     <property name="valign">start</property>
     <property name="image">image4</property>
   </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">value-increase-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">error-correct-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">user-trash-symbolic</property>
+  </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name gboolean1 -->
@@ -501,6 +440,8 @@
     </child>
   </object>
   <object class="GtkWindow" id="MainWindow">
+    <property name="width-request">800</property>
+    <property name="height-request">600</property>
     <property name="can-focus">False</property>
     <property name="default-width">800</property>
     <property name="default-height">600</property>
@@ -714,6 +655,8 @@
                               <object class="GtkBox">
                                 <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">5</property>
                                 <child>
                                   <object class="GtkTreeView" id="RepositoriesTreeView">
@@ -756,9 +699,9 @@
                                   <object class="GtkBox">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="valign">center</property>
+                                    <property name="valign">start</property>
                                     <property name="orientation">vertical</property>
-                                    <property name="spacing">25</property>
+                                    <property name="spacing">15</property>
                                     <child>
                                       <object class="GtkButton">
                                         <property name="visible">True</property>
@@ -822,6 +765,54 @@
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <object class="GtkButton" id="CreateButton">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">True</property>
+                                        <property name="receives-default">True</property>
+                                        <property name="image">image5</property>
+                                        <style>
+                                          <class name="thin"/>
+                                        </style>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="EditButton">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">True</property>
+                                        <property name="receives-default">True</property>
+                                        <property name="image">image6</property>
+                                        <style>
+                                          <class name="thin"/>
+                                        </style>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="DeleteButton">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">True</property>
+                                        <property name="receives-default">True</property>
+                                        <property name="image">image7</property>
+                                        <style>
+                                          <class name="thin"/>
+                                        </style>
+                                      </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>
@@ -836,60 +827,6 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkBox">
-                                <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">5</property>
-                                <child>
-                                  <object class="GtkButton" id="CreateButton">
-                                    <property name="label" translatable="yes">Create</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="EditButton">
-                                    <property name="label" translatable="yes">Edit</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="DeleteButton">
-                                    <property name="label" translatable="yes">Delete</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="pack-type">end</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="position">1</property>
@@ -1051,7 +988,6 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="pack-type">end</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>