diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index b207f15..52dac69 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -169,6 +169,28 @@
       </object>
     </child>
   </object>
+  <object class="GtkPopover" id="popCalendar">
+    <property name="width-request">240</property>
+    <property name="height-request">185</property>
+    <property name="can-focus">False</property>
+    <property name="position">bottom</property>
+    <property name="constrain-to">none</property>
+    <child>
+      <object class="GtkCalendar" id="cldrDate">
+        <property name="visible">True</property>
+        <property name="can-focus">True</property>
+        <property name="margin-left">10</property>
+        <property name="margin-right">10</property>
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
+        <property name="year">2023</property>
+        <property name="month">1</property>
+        <property name="day">10</property>
+      </object>
+    </child>
+  </object>
   <object class="GtkWindow" id="window">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes" context="Settings the date and time" comments="Date and Time Settings">Настройки даты и времени</property>
@@ -306,7 +328,7 @@
                             <property name="can-focus">False</property>
                             <child>
                               <object class="GtkLabel" id="lblTime">
-                                <property name="width-request">160</property>
+                                <property name="width-request">0</property>
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
                                 <property name="margin-left">5</property>
@@ -376,20 +398,9 @@
                                 <property name="position">3</property>
                               </packing>
                             </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
                             <child>
                               <object class="GtkLabel" id="lblData">
-                                <property name="width-request">160</property>
+                                <property name="width-request">20</property>
                                 <property name="visible">True</property>
                                 <property name="can-focus">False</property>
                                 <property name="margin-left">5</property>
@@ -405,7 +416,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                             <child>
@@ -425,7 +436,7 @@ Format: DD.MM.YYYY</property>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="position">5</property>
                               </packing>
                             </child>
                             <child>
@@ -451,14 +462,14 @@ Format: DD.MM.YYYY</property>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="position">6</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -471,7 +482,7 @@ Format: DD.MM.YYYY</property>
                                 <property name="can-focus">True</property>
                                 <property name="receives-default">True</property>
                                 <property name="margin-left">5</property>
-                                <property name="margin-right">5</property>
+                                <property name="margin-right">8</property>
                                 <property name="margin-start">5</property>
                                 <property name="margin-end">5</property>
                                 <property name="margin-top">6</property>
@@ -549,7 +560,7 @@ Format: DD.MM.YYYY</property>
                                 <property name="can-focus">True</property>
                                 <property name="receives-default">True</property>
                                 <property name="margin-left">5</property>
-                                <property name="margin-right">10</property>
+                                <property name="margin-right">8</property>
                                 <property name="margin-start">5</property>
                                 <property name="margin-end">10</property>
                                 <property name="margin-top">6</property>
@@ -992,29 +1003,6 @@ Format: DD.MM.YYYY</property>
       </object>
     </child>
   </object>
-  <object class="GtkPopover" id="popCalendar">
-    <property name="width-request">240</property>
-    <property name="height-request">185</property>
-    <property name="can-focus">False</property>
-    <property name="relative-to">btnChooseDate</property>
-    <property name="position">bottom</property>
-    <property name="constrain-to">none</property>
-    <child>
-      <object class="GtkCalendar" id="cldrDate">
-        <property name="visible">True</property>
-        <property name="can-focus">True</property>
-        <property name="margin-left">10</property>
-        <property name="margin-right">10</property>
-        <property name="margin-start">10</property>
-        <property name="margin-end">10</property>
-        <property name="margin-top">10</property>
-        <property name="margin-bottom">10</property>
-        <property name="year">2023</property>
-        <property name="month">1</property>
-        <property name="day">10</property>
-      </object>
-    </child>
-  </object>
   <object class="GtkWindow" id="windowsNnpClose">
     <property name="can-focus">False</property>
     <child>