diff --git a/Gtk4_Reset/res/calcapp.ui b/Gtk4_Reset/res/calcapp.ui
index 7d16832..7e004fa 100644
--- a/Gtk4_Reset/res/calcapp.ui
+++ b/Gtk4_Reset/res/calcapp.ui
@@ -1,367 +1,319 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.24"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkWindow" id="window">
-    <property name="can-focus">False</property>
     <property name="default-width">440</property>
     <property name="default-height">260</property>
-    <child>
+    <property name="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="margin-top">5</property>
         <property name="margin-bottom">5</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
+        <property name="hexpand">1</property>
+        <property name="vexpand">1</property>
         <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Input expression to calculate:</property>
+            <property name="label" translatable="1">Input expression to calculate:</property>
             <property name="justify">center</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry_ans">
-            <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="focusable">1</property>
+            <property name="hexpand">1</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
         </child>
         <child>
-          <!-- n-columns=5 n-rows=5 -->
           <object class="GtkGrid">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="row-homogeneous">True</property>
-            <property name="column-homogeneous">True</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <property name="row-homogeneous">1</property>
+            <property name="column-homogeneous">1</property>
             <child>
               <object class="GtkButton" id="btn7">
-                <property name="label" translatable="yes">7</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">7</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn8">
-                <property name="label" translatable="yes">8</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">8</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn9">
-                <property name="label" translatable="yes">9</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">9</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnadd">
-                <property name="label" translatable="yes">+</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">+</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn4">
-                <property name="label" translatable="yes">4</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">4</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn5">
-                <property name="label" translatable="yes">5</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">5</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn6">
-                <property name="label" translatable="yes">6</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">6</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnsubb">
-                <property name="label" translatable="yes">-</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">-</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn1">
-                <property name="label" translatable="yes">1</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">1</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn2">
-                <property name="label" translatable="yes">2</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">2</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn3">
-                <property name="label" translatable="yes">3</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">3</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnmul">
-                <property name="label" translatable="yes">*</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">*</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnleft">
-                <property name="label" translatable="yes">(</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">(</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn0">
-                <property name="label" translatable="yes">0</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">0</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">4</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnright">
-                <property name="label" translatable="yes">)</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">)</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btndiv">
-                <property name="label" translatable="yes">/</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">/</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">4</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnback">
-                <property name="label" translatable="yes">BackSpace</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">BackSpace</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">4</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnclear">
-                <property name="label" translatable="yes">CE</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">CE</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">4</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnanswer">
-                <property name="label" translatable="yes">=</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">=</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">4</property>
+                  <property name="row">2</property>
+                  <property name="row-span">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">2</property>
-                <property name="height">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnpoint">
-                <property name="label" translatable="yes">.</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">.</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">4</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnsqrt">
-                <property name="label" translatable="yes">sqrt(x)</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">sqrt(x)</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnpow">
-                <property name="label" translatable="yes">x^2</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">x^2</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btndiv100">
-                <property name="label" translatable="yes">%</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">%</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">4</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
         </child>
       </object>
-    </child>
+    </property>
   </object>
 </interface>
diff --git a/Gtk4_Reset/res/game24.ui b/Gtk4_Reset/res/game24.ui
index 5d19930..2a3ec06 100644
--- a/Gtk4_Reset/res/game24.ui
+++ b/Gtk4_Reset/res/game24.ui
@@ -1,389 +1,289 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.24"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkWindow" id="window">
-    <property name="can-focus">False</property>
     <property name="default-width">440</property>
     <property name="default-height">260</property>
-    <child>
+    <property name="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="margin-top">5</property>
         <property name="margin-bottom">5</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
+        <property name="hexpand">1</property>
+        <property name="vexpand">1</property>
         <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <property name="halign">center</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes">The Numbers:</property>
+                <property name="label" translatable="1">The Numbers:</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="label_numbers">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
+              <object class="GtkLabel" id="label_numbers"/>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Input answer, for example, ((6+6)+6)+6 is an answer,  
-"None" for no answer</property>
+            <property name="label" translatable="1">Input answer, for example, ((6+6)+6)+6 is an answer,  
+&quot;None&quot; for no answer</property>
             <property name="justify">center</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="entry_ans">
-            <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="hexpand">True</property>
+            <property name="focusable">1</property>
+            <property name="hexpand">1</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
         </child>
         <child>
-          <!-- n-columns=4 n-rows=4 -->
           <object class="GtkGrid">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="row-homogeneous">True</property>
-            <property name="column-homogeneous">True</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <property name="row-homogeneous">1</property>
+            <property name="column-homogeneous">1</property>
             <child>
               <object class="GtkButton" id="btn7">
-                <property name="label" translatable="yes">7</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">7</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn8">
-                <property name="label" translatable="yes">8</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">8</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn9">
-                <property name="label" translatable="yes">9</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">9</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnadd">
-                <property name="label" translatable="yes">+</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">+</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn4">
-                <property name="label" translatable="yes">4</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">4</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn5">
-                <property name="label" translatable="yes">5</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">5</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn6">
-                <property name="label" translatable="yes">6</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">6</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnsubb">
-                <property name="label" translatable="yes">-</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">-</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn1">
-                <property name="label" translatable="yes">1</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">1</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn2">
-                <property name="label" translatable="yes">2</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">2</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn3">
-                <property name="label" translatable="yes">3</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">3</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnmul">
-                <property name="label" translatable="yes">*</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">*</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnleft">
-                <property name="label" translatable="yes">(</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">(</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btn0">
-                <property name="label" translatable="yes">0</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">0</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnright">
-                <property name="label" translatable="yes">)</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">)</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btndiv">
-                <property name="label" translatable="yes">/</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="relief">none</property>
+                <property name="label" translatable="1">/</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
+                <property name="has-frame">0</property>
+                <layout>
+                  <property name="column">3</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
             <property name="halign">center</property>
             <property name="spacing">10</property>
             <child>
               <object class="GtkButton" id="btnstart">
-                <property name="label" translatable="yes">Start</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
+                <property name="label" translatable="1">Start</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</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="btnnext">
-                <property name="label" translatable="yes">Next</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
+                <property name="label" translatable="1">Next</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</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="btncheck">
-                <property name="label" translatable="yes">Check</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
+                <property name="label" translatable="1">Check</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnclear">
-                <property name="label" translatable="yes">Clear</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
+                <property name="label" translatable="1">Clear</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnexit">
-                <property name="label" translatable="yes">Exit</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
+                <property name="label" translatable="1">Exit</property>
+                <property name="focusable">1</property>
+                <property name="receives-default">1</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">5</property>
-          </packing>
         </child>
       </object>
-    </child>
+    </property>
   </object>
 </interface>