[gtk/grid-api: 1/2] grid layout: Rename some properties




commit a4c34c2d2fb491ec48a53c4e216ac303a289dbfd
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 2 14:13:14 2020 -0400

    grid layout: Rename some properties
    
    Rename GtkGridLayoutChild:left-attach/top-attach to
    GtkGridLayoutChild:column/row. Update all users.
    
    Fixes: #2967

 demos/constraint-editor/constraint-editor.ui       |   64 +-
 demos/constraint-editor/guide-editor.ui            |   56 +-
 demos/gtk-demo/application.ui                      |   16 +-
 demos/gtk-demo/blendmodes.ui                       |   96 +-
 demos/gtk-demo/filtermodel.ui                      |   24 +-
 demos/gtk-demo/fontrendering.ui                    |   44 +-
 demos/gtk-demo/listbox.ui                          |   24 +-
 demos/gtk-demo/revealer.ui                         |   36 +-
 demos/gtk-demo/scale.ui                            |   24 +-
 demos/gtk-demo/spinbutton.ui                       |   48 +-
 demos/gtk-demo/stack.ui                            |    8 +-
 demos/icon-browser/window.ui                       |   64 +-
 demos/node-editor/node-editor-window.ui            |   16 +-
 demos/widget-factory/widget-factory.ui             |  118 +-
 docs/reference/gtk/getting_started.md              |   28 +-
 docs/reference/gtk/gtk4-sections.txt               |    8 +-
 examples/application6/prefs.ui                     |   16 +-
 examples/application7/prefs.ui                     |   16 +-
 examples/application8/prefs.ui                     |   16 +-
 examples/application9/prefs.ui                     |   16 +-
 examples/builder.ui                                |   12 +-
 gtk/gtkgrid.c                                      |  112 +-
 gtk/gtkgrid.h                                      |   12 +-
 gtk/gtkgridlayout.c                                |   94 +-
 gtk/gtkgridlayout.h                                |   12 +-
 gtk/gtkwidget.c                                    |    8 +-
 gtk/inspector/resource-list.ui                     |   24 +-
 gtk/tools/gtk-builder-tool-simplify.c              |    8 +-
 gtk/ui/gtkcoloreditor.ui                           |   56 +-
 gtk/ui/gtkemojichooser.ui                          |   12 +-
 gtk/ui/gtkfilechooserwidget.ui                     |   36 +-
 gtk/ui/gtkfontchooserwidget.ui                     |   48 +-
 gtk/ui/gtkpagesetupunixdialog.ui                   |   40 +-
 gtk/ui/gtkplacesview.ui                            |    8 +-
 gtk/ui/gtkprintunixdialog.ui                       |  180 +--
 tests/dialog.ui                                    |   32 +-
 tests/testoverlay.c                                |   12 +-
 tests/testsplitheaders.ui                          |   16 +-
 testsuite/css/nodes/buttons.ui                     |   36 +-
 testsuite/gtk/builder.c                            |    4 +-
 testsuite/gtk/focus-chain/widget-factory.ui        |  118 +-
 testsuite/gtk/focus-chain/widget-factory2.ui       |  118 +-
 testsuite/gtk/focus-chain/widget-factory3.ui       |  118 +-
 testsuite/gtk/grid-layout.c                        |   56 +-
 testsuite/reftests/animation-direction.ref.ui      |  128 +-
 testsuite/reftests/animation-direction.ui          |  128 +-
 .../animation-fill-mode-iteration-count.ref.ui     |  256 ++--
 .../animation-fill-mode-iteration-count.ui         |  256 ++--
 .../reftests/background-color-transparent.ref.ui   |    8 +-
 testsuite/reftests/background-color-transparent.ui |    8 +-
 testsuite/reftests/background-position.ui          |   36 +-
 testsuite/reftests/background-repeat.ref.ui        |   16 +-
 testsuite/reftests/background-repeat.ui            |   12 +-
 testsuite/reftests/background-size-keywords.ref.ui |   48 +-
 testsuite/reftests/background-size-keywords.ui     |   48 +-
 testsuite/reftests/background-size.ref.ui          |   48 +-
 testsuite/reftests/background-size.ui              |   48 +-
 .../border-corner-zero-width-rendering.ref.ui      |   64 +-
 .../reftests/border-corner-zero-width-rendering.ui |   64 +-
 testsuite/reftests/border-image-excess-size.ref.ui |   16 +-
 testsuite/reftests/border-style.ref.ui             |    4 +-
 testsuite/reftests/border-style.ui                 |   16 +-
 testsuite/reftests/box-order.ref.ui                |   20 +-
 testsuite/reftests/box-order.ui                    |   20 +-
 testsuite/reftests/box-shadow-spec-inset.ref.ui    |   24 +-
 testsuite/reftests/box-shadow-spec-inset.ui        |   24 +-
 testsuite/reftests/cross-fade-syntax.ref.ui        |  400 +++---
 testsuite/reftests/cross-fade-syntax.ui            |  400 +++---
 testsuite/reftests/css-em-label-size.ref.ui        |   56 +-
 testsuite/reftests/css-em-label-size.ui            |   56 +-
 testsuite/reftests/css-match-descendant-later.ui   |    8 +-
 testsuite/reftests/css-match-exact.ui              |    4 +-
 testsuite/reftests/grid-empty-with-spacing.ui      |    4 +-
 testsuite/reftests/grid-expand.ref.ui              |   12 +-
 testsuite/reftests/grid-expand.ui                  |   12 +-
 testsuite/reftests/grid-homogeneous.ref.ui         |   32 +-
 testsuite/reftests/grid-homogeneous.ui             |   48 +-
 testsuite/reftests/grid-spacing1.ui                |   28 +-
 testsuite/reftests/grid-spacing2.ui                |   44 +-
 testsuite/reftests/grid-spacing3.ref.ui            |   16 +-
 testsuite/reftests/grid-spacing3.ui                |   16 +-
 testsuite/reftests/grid-wfh.ref.ui                 |    8 +-
 testsuite/reftests/grid-wfh.ui                     |    8 +-
 testsuite/reftests/gtk-image-effect-inherit.ui     |   12 +-
 testsuite/reftests/icon-style-basics.ref.ui        |  168 +--
 testsuite/reftests/icon-style-basics.ui            |  168 +--
 testsuite/reftests/icon-vfuncs.ref.ui              |   40 +-
 testsuite/reftests/icon-vfuncs.ui                  |   40 +-
 testsuite/reftests/iconview-empty.ref.ui           |   64 +-
 testsuite/reftests/iconview-empty.ui               |   64 +-
 testsuite/reftests/label-sizing.ref.ui             | 1300 ++++++++++----------
 testsuite/reftests/label-sizing.ui                 | 1300 ++++++++++----------
 testsuite/reftests/label-wrap-justify.ref.ui       |   16 +-
 testsuite/reftests/label-wrap-justify.ui           |   16 +-
 testsuite/reftests/named-colors.ref.ui             |  600 ++++-----
 testsuite/reftests/named-colors.ui                 |  600 ++++-----
 testsuite/reftests/paned-undersized.ui             |    4 +-
 testsuite/reftests/partial-rounded-border.ref.ui   |   16 +-
 testsuite/reftests/partial-rounded-border.ui       |   16 +-
 testsuite/reftests/quit-mnemonic.ui                |    8 +-
 testsuite/reftests/rotated-layout.ref.ui           |    8 +-
 testsuite/reftests/rotated-layout.ui               |    8 +-
 testsuite/reftests/separator-size.ref.ui           |   32 +-
 testsuite/reftests/separator-size.ui               |   20 +-
 testsuite/reftests/sizegroups-basics.ref.ui        |   12 +-
 testsuite/reftests/sizegroups-basics.ui            |   12 +-
 .../sizegroups-evolution-identity-page.ref.ui      |   60 +-
 .../reftests/sizegroups-evolution-identity-page.ui |   56 +-
 testsuite/reftests/textview-border-windows.ref.ui  |   20 +-
 testsuite/reftests/window-height-for-width.ref.ui  |    8 +-
 testsuite/reftests/window-height-for-width.ui      |    8 +-
 111 files changed, 4514 insertions(+), 4516 deletions(-)
---
diff --git a/demos/constraint-editor/constraint-editor.ui b/demos/constraint-editor/constraint-editor.ui
index a9054756a7..d7c0d0e25b 100644
--- a/demos/constraint-editor/constraint-editor.ui
+++ b/demos/constraint-editor/constraint-editor.ui
@@ -13,8 +13,8 @@
           <object class="GtkLabel">
             <property name="label">Target</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -23,8 +23,8 @@
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <signal name="changed" handler="update_button" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -32,8 +32,8 @@
           <object class="GtkComboBoxText" id="target_attr">
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -41,8 +41,8 @@
           <object class="GtkLabel">
             <property name="label">Relation</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -50,8 +50,8 @@
           <object class="GtkComboBoxText" id="relation">
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -59,8 +59,8 @@
           <object class="GtkLabel">
             <property name="label">Source</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -69,8 +69,8 @@
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <signal name="changed" handler="update_button" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -79,8 +79,8 @@
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <signal name="changed" handler="source_attr_changed" swapped="yes"/>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -88,8 +88,8 @@
           <object class="GtkLabel">
             <property name="label">Multiplier</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -97,8 +97,8 @@
           <object class="GtkEntry" id="multiplier">
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -106,8 +106,8 @@
           <object class="GtkLabel">
             <property name="label">Constant</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -115,8 +115,8 @@
           <object class="GtkEntry" id="constant">
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -124,16 +124,16 @@
           <object class="GtkLabel">
             <property name="label">Strength</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkComboBoxText" id="strength">
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -141,8 +141,8 @@
           <object class="GtkLabel" id="preview">
             <property name="xalign">0</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
               <property name="column-span">2</property>
             </layout>
             <attributes>
@@ -155,8 +155,8 @@
             <property name="label">Create</property>
             <signal name="clicked" handler="create_constraint"/>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
diff --git a/demos/constraint-editor/guide-editor.ui b/demos/constraint-editor/guide-editor.ui
index b67de17f3b..00bf8be028 100644
--- a/demos/constraint-editor/guide-editor.ui
+++ b/demos/constraint-editor/guide-editor.ui
@@ -55,8 +55,8 @@
           <object class="GtkLabel">
             <property name="label">Name</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -64,8 +64,8 @@
           <object class="GtkEntry" id="name">
             <property name="max-width-chars">20</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -74,8 +74,8 @@
           <object class="GtkLabel">
             <property name="label">Min Size</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -84,8 +84,8 @@
             <property name="adjustment">min_width_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -94,8 +94,8 @@
             <property name="adjustment">min_height_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -103,8 +103,8 @@
           <object class="GtkLabel">
             <property name="label">Nat Size</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -113,8 +113,8 @@
             <property name="adjustment">nat_width_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -123,8 +123,8 @@
             <property name="adjustment">nat_height_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -132,8 +132,8 @@
           <object class="GtkLabel">
             <property name="label">Max Size</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -142,8 +142,8 @@
             <property name="adjustment">max_width_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -152,8 +152,8 @@
             <property name="adjustment">max_height_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -161,16 +161,16 @@
           <object class="GtkLabel">
             <property name="label">Strength</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkComboBoxText" id="strength">
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -180,8 +180,8 @@
             <property name="label">Create</property>
             <signal name="clicked" handler="create_guide"/>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui
index 14f2b22566..b54e60884a 100644
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -31,8 +31,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -54,8 +54,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -70,8 +70,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -79,8 +79,8 @@
           <object class="GtkStatusbar" id="status">
             <property name="hexpand">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui
index 1c43ef4482..e87a0a8970 100644
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -18,8 +18,8 @@
               <class name="dim-label"/>
             </style>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -29,8 +29,8 @@
             <property name="has-frame">1</property>
             <property name="min-content-width">150</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -40,8 +40,8 @@
             <property name="hexpand">1</property>
             <property name="stack">stack</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -67,8 +67,8 @@
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Duck</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -76,8 +76,8 @@
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Background</property>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -87,8 +87,8 @@
                           <class name="duck"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -98,8 +98,8 @@
                           <class name="gradient"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -108,8 +108,8 @@
                         <property name="label" translatable="yes">
 Blended picture</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -121,8 +121,8 @@ Blended picture</property>
                           <class name="blend0"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -146,8 +146,8 @@ Blended picture</property>
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Red</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -155,8 +155,8 @@ Blended picture</property>
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Blue</property>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -166,8 +166,8 @@ Blended picture</property>
                           <class name="red"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -177,8 +177,8 @@ Blended picture</property>
                           <class name="blue"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -187,8 +187,8 @@ Blended picture</property>
                         <property name="label" translatable="yes">
 Blended picture</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -200,8 +200,8 @@ Blended picture</property>
                           <class name="blend1"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -228,8 +228,8 @@ Blended picture</property>
                           <class name="cyan"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -239,8 +239,8 @@ Blended picture</property>
                           <class name="magenta"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -250,8 +250,8 @@ Blended picture</property>
                           <class name="yellow"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                         </layout>
                       </object>
                     </child>
@@ -262,8 +262,8 @@ Blended picture</property>
                           <class name="blend2"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">1</property>
+                          <property name="row">3</property>
                         </layout>
                       </object>
                     </child>
@@ -275,8 +275,8 @@ Blended picture</property>
                           <class name="dim-label"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -288,8 +288,8 @@ Blended picture</property>
                           <class name="dim-label"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -301,8 +301,8 @@ Blended picture</property>
                           <class name="dim-label"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                         </layout>
                       </object>
                     </child>
@@ -314,8 +314,8 @@ Blended picture</property>
                           <attribute name="weight" value="bold"></attribute>
                         </attributes>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">1</property>
+                          <property name="row">2</property>
                         </layout>
                       </object>
                     </child>
@@ -324,8 +324,8 @@ Blended picture</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui
index 1d0762d93d..2f1f00fcb1 100644
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -46,8 +46,8 @@
               <attribute name="weight" value="bold"></attribute>
             </attributes>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -81,8 +81,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -128,8 +128,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -141,8 +141,8 @@
               <attribute name="weight" value="bold"></attribute>
             </attributes>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -154,8 +154,8 @@
               <attribute name="weight" value="bold"></attribute>
             </attributes>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -183,8 +183,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/demos/gtk-demo/fontrendering.ui b/demos/gtk-demo/fontrendering.ui
index b106c1f9d4..aa9cec3438 100644
--- a/demos/gtk-demo/fontrendering.ui
+++ b/demos/gtk-demo/fontrendering.ui
@@ -28,7 +28,7 @@
           <object class="GtkEntry" id="entry">
             <property name="text">Fonts render</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
             </layout>
           </object>
         </child>
@@ -41,16 +41,16 @@
               <class name="dim-label"/>
             </style>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkFontButton" id="font_button">
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -62,7 +62,7 @@
               <class name="dim-label"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
+              <property name="column">2</property>
             </layout>
           </object>
         </child>
@@ -77,7 +77,7 @@
               <item translatable="yes" id="full">Full</item>
             </items>
             <layout>
-              <property name="left-attach">3</property>
+              <property name="column">3</property>
             </layout>
           </object>
         </child>
@@ -92,8 +92,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">3</property>
-              <property name="top-attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -109,8 +109,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -126,8 +126,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -138,8 +138,8 @@
               <class name="circular"/>
             </style>
             <layout>
-              <property name="left-attach">5</property>
-              <property name="top-attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -150,8 +150,8 @@
               <class name="circular"/>
             </style>
             <layout>
-              <property name="left-attach">5</property>
-              <property name="top-attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -159,7 +159,7 @@
           <object class="GtkLabel">
             <property name="hexpand">1</property>
             <layout>
-              <property name="left-attach">6</property>
+              <property name="column">6</property>
             </layout>
           </object>
         </child>
@@ -184,8 +184,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">7</property>
             </layout>
           </object>
@@ -204,8 +204,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
               <property name="column-span">7</property>
             </layout>
           </object>
diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index b2bd36b0eb..a237651d82 100644
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -26,8 +26,8 @@
             <property name="margin-end">8</property>
             <property name="icon-name">image-missing</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="row-span">5</property>
             </layout>
           </object>
@@ -71,8 +71,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -85,8 +85,8 @@
             <property name="label" translatable="0">Message</property>
             <property name="wrap">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -111,8 +111,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -165,8 +165,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -221,8 +221,8 @@ FAVORITES</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
diff --git a/demos/gtk-demo/revealer.ui b/demos/gtk-demo/revealer.ui
index 3356658469..79c5dcefcb 100644
--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -19,8 +19,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -35,8 +35,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -51,8 +51,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">3</property>
-              <property name="top-attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -66,8 +66,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -82,8 +82,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -98,8 +98,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -114,8 +114,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -129,8 +129,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -145,8 +145,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui
index be6d0de3a0..1607f5f6a3 100644
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -34,8 +34,8 @@
             <property name="label">Plain</property>
             <property name="xalign">0</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -46,8 +46,8 @@
             <property name="adjustment">adjustment1</property>
             <property name="hexpand">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -56,8 +56,8 @@
             <property name="label">Marks</property>
             <property name="xalign">0</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -75,8 +75,8 @@
               <mark value="4" position="bottom"></mark>
             </marks>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -85,8 +85,8 @@
             <property name="label">Discrete</property>
             <property name="xalign">0</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -105,8 +105,8 @@
               <mark value="4" position="bottom"></mark>
             </marks>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
diff --git a/demos/gtk-demo/spinbutton.ui b/demos/gtk-demo/spinbutton.ui
index 8514dfdc07..28a6d704d5 100644
--- a/demos/gtk-demo/spinbutton.ui
+++ b/demos/gtk-demo/spinbutton.ui
@@ -40,8 +40,8 @@
             <property name="mnemonic-widget">basic_spin</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -54,8 +54,8 @@
             <property name="digits">2</property>
             <property name="numeric">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -64,8 +64,8 @@
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -76,8 +76,8 @@
             <property name="mnemonic-widget">hex_spin</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -90,8 +90,8 @@
             <signal name="output" handler="spinbutton_hex_spin_output"/>
             <property name="wrap">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -100,8 +100,8 @@
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -112,8 +112,8 @@
             <property name="mnemonic-widget">time_spin</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -126,8 +126,8 @@
             <signal name="output" handler="spinbutton_time_spin_output"/>
             <property name="wrap">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -136,8 +136,8 @@
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -148,8 +148,8 @@
             <property name="mnemonic-widget">month_spin</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -163,8 +163,8 @@
             <property name="wrap">1</property>
             <property name="update-policy">if-valid</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -173,8 +173,8 @@
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui
index d1f7c7a91c..93f641684b 100644
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -10,8 +10,8 @@
             <property name="stack">stack</property>
             <property name="halign">center</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -59,8 +59,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/demos/icon-browser/window.ui b/demos/icon-browser/window.ui
index 651db7b3e9..a3230d761e 100644
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -246,8 +246,8 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -256,8 +256,8 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -266,8 +266,8 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">2</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -276,8 +276,8 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <layout>
-                  <property name="left-attach">3</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">3</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -286,8 +286,8 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <layout>
-                  <property name="left-attach">4</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">4</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -296,8 +296,8 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <layout>
-                  <property name="left-attach">5</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">5</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -306,8 +306,8 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <layout>
-                  <property name="left-attach">6</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">6</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -316,8 +316,8 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <layout>
-                  <property name="left-attach">7</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">7</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -330,8 +330,8 @@
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -344,8 +344,8 @@
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -358,8 +358,8 @@
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">2</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -372,8 +372,8 @@
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">3</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">3</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -386,8 +386,8 @@
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">4</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">4</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -400,8 +400,8 @@
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">5</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">5</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -414,8 +414,8 @@
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">6</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">6</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -428,8 +428,8 @@
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">7</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">7</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
diff --git a/demos/node-editor/node-editor-window.ui b/demos/node-editor/node-editor-window.ui
index 175e3a2192..b7e94f9e8f 100644
--- a/demos/node-editor/node-editor-window.ui
+++ b/demos/node-editor/node-editor-window.ui
@@ -38,8 +38,8 @@
           <object class="GtkCheckButton" id="testcase_cairo_checkbutton">
             <property name="label">Render using Cairo renderer</property>
             <layout>
-              <property name="top-attach">1</property>
-              <property name="left-attach">0</property>
+              <property name="row">1</property>
+              <property name="column">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -52,8 +52,8 @@
             <property name="use-markup">1</property>
             <property name="max-width-chars">50</property>
             <layout>
-              <property name="top-attach">2</property>
-              <property name="left-attach">0</property>
+              <property name="row">2</property>
+              <property name="column">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -64,8 +64,8 @@
             <property name="wrap">1</property>
             <property name="xalign">0</property>
             <layout>
-              <property name="top-attach">3</property>
-              <property name="left-attach">0</property>
+              <property name="row">3</property>
+              <property name="column">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -83,8 +83,8 @@
               <class name="suggested-action" />
             </style>
             <layout>
-              <property name="top-attach">4</property>
-              <property name="left-attach">0</property>
+              <property name="row">4</property>
+              <property name="column">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 4923a455ce..8e962e4e9f 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -639,8 +639,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkCheckButton" id="checkbutton2">
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -649,8 +649,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -660,8 +660,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -670,8 +670,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -681,8 +681,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -691,8 +691,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -701,8 +701,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -712,8 +712,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -722,8 +722,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -733,8 +733,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -745,8 +745,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -754,15 +754,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner1">
                                     <property name="spinning">1</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner2">
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -771,8 +771,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="spinning">1</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -780,8 +780,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner4">
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -1519,8 +1519,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1536,8 +1536,8 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="halign">center</property>
                                         <signal name="value-changed" handler="on_scale_button_value_changed" 
swapped="no"/>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -3011,8 +3011,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -3020,8 +3020,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -3036,8 +3036,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3045,8 +3045,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3061,8 +3061,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3072,8 +3072,8 @@ bad things might happen.</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3088,8 +3088,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3098,8 +3098,8 @@ bad things might happen.</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3169,7 +3169,7 @@ bad things might happen.</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -3186,8 +3186,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3196,7 +3196,7 @@ bad things might happen.</property>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3215,8 +3215,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3228,8 +3228,8 @@ bad things might happen.</property>
             <property name="menu-model">gear_menu</property>
             <property name="tooltip-text">This is a menu button</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3242,8 +3242,8 @@ bad things might happen.</property>
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/docs/reference/gtk/getting_started.md b/docs/reference/gtk/getting_started.md
index d12d35ff30..9e4803dcb2 100644
--- a/docs/reference/gtk/getting_started.md
+++ b/docs/reference/gtk/getting_started.md
@@ -649,8 +649,8 @@ Create a new file with the following content named `builder.ui`.
           <object id="button1" class="GtkButton">
             <property name="label">Button 1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -658,8 +658,8 @@ Create a new file with the following content named `builder.ui`.
           <object id="button2" class="GtkButton">
             <property name="label">Button 2</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -667,8 +667,8 @@ Create a new file with the following content named `builder.ui`.
           <object id="quit" class="GtkButton">
             <property name="label">Quit</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -1266,16 +1266,16 @@ Lets start with the template.
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
             <child>
               <object class="GtkFontButton" id="font">
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -1286,8 +1286,8 @@ Lets start with the template.
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -1299,8 +1299,8 @@ Lets start with the template.
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index cb4fced509..c6ef42f3e8 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -7247,10 +7247,10 @@ gtk_grid_layout_get_baseline_row
 <SUBSECTION>
 GtkGridLayoutChild
 
-gtk_grid_layout_child_set_top_attach
-gtk_grid_layout_child_get_top_attach
-gtk_grid_layout_child_set_left_attach
-gtk_grid_layout_child_get_left_attach
+gtk_grid_layout_child_set_column
+gtk_grid_layout_child_get_column
+gtk_grid_layout_child_set_row
+gtk_grid_layout_child_get_row
 gtk_grid_layout_child_set_column_span
 gtk_grid_layout_child_get_column_span
 gtk_grid_layout_child_set_row_span
diff --git a/examples/application6/prefs.ui b/examples/application6/prefs.ui
index c4cfcb621a..04ca33c92d 100644
--- a/examples/application6/prefs.ui
+++ b/examples/application6/prefs.ui
@@ -21,16 +21,16 @@
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
             <child>
               <object class="GtkFontButton" id="font">
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -41,8 +41,8 @@
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -54,8 +54,8 @@
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
diff --git a/examples/application7/prefs.ui b/examples/application7/prefs.ui
index c4cfcb621a..04ca33c92d 100644
--- a/examples/application7/prefs.ui
+++ b/examples/application7/prefs.ui
@@ -21,16 +21,16 @@
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
             <child>
               <object class="GtkFontButton" id="font">
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -41,8 +41,8 @@
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -54,8 +54,8 @@
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
diff --git a/examples/application8/prefs.ui b/examples/application8/prefs.ui
index c4cfcb621a..04ca33c92d 100644
--- a/examples/application8/prefs.ui
+++ b/examples/application8/prefs.ui
@@ -21,16 +21,16 @@
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
             <child>
               <object class="GtkFontButton" id="font">
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -41,8 +41,8 @@
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -54,8 +54,8 @@
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
diff --git a/examples/application9/prefs.ui b/examples/application9/prefs.ui
index c4cfcb621a..04ca33c92d 100644
--- a/examples/application9/prefs.ui
+++ b/examples/application9/prefs.ui
@@ -21,16 +21,16 @@
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
             <child>
               <object class="GtkFontButton" id="font">
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -41,8 +41,8 @@
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -54,8 +54,8 @@
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
diff --git a/examples/builder.ui b/examples/builder.ui
index 0f16026c01..194fcdee05 100644
--- a/examples/builder.ui
+++ b/examples/builder.ui
@@ -8,8 +8,8 @@
           <object id="button1" class="GtkButton">
             <property name="label">Button 1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -17,8 +17,8 @@
           <object id="button2" class="GtkButton">
             <property name="label">Button 2</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -26,8 +26,8 @@
           <object id="quit" class="GtkButton">
             <property name="label">Quit</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index d1a951ab15..3a5b6a7a95 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -185,8 +185,8 @@ gtk_grid_set_property (GObject      *object,
 static void
 grid_attach (GtkGrid   *grid,
              GtkWidget *widget,
-             int        left,
-             int        top,
+             int        column,
+             int        row,
              int        width,
              int        height)
 {
@@ -196,8 +196,8 @@ grid_attach (GtkGrid   *grid,
   gtk_widget_set_parent (widget, GTK_WIDGET (grid));
 
   grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, widget));
-  gtk_grid_layout_child_set_left_attach (grid_child, left);
-  gtk_grid_layout_child_set_top_attach (grid_child, top);
+  gtk_grid_layout_child_set_column (grid_child, column);
+  gtk_grid_layout_child_set_row (grid_child, row);
   gtk_grid_layout_child_set_column_span (grid_child, width);
   gtk_grid_layout_child_set_row_span (grid_child, height);
 }
@@ -241,16 +241,16 @@ find_attach_position (GtkGrid         *grid,
       switch (orientation)
         {
         case GTK_ORIENTATION_HORIZONTAL:
-          attach_pos = gtk_grid_layout_child_get_left_attach (grid_child);
+          attach_pos = gtk_grid_layout_child_get_column (grid_child);
           attach_span = gtk_grid_layout_child_get_column_span (grid_child);
-          opposite_pos = gtk_grid_layout_child_get_top_attach (grid_child);
+          opposite_pos = gtk_grid_layout_child_get_row (grid_child);
           opposite_span = gtk_grid_layout_child_get_row_span (grid_child);
           break;
 
         case GTK_ORIENTATION_VERTICAL:
-          attach_pos = gtk_grid_layout_child_get_top_attach (grid_child);
+          attach_pos = gtk_grid_layout_child_get_row (grid_child);
           attach_span = gtk_grid_layout_child_get_row_span (grid_child);
-          opposite_pos = gtk_grid_layout_child_get_left_attach (grid_child);
+          opposite_pos = gtk_grid_layout_child_get_column (grid_child);
           opposite_span = gtk_grid_layout_child_get_column_span (grid_child);
           break;
 
@@ -456,22 +456,22 @@ gtk_grid_new (void)
  * gtk_grid_attach:
  * @grid: a #GtkGrid
  * @child: the widget to add
- * @left: the column number to attach the left side of @child to
- * @top: the row number to attach the top side of @child to
+ * @column: the column number to attach the left side of @child to
+ * @row: the row number to attach the top side of @child to
  * @width: the number of columns that @child will span
  * @height: the number of rows that @child will span
  *
  * Adds a widget to the grid.
  *
- * The position of @child is determined by @left and @top. The
- * number of “cells” that @child will occupy is determined by
- * @width and @height.
+ * The position of @child is determined by @column and @row.
+ * The number of “cells” that @child will occupy is determined
+ * by @width and @height.
  */
 void
 gtk_grid_attach (GtkGrid   *grid,
                  GtkWidget *child,
-                 int        left,
-                 int        top,
+                 int        column,
+                 int        row,
                  int        width,
                  int        height)
 {
@@ -481,7 +481,7 @@ gtk_grid_attach (GtkGrid   *grid,
   g_return_if_fail (width > 0);
   g_return_if_fail (height > 0);
 
-  grid_attach (grid, child, left, top, width, height);
+  grid_attach (grid, child, column, row, width, height);
 }
 
 /**
@@ -530,21 +530,21 @@ gtk_grid_attach_next_to (GtkGrid         *grid,
       switch (side)
         {
         case GTK_POS_LEFT:
-          left = gtk_grid_layout_child_get_left_attach (grid_sibling) - width;
-          top = gtk_grid_layout_child_get_top_attach (grid_sibling);
+          left = gtk_grid_layout_child_get_column (grid_sibling) - width;
+          top = gtk_grid_layout_child_get_row (grid_sibling);
           break;
         case GTK_POS_RIGHT:
-          left = gtk_grid_layout_child_get_left_attach (grid_sibling) +
+          left = gtk_grid_layout_child_get_column (grid_sibling) +
                  gtk_grid_layout_child_get_column_span (grid_sibling);
-          top = gtk_grid_layout_child_get_top_attach (grid_sibling);
+          top = gtk_grid_layout_child_get_row (grid_sibling);
           break;
         case GTK_POS_TOP:
-          left = gtk_grid_layout_child_get_left_attach (grid_sibling);
-          top = gtk_grid_layout_child_get_top_attach (grid_sibling) - height;
+          left = gtk_grid_layout_child_get_column (grid_sibling);
+          top = gtk_grid_layout_child_get_row (grid_sibling) - height;
           break;
         case GTK_POS_BOTTOM:
-          left = gtk_grid_layout_child_get_left_attach (grid_sibling);
-          top = gtk_grid_layout_child_get_top_attach (grid_sibling) +
+          left = gtk_grid_layout_child_get_column (grid_sibling);
+          top = gtk_grid_layout_child_get_row (grid_sibling) +
                 gtk_grid_layout_child_get_row_span (grid_sibling);
           break;
         default:
@@ -584,18 +584,18 @@ gtk_grid_attach_next_to (GtkGrid         *grid,
 /**
  * gtk_grid_get_child_at:
  * @grid: a #GtkGrid
- * @left: the left edge of the cell
- * @top: the top edge of the cell
+ * @column: the left edge of the cell
+ * @row: the top edge of the cell
  *
  * Gets the child of @grid whose area covers the grid
- * cell whose upper left corner is at @left, @top.
+ * cell at @column, @row.
  *
  * Returns: (transfer none) (nullable): the child at the given position, or %NULL
  */
 GtkWidget *
 gtk_grid_get_child_at (GtkGrid *grid,
-                       int      left,
-                       int      top)
+                       int      column,
+                       int      row)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
@@ -607,18 +607,16 @@ gtk_grid_get_child_at (GtkGrid *grid,
        child = gtk_widget_get_next_sibling (child))
     {
       GtkGridLayoutChild *grid_child;
-      int child_left, child_top, child_width, child_height;
-      
+      int child_column, child_row, child_width, child_height;
+
       grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
-      child_left = gtk_grid_layout_child_get_left_attach (grid_child);
-      child_top = gtk_grid_layout_child_get_top_attach (grid_child);
+      child_column = gtk_grid_layout_child_get_column (grid_child);
+      child_row = gtk_grid_layout_child_get_row (grid_child);
       child_width = gtk_grid_layout_child_get_column_span (grid_child);
       child_height = gtk_grid_layout_child_get_row_span (grid_child);
 
-      if (child_left <= left &&
-          child_left + child_width > left &&
-          child_top <= top &&
-          child_top + child_height > top)
+      if (child_column <= column && child_column + child_width > column &&
+          child_row <= row && child_row + child_height > row)
         return child;
     }
 
@@ -672,11 +670,11 @@ gtk_grid_insert_row (GtkGrid *grid,
       GtkGridLayoutChild *grid_child;
       
       grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
-      top = gtk_grid_layout_child_get_top_attach (grid_child);
+      top = gtk_grid_layout_child_get_row (grid_child);
       height = gtk_grid_layout_child_get_row_span (grid_child);
 
       if (top >= position)
-        gtk_grid_layout_child_set_top_attach (grid_child, top + 1);
+        gtk_grid_layout_child_set_row (grid_child, top + 1);
       else if (top + height > position)
         gtk_grid_layout_child_set_row_span (grid_child, height + 1);
     }
@@ -711,7 +709,7 @@ gtk_grid_remove_row (GtkGrid *grid,
       int top, height;
 
       grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
-      top = gtk_grid_layout_child_get_top_attach (grid_child);
+      top = gtk_grid_layout_child_get_row (grid_child);
       height = gtk_grid_layout_child_get_row_span (grid_child);
 
       if (top <= position && top + height > position)
@@ -726,7 +724,7 @@ gtk_grid_remove_row (GtkGrid *grid,
       else
         {
           gtk_grid_layout_child_set_row_span (grid_child, height);
-          gtk_grid_layout_child_set_top_attach (grid_child, top);
+          gtk_grid_layout_child_set_row (grid_child, top);
         }
 
       child = next;
@@ -761,11 +759,11 @@ gtk_grid_insert_column (GtkGrid *grid,
       int left, width;
 
       grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
-      left = gtk_grid_layout_child_get_left_attach (grid_child);
+      left = gtk_grid_layout_child_get_column (grid_child);
       width = gtk_grid_layout_child_get_column_span (grid_child);
 
       if (left >= position)
-        gtk_grid_layout_child_set_left_attach (grid_child, left + 1);
+        gtk_grid_layout_child_set_column (grid_child, left + 1);
       else if (left + width > position)
         gtk_grid_layout_child_set_column_span (grid_child, width + 1);
     }
@@ -801,7 +799,7 @@ gtk_grid_remove_column (GtkGrid *grid,
 
       grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
 
-      left = gtk_grid_layout_child_get_left_attach (grid_child);
+      left = gtk_grid_layout_child_get_column (grid_child);
       width = gtk_grid_layout_child_get_column_span (grid_child);
 
       if (left <= position && left + width > position)
@@ -816,7 +814,7 @@ gtk_grid_remove_column (GtkGrid *grid,
       else
         {
           gtk_grid_layout_child_set_column_span (grid_child, width);
-          gtk_grid_layout_child_set_left_attach (grid_child, left);
+          gtk_grid_layout_child_set_column (grid_child, left);
         }
 
       child = next;
@@ -854,21 +852,21 @@ gtk_grid_insert_next_to (GtkGrid         *grid,
   switch (side)
     {
     case GTK_POS_LEFT:
-      gtk_grid_insert_column (grid, gtk_grid_layout_child_get_left_attach (child));
+      gtk_grid_insert_column (grid, gtk_grid_layout_child_get_column (child));
       break;
     case GTK_POS_RIGHT:
       {
-        int col = gtk_grid_layout_child_get_left_attach (child) +
+        int col = gtk_grid_layout_child_get_column (child) +
                   gtk_grid_layout_child_get_column_span (child);
         gtk_grid_insert_column (grid, col);
       }
       break;
     case GTK_POS_TOP:
-      gtk_grid_insert_row (grid, gtk_grid_layout_child_get_top_attach (child));
+      gtk_grid_insert_row (grid, gtk_grid_layout_child_get_row (child));
       break;
     case GTK_POS_BOTTOM:
       {
-        int row = gtk_grid_layout_child_get_top_attach (child) +
+        int row = gtk_grid_layout_child_get_row (child) +
                   gtk_grid_layout_child_get_row_span (child);
         gtk_grid_insert_row (grid, row);
       }
@@ -1142,8 +1140,8 @@ gtk_grid_get_baseline_row (GtkGrid *grid)
  * gtk_grid_query_child:
  * @grid: a #GtkGrid
  * @child: a #GtkWidget child of @grid
- * @left: (out) (optional): the column used to attach the left side of @child
- * @top: (out) (optional): the row used to attach the top side of @child
+ * @column: (out) (optional): the column used to attach the left side of @child
+ * @row: (out) (optional): the row used to attach the top side of @child
  * @width: (out) (optional): the number of columns @child spans
  * @height: (out) (optional): the number of rows @child spans
  *
@@ -1152,8 +1150,8 @@ gtk_grid_get_baseline_row (GtkGrid *grid)
 void
 gtk_grid_query_child (GtkGrid   *grid,
                       GtkWidget *child,
-                      int       *left,
-                      int       *top,
+                      int       *column,
+                      int       *row,
                       int       *width,
                       int       *height)
 {
@@ -1166,10 +1164,10 @@ gtk_grid_query_child (GtkGrid   *grid,
 
   grid_child = GTK_GRID_LAYOUT_CHILD (gtk_layout_manager_get_layout_child (priv->layout_manager, child));
 
-  if (left != NULL)
-    *left = gtk_grid_layout_child_get_left_attach (grid_child);
-  if (top != NULL)
-    *top = gtk_grid_layout_child_get_top_attach (grid_child);
+  if (column != NULL)
+    *column = gtk_grid_layout_child_get_column (grid_child);
+  if (row != NULL)
+    *row = gtk_grid_layout_child_get_row (grid_child);
   if (width != NULL)
     *width = gtk_grid_layout_child_get_column_span (grid_child);
   if (height != NULL)
diff --git a/gtk/gtkgrid.h b/gtk/gtkgrid.h
index 7c0bbb4ac0..c482a3b898 100644
--- a/gtk/gtkgrid.h
+++ b/gtk/gtkgrid.h
@@ -66,8 +66,8 @@ GtkWidget* gtk_grid_new                    (void);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_attach                 (GtkGrid         *grid,
                                             GtkWidget       *child,
-                                            int              left,
-                                            int              top,
+                                            int              column,
+                                            int              row,
                                             int              width,
                                             int              height);
 GDK_AVAILABLE_IN_ALL
@@ -79,8 +79,8 @@ void       gtk_grid_attach_next_to         (GtkGrid         *grid,
                                             int              height);
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_grid_get_child_at           (GtkGrid         *grid,
-                                            int              left,
-                                            int              top);
+                                            int              column,
+                                            int              row);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_remove                 (GtkGrid         *grid,
                                             GtkWidget       *child);
@@ -137,8 +137,8 @@ int        gtk_grid_get_baseline_row       (GtkGrid         *grid);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_query_child            (GtkGrid         *grid,
                                             GtkWidget       *child,
-                                            int             *left,
-                                            int             *top,
+                                            int             *column,
+                                            int             *row,
                                             int             *width,
                                             int             *height);
 
diff --git a/gtk/gtkgridlayout.c b/gtk/gtkgridlayout.c
index 77904f80b2..420b08d0ed 100644
--- a/gtk/gtkgridlayout.c
+++ b/gtk/gtkgridlayout.c
@@ -67,14 +67,14 @@ struct _GtkGridLayoutChild
   GridChildAttach attach[2];
 };
 
-#define CHILD_LEFT_ATTACH(child)        ((child)->attach[GTK_ORIENTATION_HORIZONTAL].pos)
-#define CHILD_COL_SPAN(child)           ((child)->attach[GTK_ORIENTATION_HORIZONTAL].span)
-#define CHILD_TOP_ATTACH(child)         ((child)->attach[GTK_ORIENTATION_VERTICAL].pos)
-#define CHILD_ROW_SPAN(child)           ((child)->attach[GTK_ORIENTATION_VERTICAL].span)
+#define CHILD_COLUMN(child)     ((child)->attach[GTK_ORIENTATION_HORIZONTAL].pos)
+#define CHILD_COL_SPAN(child)   ((child)->attach[GTK_ORIENTATION_HORIZONTAL].span)
+#define CHILD_ROW(child)        ((child)->attach[GTK_ORIENTATION_VERTICAL].pos)
+#define CHILD_ROW_SPAN(child)   ((child)->attach[GTK_ORIENTATION_VERTICAL].span)
 
 enum {
-  PROP_CHILD_LEFT_ATTACH = 1,
-  PROP_CHILD_TOP_ATTACH,
+  PROP_CHILD_COLUMN = 1,
+  PROP_CHILD_ROW,
   PROP_CHILD_COLUMN_SPAN,
   PROP_CHILD_ROW_SPAN,
 
@@ -95,12 +95,12 @@ gtk_grid_layout_child_set_property (GObject      *gobject,
 
   switch (prop_id)
     {
-    case PROP_CHILD_LEFT_ATTACH:
-      gtk_grid_layout_child_set_left_attach (self, g_value_get_int (value));
+    case PROP_CHILD_COLUMN:
+      gtk_grid_layout_child_set_column (self, g_value_get_int (value));
       break;
 
-    case PROP_CHILD_TOP_ATTACH:
-      gtk_grid_layout_child_set_top_attach (self, g_value_get_int (value));
+    case PROP_CHILD_ROW :
+      gtk_grid_layout_child_set_row (self, g_value_get_int (value));
       break;
 
     case PROP_CHILD_COLUMN_SPAN:
@@ -127,12 +127,12 @@ gtk_grid_layout_child_get_property (GObject    *gobject,
 
   switch (prop_id)
     {
-    case PROP_CHILD_LEFT_ATTACH:
-      g_value_set_int (value, CHILD_LEFT_ATTACH (self));
+    case PROP_CHILD_COLUMN:
+      g_value_set_int (value, CHILD_COLUMN (self));
       break;
 
-    case PROP_CHILD_TOP_ATTACH:
-      g_value_set_int (value, CHILD_TOP_ATTACH (self));
+    case PROP_CHILD_ROW:
+      g_value_set_int (value, CHILD_ROW (self));
       break;
 
     case PROP_CHILD_COLUMN_SPAN:
@@ -158,26 +158,26 @@ gtk_grid_layout_child_class_init (GtkGridLayoutChildClass *klass)
   gobject_class->get_property = gtk_grid_layout_child_get_property;
 
   /**
-   * GtkGridLayoutChild:left-attach:
+   * GtkGridLayoutChild:column:
    *
-   * The column number to attach the left side of the child to.
+   * The column to place the child in.
    */
-  child_props[PROP_CHILD_LEFT_ATTACH] =
-    g_param_spec_int ("left-attach",
-                      P_("Left attachment"),
-                      P_("The column number to attach the left side of the child to"),
+  child_props[PROP_CHILD_COLUMN] =
+    g_param_spec_int ("column",
+                      P_("Column"),
+                      P_("The column place the child in"),
                       G_MININT, G_MAXINT, 0,
                       GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * GtkGridLayoutChild:top-attach:
+   * GtkGridLayoutChild:row:
    *
-   * The row number to attach the top side of the child to.
+   * The row to place the child in.
    */
-  child_props[PROP_CHILD_TOP_ATTACH] =
-    g_param_spec_int ("top-attach",
-                      P_("Top attachment"),
-                      P_("The row number to attach the top side of a child widget to"),
+  child_props[PROP_CHILD_ROW] =
+    g_param_spec_int ("row",
+                      P_("Row"),
+                      P_("The row to place the child in"),
                       G_MININT, G_MAXINT, 0,
                       GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
@@ -216,30 +216,30 @@ gtk_grid_layout_child_init (GtkGridLayoutChild *self)
 }
 
 /**
- * gtk_grid_layout_child_set_top_attach:
+ * gtk_grid_layout_child_set_row:
  * @child: a #GtkGridLayoutChild
- * @attach: the attach point for @child
+ * @row: the row for @child
  *
- * Sets the row number to attach the top side of @child.
+ * Sets the row to place @child in.
  */
 void
-gtk_grid_layout_child_set_top_attach (GtkGridLayoutChild *child,
-                                      int                 attach)
+gtk_grid_layout_child_set_row (GtkGridLayoutChild *child,
+                               int                 row)
 {
   g_return_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child));
 
-  if (CHILD_TOP_ATTACH (child) == attach)
+  if (CHILD_ROW (child) == row)
     return;
 
-  CHILD_TOP_ATTACH (child) = attach;
+  CHILD_ROW (child) = row;
 
   gtk_layout_manager_layout_changed (gtk_layout_child_get_layout_manager (GTK_LAYOUT_CHILD (child)));
 
-  g_object_notify_by_pspec (G_OBJECT (child), child_props[PROP_CHILD_TOP_ATTACH]);
+  g_object_notify_by_pspec (G_OBJECT (child), child_props[PROP_CHILD_ROW]);
 }
 
 /**
- * gtk_grid_layout_child_get_top_attach:
+ * gtk_grid_layout_child_get_row:
  * @child: a #GtkGridLayoutChild
  *
  * Retrieves the row number to which @child attaches its top side.
@@ -247,38 +247,38 @@ gtk_grid_layout_child_set_top_attach (GtkGridLayoutChild *child,
  * Returns: the row number
  */
 int
-gtk_grid_layout_child_get_top_attach (GtkGridLayoutChild *child)
+gtk_grid_layout_child_get_row (GtkGridLayoutChild *child)
 {
   g_return_val_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child), 0);
 
-  return CHILD_TOP_ATTACH (child);
+  return CHILD_ROW (child);
 }
 
 /**
- * gtk_grid_layout_child_set_left_attach:
+ * gtk_grid_layout_child_set_column:
  * @child: a #GtkGridLayoutChild
- * @attach: the attach point for @child
+ * @column: the attach point for @child
  *
  * Sets the column number to attach the left side of @child.
  */
 void
-gtk_grid_layout_child_set_left_attach (GtkGridLayoutChild *child,
-                                       int                 attach)
+gtk_grid_layout_child_set_column (GtkGridLayoutChild *child,
+                                  int                 column)
 {
   g_return_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child));
 
-  if (CHILD_LEFT_ATTACH (child) == attach)
+  if (CHILD_COLUMN (child) == column)
     return;
 
-  CHILD_LEFT_ATTACH (child) = attach;
+  CHILD_COLUMN (child) = column;
 
   gtk_layout_manager_layout_changed (gtk_layout_child_get_layout_manager (GTK_LAYOUT_CHILD (child)));
 
-  g_object_notify_by_pspec (G_OBJECT (child), child_props[PROP_CHILD_LEFT_ATTACH]);
+  g_object_notify_by_pspec (G_OBJECT (child), child_props[PROP_CHILD_COLUMN]);
 }
 
 /**
- * gtk_grid_layout_child_get_left_attach:
+ * gtk_grid_layout_child_get_column:
  * @child: a #GtkGridLayoutChild
  *
  * Retrieves the column number to which @child attaches its left side.
@@ -286,11 +286,11 @@ gtk_grid_layout_child_set_left_attach (GtkGridLayoutChild *child,
  * Returns: the column number
  */
 int
-gtk_grid_layout_child_get_left_attach (GtkGridLayoutChild *child)
+gtk_grid_layout_child_get_column (GtkGridLayoutChild *child)
 {
   g_return_val_if_fail (GTK_IS_GRID_LAYOUT_CHILD (child), 0);
 
-  return CHILD_LEFT_ATTACH (child);
+  return CHILD_COLUMN (child);
 }
 
 /**
diff --git a/gtk/gtkgridlayout.h b/gtk/gtkgridlayout.h
index a0bd9e4717..4ea8869f08 100644
--- a/gtk/gtkgridlayout.h
+++ b/gtk/gtkgridlayout.h
@@ -78,15 +78,15 @@ GDK_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (GtkGridLayoutChild, gtk_grid_layout_child, GTK, GRID_LAYOUT_CHILD, GtkLayoutChild)
 
 GDK_AVAILABLE_IN_ALL
-void                    gtk_grid_layout_child_set_top_attach            (GtkGridLayoutChild  *child,
-                                                                         int                  attach);
+void                    gtk_grid_layout_child_set_row                   (GtkGridLayoutChild  *child,
+                                                                         int                  row);
 GDK_AVAILABLE_IN_ALL
-int                     gtk_grid_layout_child_get_top_attach            (GtkGridLayoutChild  *child);
+int                     gtk_grid_layout_child_get_row                   (GtkGridLayoutChild  *child);
 GDK_AVAILABLE_IN_ALL
-void                    gtk_grid_layout_child_set_left_attach           (GtkGridLayoutChild  *child,
-                                                                         int                  attach);
+void                    gtk_grid_layout_child_set_column                (GtkGridLayoutChild  *child,
+                                                                         int                  column);
 GDK_AVAILABLE_IN_ALL
-int                     gtk_grid_layout_child_get_left_attach           (GtkGridLayoutChild  *child);
+int                     gtk_grid_layout_child_get_column                (GtkGridLayoutChild  *child);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_grid_layout_child_set_column_span           (GtkGridLayoutChild  *child,
                                                                          int                  span);
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 890e0440b5..b76e46bb80 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -268,8 +268,8 @@
  *     <object class="GtkLabel" id="label1">
  *       <property name="label">Description</property>
  *       <layout>
- *         <property name="left-attach">0</property>
- *         <property name="top-attach">0</property>
+ *         <property name="column">0</property>
+ *         <property name="row">0</property>
  *         <property name="row-span">1</property>
  *         <property name="col-span">1</property>
  *       </layout>
@@ -278,8 +278,8 @@
  *   <child>
  *     <object class="GtkEntry" id="description_entry">
  *       <layout>
- *         <property name="left-attach">1</property>
- *         <property name="top-attach">0</property>
+ *         <property name="column">1</property>
+ *         <property name="row">0</property>
  *         <property name="row-span">1</property>
  *         <property name="col-span">1</property>
  *       </layout>
diff --git a/gtk/inspector/resource-list.ui b/gtk/inspector/resource-list.ui
index e393835baf..e94fb2930a 100644
--- a/gtk/inspector/resource-list.ui
+++ b/gtk/inspector/resource-list.ui
@@ -119,8 +119,8 @@
                         <property name="halign">end</property>
                         <property name="valign">baseline</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -130,8 +130,8 @@
                         <property name="valign">baseline</property>
                         <property name="selectable">1</property>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -141,8 +141,8 @@
                         <property name="halign">end</property>
                         <property name="valign">baseline</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -151,8 +151,8 @@
                         <property name="halign">start</property>
                         <property name="valign">baseline</property>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -162,8 +162,8 @@
                         <property name="halign">end</property>
                         <property name="valign">baseline</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                         </layout>
                       </object>
                     </child>
@@ -172,8 +172,8 @@
                         <property name="halign">start</property>
                         <property name="valign">baseline</property>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">1</property>
+                          <property name="row">2</property>
                         </layout>
                       </object>
                     </child>
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index 246e697c81..da234e0394 100644
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -187,8 +187,8 @@ needs_explicit_setting (GParamSpec *pspec,
     { "GtkRadioButton", "draw-indicator", PROP_KIND_OBJECT },
     { "GtkWidget", "hexpand", PROP_KIND_OBJECT },
     { "GtkWidget", "vexpand", PROP_KIND_OBJECT },
-    { "GtkGridLayoutChild", "top-attach", PROP_KIND_LAYOUT },
-    { "GtkGridLayoutChild", "left-attach", PROP_KIND_LAYOUT },
+    { "GtkGridLayoutChild", "row", PROP_KIND_LAYOUT },
+    { "GtkGridLayoutChild", "column", PROP_KIND_LAYOUT },
   };
   gboolean found;
   int k;
@@ -231,8 +231,8 @@ keep_for_rewrite (const char *class_name,
     { "GtkPaned", "shrink", PROP_KIND_PACKING },
     { "GtkOverlay", "measure", PROP_KIND_PACKING },
     { "GtkOverlay", "clip-overlay", PROP_KIND_PACKING },
-    { "GtkGrid", "left-attach", PROP_KIND_PACKING },
-    { "GtkGrid", "top-attach", PROP_KIND_PACKING },
+    { "GtkGrid", "column", PROP_KIND_PACKING },
+    { "GtkGrid", "row", PROP_KIND_PACKING },
     { "GtkGrid", "width", PROP_KIND_PACKING },
     { "GtkGrid", "height", PROP_KIND_PACKING },
     { "GtkStack", "name", PROP_KIND_PACKING },
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index 9c8b4da03a..bb17b590fa 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -46,8 +46,8 @@
                   <class name="circular"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -59,8 +59,8 @@
                 <property name="has-menu">False</property>
                 <property name="can-focus">False</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -70,8 +70,8 @@
                 <signal name="notify::has-focus" handler="entry_focus_changed" swapped="no"/>
                 <signal name="notify::text" handler="entry_text_changed" swapped="no"/>
                 <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">2</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -83,8 +83,8 @@
                 <property name="draw-value">False</property>
                 <property name="has-origin">False</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -99,8 +99,8 @@
                   <class name="marks-before"/>
                 </style>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                   <property name="column-span">2</property>
                 </layout>
               </object>
@@ -114,8 +114,8 @@
                 <property name="s-adjustment">s_adj</property>
                 <property name="v-adjustment">v_adj</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">2</property>
                 </layout>
               </object>
@@ -142,8 +142,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes" context="Color channel">A</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -153,8 +153,8 @@
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -178,8 +178,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes" context="Color channel">H</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -189,8 +189,8 @@
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -215,8 +215,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes" context="Color Channel">S</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -224,8 +224,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes" context="Color Channel">V</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -235,8 +235,8 @@
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -246,8 +246,8 @@
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui
index 388761ca0d..cb8cb6fa1f 100644
--- a/gtk/ui/gtkemojichooser.ui
+++ b/gtk/ui/gtkemojichooser.ui
@@ -328,8 +328,8 @@
                           <class name="dim-label"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -341,8 +341,8 @@
                           <attribute name="scale" value="1.44"></attribute>
                         </attributes>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -353,8 +353,8 @@
                           <class name="dim-label"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                         </layout>
                       </object>
                     </child>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 4ad9078fb2..876c67f332 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -286,8 +286,8 @@
                                           <class name="dim-label"/>
                                         </style>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -299,8 +299,8 @@
                                           <attribute name="scale" value="1.44"></attribute>
                                         </attributes>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -311,8 +311,8 @@
                                           <class name="dim-label"/>
                                         </style>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">2</property>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -392,8 +392,8 @@
             <property name="hexpand">1</property>
             <signal name="changed" handler="new_folder_name_changed"/>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -407,16 +407,16 @@
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkFileChooserErrorStack" id="new_folder_error_stack">
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -453,8 +453,8 @@
             <property name="hexpand">1</property>
             <signal name="changed" handler="rename_file_name_changed"/>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -468,16 +468,16 @@
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkFileChooserErrorStack" id="rename_file_error_stack">
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 01a3816677..acfbf57570 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -55,8 +55,8 @@
                     <property name="placeholder-text" translatable="yes">Search font name</property>
                     <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
                     <layout>
-                      <property name="left-attach">0</property>
-                      <property name="top-attach">0</property>
+                      <property name="column">0</property>
+                      <property name="row">0</property>
                     </layout>
                   </object>
                 </child>
@@ -115,8 +115,8 @@
                                   </object>
                                 </child>
                                 <layout>
-                                  <property name="left-attach">0</property>
-                                  <property name="top-attach">1</property>
+                                  <property name="column">0</property>
+                                  <property name="row">1</property>
                                   <property name="column-span">3</property>
                                 </layout>
                               </object>
@@ -131,8 +131,8 @@
                                   </object>
                                 </child>
                                 <layout>
-                                  <property name="left-attach">0</property>
-                                  <property name="top-attach">2</property>
+                                  <property name="column">0</property>
+                                  <property name="row">2</property>
                                   <property name="column-span">3</property>
                                 </layout>
                               </object>
@@ -143,8 +143,8 @@
                                 <property name="xalign">0</property>
                                 <property name="valign">baseline</property>
                                 <layout>
-                                  <property name="left-attach">0</property>
-                                  <property name="top-attach">3</property>
+                                  <property name="column">0</property>
+                                  <property name="row">3</property>
                                 </layout>
                               </object>
                             </child>
@@ -161,8 +161,8 @@
                                   </object>
                                 </child>
                                 <layout>
-                                  <property name="left-attach">1</property>
-                                  <property name="top-attach">3</property>
+                                  <property name="column">1</property>
+                                  <property name="row">3</property>
                                 </layout>
                               </object>
                             </child>
@@ -172,8 +172,8 @@
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
                                 <layout>
-                                  <property name="left-attach">2</property>
-                                  <property name="top-attach">3</property>
+                                  <property name="column">2</property>
+                                  <property name="row">3</property>
                                 </layout>
                               </object>
                             </child>
@@ -199,8 +199,8 @@
                                 <property name="gicon">fonticon</property>
                                 <property name="pixel-size">64</property>
                                 <layout>
-                                  <property name="left-attach">0</property>
-                                  <property name="top-attach">0</property>
+                                  <property name="column">0</property>
+                                  <property name="row">0</property>
                                 </layout>
                               </object>
                             </child>
@@ -212,8 +212,8 @@
                                   <attribute name="scale" value="1.2"></attribute>
                                 </attributes>
                                 <layout>
-                                  <property name="left-attach">0</property>
-                                  <property name="top-attach">1</property>
+                                  <property name="column">0</property>
+                                  <property name="row">1</property>
                                 </layout>
                               </object>
                             </child>
@@ -222,8 +222,8 @@
                       </object>
                     </child>
                     <layout>
-                      <property name="left-attach">0</property>
-                      <property name="top-attach">1</property>
+                      <property name="column">0</property>
+                      <property name="row">1</property>
                     </layout>
                   </object>
                 </child>
@@ -291,8 +291,8 @@
                                 <property name="xalign">0</property>
                                 <property name="valign">baseline</property>
                                 <layout>
-                                  <property name="left-attach">0</property>
-                                  <property name="top-attach">0</property>
+                                  <property name="column">0</property>
+                                  <property name="row">0</property>
                                 </layout>
                               </object>
                             </child>
@@ -303,8 +303,8 @@
                                 <property name="draw-value">0</property>
                                 <property name="round-digits">0</property>
                                 <layout>
-                                  <property name="left-attach">1</property>
-                                  <property name="top-attach">0</property>
+                                  <property name="column">1</property>
+                                  <property name="row">0</property>
                                 </layout>
                               </object>
                             </child>
@@ -314,8 +314,8 @@
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
                                 <layout>
-                                  <property name="left-attach">2</property>
-                                  <property name="top-attach">0</property>
+                                  <property name="column">2</property>
+                                  <property name="row">0</property>
                                 </layout>
                               </object>
                             </child>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 237e20b279..9d3aae94a8 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -28,8 +28,8 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">printer_combo</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -38,8 +38,8 @@
                 <property name="hexpand">1</property>
                 <signal name="notify::selected" handler="printer_changed_callback"/>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                   <property name="column-span">3</property>
                 </layout>
               </object>
@@ -52,8 +52,8 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">paper_size_combo</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -62,8 +62,8 @@
                 <property name="hexpand">1</property>
                 <signal name="notify::selected" handler="paper_size_changed"/>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">3</property>
                 </layout>
               </object>
@@ -73,8 +73,8 @@
                 <property name="halign">start</property>
                 <property name="valign">center</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                   <property name="column-span">3</property>
                 </layout>
               </object>
@@ -87,8 +87,8 @@
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">portrait_radio</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -112,8 +112,8 @@
                   </object>
                 </child>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -138,8 +138,8 @@
                   </object>
                 </child>
                 <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">2</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -164,8 +164,8 @@
                   </object>
                 </child>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">4</property>
+                  <property name="column">1</property>
+                  <property name="row">4</property>
                 </layout>
               </object>
             </child>
@@ -189,8 +189,8 @@
                   </object>
                 </child>
                 <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">4</property>
+                  <property name="column">2</property>
+                  <property name="row">4</property>
                 </layout>
               </object>
             </child>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 4668ae758b..98460819b1 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -70,8 +70,8 @@
                   <attribute name="weight" value="bold"></attribute>
                 </attributes>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -83,8 +83,8 @@
                   <attribute name="weight" value="bold"></attribute>
                 </attributes>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 775cdc9bce..69f0a2c027 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -215,8 +215,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                           <property name="column-span">2</property>
                                         </layout>
                                       </object>
@@ -228,8 +228,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                           <property name="column-span">2</property>
                                         </layout>
                                       </object>
@@ -241,8 +241,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">2</property>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
                                           <property name="column-span">2</property>
                                         </layout>
                                       </object>
@@ -256,8 +256,8 @@
                                         <property name="group">all_pages_radio</property>
                                         <signal name="toggled" handler="update_page_range_entry_sensitivity" 
swapped="no"/>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">3</property>
+                                          <property name="column">0</property>
+                                          <property name="row">3</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -268,8 +268,8 @@
                                         <property name="activates-default">1</property>
                                         <signal name="notify::has-focus" 
handler="page_range_entry_focus_changed" swapped="no"/>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">3</property>
+                                          <property name="column">1</property>
+                                          <property name="row">3</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -305,8 +305,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">copies_spin</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -317,8 +317,8 @@
                                         <signal name="changed" handler="update_dialog_from_capabilities" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="value-changed" 
handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">1</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -328,8 +328,8 @@
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -339,8 +339,8 @@
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">2</property>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -349,8 +349,8 @@
                                         <property name="content-width">70</property>
                                         <property name="content-height">90</property>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">1</property>
+                                          <property name="row">1</property>
                                           <property name="row-span">2</property>
                                         </layout>
                                       </object>
@@ -411,8 +411,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">duplex</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -420,8 +420,8 @@
                                       <object class="GtkPrinterOptionWidget" id="duplex">
                                         <property name="valign">baseline</property>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">1</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -433,8 +433,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">pages_per_sheet</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -444,8 +444,8 @@
                                         <signal name="changed" handler="redraw_page_layout_preview" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="changed" handler="update_number_up_layout" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">1</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -457,8 +457,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">number_up_layout</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">2</property>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -467,8 +467,8 @@
                                         <property name="valign">baseline</property>
                                         <signal name="changed" handler="redraw_page_layout_preview" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">2</property>
+                                          <property name="column">1</property>
+                                          <property name="row">2</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -480,8 +480,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">page_set_combo</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">3</property>
+                                          <property name="column">0</property>
+                                          <property name="row">3</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -499,8 +499,8 @@
                                           </object>
                                         </property>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">3</property>
+                                          <property name="column">1</property>
+                                          <property name="row">3</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -512,8 +512,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">scale_spin</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">4</property>
+                                          <property name="column">0</property>
+                                          <property name="row">4</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -535,8 +535,8 @@
                                           </object>
                                         </child>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">4</property>
+                                          <property name="column">1</property>
+                                          <property name="row">4</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -572,8 +572,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_type</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -581,8 +581,8 @@
                                       <object class="GtkPrinterOptionWidget" id="paper_type">
                                         <property name="valign">baseline</property>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">1</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -594,8 +594,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_source</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -603,8 +603,8 @@
                                       <object class="GtkPrinterOptionWidget" id="paper_source">
                                         <property name="valign">baseline</property>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">1</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -616,8 +616,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">output_tray</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">2</property>
+                                          <property name="column">0</property>
+                                          <property name="row">2</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -625,8 +625,8 @@
                                       <object class="GtkPrinterOptionWidget" id="output_tray">
                                         <property name="valign">baseline</property>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">2</property>
+                                          <property name="column">1</property>
+                                          <property name="row">2</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -638,8 +638,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_size_combo</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">3</property>
+                                          <property name="column">0</property>
+                                          <property name="row">3</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -648,8 +648,8 @@
                                         <property name="sensitive">0</property>
                                         <property name="valign">baseline</property>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">3</property>
+                                          <property name="column">1</property>
+                                          <property name="row">3</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -661,8 +661,8 @@
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">orientation_combo</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">4</property>
+                                          <property name="column">0</property>
+                                          <property name="row">4</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -682,8 +682,8 @@
                                           </object>
                                         </property>
                                         <layout>
-                                          <property name="left-attach">1</property>
-                                          <property name="top-attach">4</property>
+                                          <property name="column">1</property>
+                                          <property name="row">4</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -750,16 +750,16 @@
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">job_prio</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">0</property>
+                                      <property name="column">0</property>
+                                      <property name="row">0</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="job_prio">
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">0</property>
+                                      <property name="column">1</property>
+                                      <property name="row">0</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -771,24 +771,24 @@
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">billing_info</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="billing_info">
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <layout>
-                              <property name="left-attach">0</property>
-                              <property name="top-attach">0</property>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
                             </layout>
                           </object>
                         </child>
@@ -818,8 +818,8 @@
                                     <property name="active">1</property>
                                     <signal name="toggled" handler="update_print_at_option" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">0</property>
+                                      <property name="column">0</property>
+                                      <property name="row">0</property>
                                       <property name="column-span">2</property>
                                     </layout>
                                   </object>
@@ -838,8 +838,8 @@
                                     <signal name="toggled" handler="update_print_at_entry_sensitivity" 
swapped="no"/>
                                     <signal name="toggled" handler="update_print_at_option" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -853,8 +853,8 @@
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
                                     <signal name="changed" handler="update_print_at_option" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -869,8 +869,8 @@
                                     <property name="group">print_now_radio</property>
                                     <signal name="toggled" handler="update_print_at_option" 
object="GtkPrintUnixDialog" swapped="yes"/>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                       <property name="column-span">2</property>
                                     </layout>
                                   </object>
@@ -878,8 +878,8 @@
                               </object>
                             </child>
                             <layout>
-                              <property name="left-attach">0</property>
-                              <property name="top-attach">1</property>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
                             </layout>
                           </object>
                         </child>
@@ -910,16 +910,16 @@
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_before</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">0</property>
+                                      <property name="column">0</property>
+                                      <property name="row">0</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="cover_before">
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">0</property>
+                                      <property name="column">1</property>
+                                      <property name="row">0</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -931,24 +931,24 @@
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_after</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkPrinterOptionWidget" id="cover_after">
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <layout>
-                              <property name="left-attach">1</property>
-                              <property name="top-attach">0</property>
+                              <property name="column">1</property>
+                              <property name="row">0</property>
                             </layout>
                           </object>
                         </child>
diff --git a/tests/dialog.ui b/tests/dialog.ui
index 7d30d65ee1..18f487c92c 100644
--- a/tests/dialog.ui
+++ b/tests/dialog.ui
@@ -72,8 +72,8 @@
                       <object class="GtkLabel" id="margin">
                         <property name="width_request">24</property>
                         <layout>
-                          <property name="left_attach">0</property>
-                          <property name="top_attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -86,8 +86,8 @@
                         <property name="placeholder_text" translatable="yes">optional</property>
                         <property name="input_purpose">password</property>
                         <layout>
-                          <property name="left_attach">2</property>
-                          <property name="top_attach">2</property>
+                          <property name="column">2</property>
+                          <property name="row">2</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -100,8 +100,8 @@
                         <property name="activates_default">1</property>
                         <property name="completion">name_completion</property>
                         <layout>
-                          <property name="left_attach">2</property>
-                          <property name="top_attach">1</property>
+                          <property name="column">2</property>
+                          <property name="row">1</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -128,8 +128,8 @@
                           </object>
                         </child>
                         <layout>
-                          <property name="left_attach">3</property>
-                          <property name="top_attach">0</property>
+                          <property name="column">3</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -137,8 +137,8 @@
                       <object class="GtkComboBoxText" id="connection_combo">
                         <property name="hexpand">1</property>
                         <layout>
-                          <property name="left_attach">2</property>
-                          <property name="top_attach">0</property>
+                          <property name="column">2</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -149,8 +149,8 @@
                         <property name="use_underline">1</property>
                         <property name="mnemonic_widget">connection_combo</property>
                         <layout>
-                          <property name="left_attach">1</property>
-                          <property name="top_attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -162,8 +162,8 @@
                         <property name="use_underline">1</property>
                         <property name="mnemonic_widget">name_entry</property>
                         <layout>
-                          <property name="left_attach">1</property>
-                          <property name="top_attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -174,8 +174,8 @@
                         <property name="use_underline">1</property>
                         <property name="mnemonic_widget">password_entry</property>
                         <layout>
-                          <property name="left_attach">1</property>
-                          <property name="top_attach">2</property>
+                          <property name="column">1</property>
+                          <property name="row">2</property>
                         </layout>
                       </object>
                     </child>
diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 00be3026e7..5f36060f6b 100644
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -284,8 +284,8 @@ static const char *buffer =
 "              <object class='GtkLabel' id='left'>"
 "                <property name='label'>Left</property>"
 "                <layout>"
-"                  <property name='left-attach'>0</property>"
-"                  <property name='top-attach'>0</property>"
+"                  <property name='column'>0</property>"
+"                  <property name='row'>0</property>"
 "                </layout>"
 "              </object>"
 "            </child>"
@@ -293,8 +293,8 @@ static const char *buffer =
 "              <object class='GtkLabel' id='right'>"
 "                <property name='label'>Right</property>"
 "                <layout>"
-"                  <property name='left-attach'>2</property>"
-"                  <property name='top-attach'>0</property>"
+"                  <property name='column'>2</property>"
+"                  <property name='row'>0</property>"
 "                </layout>"
 "              </object>"
 "            </child>"
@@ -305,8 +305,8 @@ static const char *buffer =
 "                 <property name='hexpand'>True</property>"
 "                 <property name='vexpand'>True</property>"
 "                <layout>"
-"                  <property name='left-attach'>1</property>"
-"                  <property name='top-attach'>0</property>"
+"                  <property name='column'>1</property>"
+"                  <property name='row'>0</property>"
 "                </layout>"
 "              </object>"
 "            </child>"
diff --git a/tests/testsplitheaders.ui b/tests/testsplitheaders.ui
index 631194c35a..867b5277ba 100644
--- a/tests/testsplitheaders.ui
+++ b/tests/testsplitheaders.ui
@@ -95,8 +95,8 @@
                   <object class="GtkLabel">
                     <property name="label">Layout</property>
                     <layout>
-                      <property name="left-attach">0</property>
-                      <property name="top-attach">0</property>
+                      <property name="column">0</property>
+                      <property name="row">0</property>
                     </layout>
                   </object>
                 </child>
@@ -104,8 +104,8 @@
                   <object class="GtkEntry" id="layout-entry">
                     <property name="width-chars">25</property>
                     <layout>
-                      <property name="left-attach">1</property>
-                      <property name="top-attach">0</property>
+                      <property name="column">1</property>
+                      <property name="row">0</property>
                     </layout>
                   </object>
                 </child>
@@ -113,16 +113,16 @@
                   <object class="GtkLabel">
                     <property name="label">Decorations</property>
                     <layout>
-                      <property name="left-attach">0</property>
-                      <property name="top-attach">1</property>
+                      <property name="column">0</property>
+                      <property name="row">1</property>
                     </layout>
                   </object>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="decorations">
                     <layout>
-                      <property name="left-attach">1</property>
-                      <property name="top-attach">1</property>
+                      <property name="column">1</property>
+                      <property name="row">1</property>
                     </layout>
                   </object>
                 </child>
diff --git a/testsuite/css/nodes/buttons.ui b/testsuite/css/nodes/buttons.ui
index 3b89c6dd60..c3b0f8c4b0 100644
--- a/testsuite/css/nodes/buttons.ui
+++ b/testsuite/css/nodes/buttons.ui
@@ -11,8 +11,8 @@
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -22,8 +22,8 @@
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -34,8 +34,8 @@
             <property name="active">1</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -46,8 +46,8 @@
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -57,8 +57,8 @@
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -67,8 +67,8 @@
             <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -78,8 +78,8 @@
             <property name="receives_default">1</property>
             <property name="label">Text Button</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -91,8 +91,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -104,8 +104,8 @@
             <property name="valign">center</property>
             <property name="icon-name">window-close-symbolic</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 6e514d4e55..0751862d61 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -988,14 +988,14 @@ test_layout_properties (void)
     "    <child>"
     "      <object class=\"GtkLabel\" id=\"label1\">"
     "        <layout>"
-    "          <property name=\"left-attach\">1</property>"
+    "          <property name=\"column\">1</property>"
     "        </layout>"
     "      </object>"
     "    </child>"
     "    <child>"
     "      <object class=\"GtkLabel\" id=\"label2\">"
     "        <layout>"
-    "          <property name=\"left-attach\">0</property>"
+    "          <property name=\"column\">0</property>"
     "        </layout>"
     "      </object>"
     "    </child>"
diff --git a/testsuite/gtk/focus-chain/widget-factory.ui b/testsuite/gtk/focus-chain/widget-factory.ui
index bf09b8732b..c4b6ef8886 100644
--- a/testsuite/gtk/focus-chain/widget-factory.ui
+++ b/testsuite/gtk/focus-chain/widget-factory.ui
@@ -632,8 +632,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkCheckButton" id="checkbutton2">
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -642,8 +642,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -653,8 +653,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -663,8 +663,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -674,8 +674,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -684,8 +684,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -694,8 +694,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -705,8 +705,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -715,8 +715,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -726,8 +726,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -738,8 +738,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -747,15 +747,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner1">
                                     <property name="spinning">1</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner2">
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -764,8 +764,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="spinning">1</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -773,8 +773,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner4">
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -1496,8 +1496,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1512,8 +1512,8 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -2957,8 +2957,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2966,8 +2966,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2982,8 +2982,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -2991,8 +2991,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3007,8 +3007,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3018,8 +3018,8 @@ bad things might happen.</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3034,8 +3034,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3044,8 +3044,8 @@ bad things might happen.</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3115,7 +3115,7 @@ bad things might happen.</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -3132,8 +3132,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3142,7 +3142,7 @@ bad things might happen.</property>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3161,8 +3161,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3174,8 +3174,8 @@ bad things might happen.</property>
             <property name="menu-model">gear_menu</property>
             <property name="tooltip-text">This is a menu button</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3188,8 +3188,8 @@ bad things might happen.</property>
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/gtk/focus-chain/widget-factory2.ui b/testsuite/gtk/focus-chain/widget-factory2.ui
index abe48c0222..9d814b2125 100644
--- a/testsuite/gtk/focus-chain/widget-factory2.ui
+++ b/testsuite/gtk/focus-chain/widget-factory2.ui
@@ -633,8 +633,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkCheckButton" id="checkbutton2">
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -643,8 +643,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -654,8 +654,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -664,8 +664,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -675,8 +675,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -685,8 +685,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -695,8 +695,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -706,8 +706,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -716,8 +716,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -727,8 +727,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -739,8 +739,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -748,15 +748,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner1">
                                     <property name="spinning">1</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner2">
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -765,8 +765,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="spinning">1</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -774,8 +774,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner4">
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -1497,8 +1497,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1513,8 +1513,8 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -2958,8 +2958,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2967,8 +2967,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2983,8 +2983,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -2992,8 +2992,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3008,8 +3008,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3019,8 +3019,8 @@ bad things might happen.</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3035,8 +3035,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3045,8 +3045,8 @@ bad things might happen.</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3116,7 +3116,7 @@ bad things might happen.</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -3133,8 +3133,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3143,7 +3143,7 @@ bad things might happen.</property>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3162,8 +3162,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3175,8 +3175,8 @@ bad things might happen.</property>
             <property name="menu-model">gear_menu</property>
             <property name="tooltip-text">This is a menu button</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3189,8 +3189,8 @@ bad things might happen.</property>
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/gtk/focus-chain/widget-factory3.ui b/testsuite/gtk/focus-chain/widget-factory3.ui
index 02c485c4b7..d7a5bc973d 100644
--- a/testsuite/gtk/focus-chain/widget-factory3.ui
+++ b/testsuite/gtk/focus-chain/widget-factory3.ui
@@ -633,8 +633,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkCheckButton" id="checkbutton2">
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -643,8 +643,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -654,8 +654,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -664,8 +664,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -675,8 +675,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -685,8 +685,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -695,8 +695,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -706,8 +706,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -716,8 +716,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -727,8 +727,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -739,8 +739,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -748,15 +748,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner1">
                                     <property name="spinning">1</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner2">
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -765,8 +765,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="spinning">1</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -774,8 +774,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner4">
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -1497,8 +1497,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1513,8 +1513,8 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -2958,8 +2958,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2967,8 +2967,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -2983,8 +2983,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -2992,8 +2992,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3008,8 +3008,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3019,8 +3019,8 @@ bad things might happen.</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3035,8 +3035,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3045,8 +3045,8 @@ bad things might happen.</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3116,7 +3116,7 @@ bad things might happen.</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -3133,8 +3133,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3143,7 +3143,7 @@ bad things might happen.</property>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3162,8 +3162,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3175,8 +3175,8 @@ bad things might happen.</property>
             <property name="menu-model">gear_menu</property>
             <property name="tooltip-text">This is a menu button</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3189,8 +3189,8 @@ bad things might happen.</property>
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/gtk/grid-layout.c b/testsuite/gtk/grid-layout.c
index b926c3193b..2ac35553b2 100644
--- a/testsuite/gtk/grid-layout.c
+++ b/testsuite/gtk/grid-layout.c
@@ -144,11 +144,11 @@ test_simple_row (void)
   gtk_widget_set_parent (GTK_WIDGET (child3), parent);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child1));
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 0);
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child2));
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 1);
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child3));
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 2);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 2);
 
   gtk_layout_manager_measure (layout,
                               parent,
@@ -237,11 +237,11 @@ test_simple_column (void)
   gtk_widget_set_parent (GTK_WIDGET (child3), parent);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child1));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 0);
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child2));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 1);
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child3));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 2);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 2);
 
   gtk_layout_manager_measure (layout,
                               parent,
@@ -348,22 +348,22 @@ test_spans (void)
   gtk_widget_set_parent (GTK_WIDGET (child4), parent);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child1));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 0);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child2));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 1);
   gtk_grid_layout_child_set_column_span (GTK_GRID_LAYOUT_CHILD (lc), 2);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child3));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 0);
   gtk_grid_layout_child_set_column_span (GTK_GRID_LAYOUT_CHILD (lc), 2);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child4));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 2);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 2);
 
   gtk_layout_manager_measure (layout,
                               parent,
@@ -466,20 +466,20 @@ test_homogeneous (void)
   gtk_widget_set_parent (GTK_WIDGET (child4), parent);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child1));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 0);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child2));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 1);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child3));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 0);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child4));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 1);
 
   gtk_layout_manager_measure (layout,
                               parent,
@@ -584,16 +584,16 @@ test_simple_layout (void)
   gtk_widget_set_parent (GTK_WIDGET (child3), parent);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child1));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 0);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child2));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 1);
 
   lc = gtk_layout_manager_get_layout_child (layout, GTK_WIDGET (child3));
-  gtk_grid_layout_child_set_top_attach (GTK_GRID_LAYOUT_CHILD (lc), 1);
-  gtk_grid_layout_child_set_left_attach (GTK_GRID_LAYOUT_CHILD (lc), 0);
+  gtk_grid_layout_child_set_row (GTK_GRID_LAYOUT_CHILD (lc), 1);
+  gtk_grid_layout_child_set_column (GTK_GRID_LAYOUT_CHILD (lc), 0);
   gtk_grid_layout_child_set_column_span (GTK_GRID_LAYOUT_CHILD (lc), 2);
 
   gtk_layout_manager_measure (layout,
diff --git a/testsuite/reftests/animation-direction.ref.ui b/testsuite/reftests/animation-direction.ref.ui
index 96bc47509d..5c2f97aaef 100644
--- a/testsuite/reftests/animation-direction.ref.ui
+++ b/testsuite/reftests/animation-direction.ref.ui
@@ -14,8 +14,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -27,8 +27,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -40,8 +40,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -53,8 +53,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -66,8 +66,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -79,8 +79,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -92,8 +92,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -105,8 +105,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -118,8 +118,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">1</property>
+              <property name="column">7</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -131,8 +131,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -144,8 +144,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -157,8 +157,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -170,8 +170,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">2</property>
+              <property name="column">7</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -183,8 +183,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -196,8 +196,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -209,8 +209,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -222,8 +222,8 @@
               <attribute name="foreground" value="#ffff00000000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -235,8 +235,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -248,8 +248,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -261,8 +261,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -274,8 +274,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -287,8 +287,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">0</property>
+              <property name="column">7</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -300,8 +300,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -313,8 +313,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -326,8 +326,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -339,8 +339,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -352,8 +352,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -365,8 +365,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -378,8 +378,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -391,8 +391,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -404,8 +404,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -417,8 +417,8 @@
               <attribute name="foreground" value="#ffffffff0000"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">3</property>
+              <property name="column">7</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/animation-direction.ui b/testsuite/reftests/animation-direction.ui
index ad6880339c..bf4e6cb43e 100644
--- a/testsuite/reftests/animation-direction.ui
+++ b/testsuite/reftests/animation-direction.ui
@@ -14,8 +14,8 @@
               <class name="delay-5s"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -27,8 +27,8 @@
               <class name="delay-5s"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -40,8 +40,8 @@
               <class name="delay-5s"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -53,8 +53,8 @@
               <class name="delay-5s"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -66,8 +66,8 @@
               <class name="delay-15s"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -79,8 +79,8 @@
               <class name="delay-25s"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -92,8 +92,8 @@
               <class name="delay-35s"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -105,8 +105,8 @@
               <class name="delay-45s"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -118,8 +118,8 @@
               <class name="delay-55s"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -131,8 +131,8 @@
               <class name="delay-65s"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -144,8 +144,8 @@
               <class name="delay-75s"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">3</property>
+              <property name="column">7</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -157,8 +157,8 @@
               <class name="delay-15s"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -170,8 +170,8 @@
               <class name="delay-25s"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -183,8 +183,8 @@
               <class name="delay-35s"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -196,8 +196,8 @@
               <class name="delay-45s"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -209,8 +209,8 @@
               <class name="delay-55s"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -222,8 +222,8 @@
               <class name="delay-65s"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -235,8 +235,8 @@
               <class name="delay-75s"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">2</property>
+              <property name="column">7</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -248,8 +248,8 @@
               <class name="delay-15s"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -261,8 +261,8 @@
               <class name="delay-25s"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -274,8 +274,8 @@
               <class name="delay-35s"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -287,8 +287,8 @@
               <class name="delay-45s"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -300,8 +300,8 @@
               <class name="delay-55s"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -313,8 +313,8 @@
               <class name="delay-65s"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -326,8 +326,8 @@
               <class name="delay-75s"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">1</property>
+              <property name="column">7</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -339,8 +339,8 @@
               <class name="delay-15s"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -352,8 +352,8 @@
               <class name="delay-25s"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -365,8 +365,8 @@
               <class name="delay-35s"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -378,8 +378,8 @@
               <class name="delay-45s"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -391,8 +391,8 @@
               <class name="delay-55s"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -404,8 +404,8 @@
               <class name="delay-65s"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -417,8 +417,8 @@
               <class name="delay-75s"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">0</property>
+              <property name="column">7</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui 
b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
index abc051f883..1287c040c3 100644
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
@@ -8,8 +8,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">normal</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -17,8 +17,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">reverse</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -26,8 +26,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">alternate</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -35,8 +35,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">alternate-reverse</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -45,8 +45,8 @@
             <property name="label" translatable="yes">--&gt;
 2⅕x</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">0</property>
+              <property name="column">12</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -62,8 +62,8 @@
               <class name="lightorange"/>
             </style>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">1</property>
+              <property name="column">12</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -79,8 +79,8 @@
               <class name="darkorange"/>
             </style>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">2</property>
+              <property name="column">12</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -96,8 +96,8 @@
               <class name="lightorange"/>
             </style>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">3</property>
+              <property name="column">12</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -113,8 +113,8 @@
               <class name="darkorange"/>
             </style>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">4</property>
+              <property name="column">12</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -130,8 +130,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">4</property>
+              <property name="column">11</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -147,8 +147,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">3</property>
+              <property name="column">11</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -164,8 +164,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">2</property>
+              <property name="column">11</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -181,8 +181,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">1</property>
+              <property name="column">11</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -191,8 +191,8 @@
             <property name="label" translatable="yes">&lt;--
 2⅕x</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">0</property>
+              <property name="column">11</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -201,8 +201,8 @@
             <property name="label" translatable="yes">--&gt;
 2x</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">0</property>
+              <property name="column">10</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -218,8 +218,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">1</property>
+              <property name="column">10</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -235,8 +235,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">2</property>
+              <property name="column">10</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -252,8 +252,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">3</property>
+              <property name="column">10</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -269,8 +269,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">4</property>
+              <property name="column">10</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -286,8 +286,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">4</property>
+              <property name="column">9</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -303,8 +303,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">3</property>
+              <property name="column">9</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -320,8 +320,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">2</property>
+              <property name="column">9</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -337,8 +337,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">1</property>
+              <property name="column">9</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -347,8 +347,8 @@
             <property name="label" translatable="yes">&lt;--
 2x</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">0</property>
+              <property name="column">9</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -357,8 +357,8 @@
             <property name="label" translatable="yes">--&gt;
 1⅕x</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">0</property>
+              <property name="column">8</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -374,8 +374,8 @@
               <class name="lightorange"/>
             </style>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">1</property>
+              <property name="column">8</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -391,8 +391,8 @@
               <class name="darkorange"/>
             </style>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">2</property>
+              <property name="column">8</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -408,8 +408,8 @@
               <class name="darkorange"/>
             </style>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">3</property>
+              <property name="column">8</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -425,8 +425,8 @@
               <class name="lightorange"/>
             </style>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">4</property>
+              <property name="column">8</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -435,8 +435,8 @@
             <property name="label" translatable="yes">&lt;--
 1⅕x</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">0</property>
+              <property name="column">7</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -452,8 +452,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">1</property>
+              <property name="column">7</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -469,8 +469,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">2</property>
+              <property name="column">7</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -486,8 +486,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">3</property>
+              <property name="column">7</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -503,8 +503,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">4</property>
+              <property name="column">7</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -513,8 +513,8 @@
             <property name="label" translatable="yes">--&gt;
 1x</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -530,8 +530,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -547,8 +547,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -564,8 +564,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -581,8 +581,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">4</property>
+              <property name="column">6</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -591,8 +591,8 @@
             <property name="label" translatable="yes">&lt;--
 1x</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -608,8 +608,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -625,8 +625,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -642,8 +642,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -659,8 +659,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">4</property>
+              <property name="column">5</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -669,8 +669,8 @@
             <property name="label" translatable="yes">&lt;--
 ⅕x</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -679,8 +679,8 @@
             <property name="label" translatable="yes">--&gt;
 ⅕x</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -696,8 +696,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -713,8 +713,8 @@
               <class name="lightorange"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -730,8 +730,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -747,8 +747,8 @@
               <class name="darkorange"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -764,8 +764,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -781,8 +781,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -798,8 +798,8 @@
               <class name="lightorange"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -815,8 +815,8 @@
               <class name="darkorange"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -825,8 +825,8 @@
             <property name="label" translatable="yes">&lt;--
 0x</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -835,8 +835,8 @@
             <property name="label" translatable="yes">--&gt;
 0x</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -852,8 +852,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -869,8 +869,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -886,8 +886,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -903,8 +903,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -920,8 +920,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -937,8 +937,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -954,8 +954,8 @@
               <class name="red"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -971,8 +971,8 @@
               <class name="yellow"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ui 
b/testsuite/reftests/animation-fill-mode-iteration-count.ui
index 4f88c507cb..4b58c08af1 100644
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ui
@@ -8,8 +8,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">normal</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -17,8 +17,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">reverse</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -26,8 +26,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">alternate</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -35,8 +35,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">alternate-reverse</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -45,8 +45,8 @@
             <property name="label" translatable="yes">--&gt;
 2⅕x</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">0</property>
+              <property name="column">12</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -64,8 +64,8 @@
               <class name="x22"/>
             </style>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">1</property>
+              <property name="column">12</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -83,8 +83,8 @@
               <class name="x22"/>
             </style>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">2</property>
+              <property name="column">12</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -102,8 +102,8 @@
               <class name="x22"/>
             </style>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">3</property>
+              <property name="column">12</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -121,8 +121,8 @@
               <class name="x22"/>
             </style>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">4</property>
+              <property name="column">12</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -131,8 +131,8 @@
             <property name="label" translatable="yes">&lt;--
 2⅕x</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">0</property>
+              <property name="column">11</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -150,8 +150,8 @@
               <class name="x22"/>
             </style>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">1</property>
+              <property name="column">11</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -169,8 +169,8 @@
               <class name="x22"/>
             </style>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">2</property>
+              <property name="column">11</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -188,8 +188,8 @@
               <class name="x22"/>
             </style>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">3</property>
+              <property name="column">11</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -207,8 +207,8 @@
               <class name="x22"/>
             </style>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">4</property>
+              <property name="column">11</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -226,8 +226,8 @@
               <class name="x2"/>
             </style>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">4</property>
+              <property name="column">10</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -245,8 +245,8 @@
               <class name="x2"/>
             </style>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">3</property>
+              <property name="column">10</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -264,8 +264,8 @@
               <class name="x2"/>
             </style>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">2</property>
+              <property name="column">10</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -283,8 +283,8 @@
               <class name="x2"/>
             </style>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">1</property>
+              <property name="column">10</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -293,8 +293,8 @@
             <property name="label" translatable="yes">--&gt;
 2x</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">0</property>
+              <property name="column">10</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -303,8 +303,8 @@
             <property name="label" translatable="yes">&lt;--
 2x</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">0</property>
+              <property name="column">9</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -322,8 +322,8 @@
               <class name="x2"/>
             </style>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">1</property>
+              <property name="column">9</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -341,8 +341,8 @@
               <class name="x2"/>
             </style>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">2</property>
+              <property name="column">9</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -360,8 +360,8 @@
               <class name="x2"/>
             </style>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">3</property>
+              <property name="column">9</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -379,8 +379,8 @@
               <class name="x2"/>
             </style>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">4</property>
+              <property name="column">9</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -389,8 +389,8 @@
             <property name="label" translatable="yes">--&gt;
 1⅕x</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">0</property>
+              <property name="column">8</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -408,8 +408,8 @@
               <class name="x12"/>
             </style>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">1</property>
+              <property name="column">8</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -427,8 +427,8 @@
               <class name="x12"/>
             </style>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">2</property>
+              <property name="column">8</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -446,8 +446,8 @@
               <class name="x12"/>
             </style>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">3</property>
+              <property name="column">8</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -465,8 +465,8 @@
               <class name="x12"/>
             </style>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">4</property>
+              <property name="column">8</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -484,8 +484,8 @@
               <class name="x12"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">4</property>
+              <property name="column">7</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -503,8 +503,8 @@
               <class name="x12"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">3</property>
+              <property name="column">7</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -522,8 +522,8 @@
               <class name="x12"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">2</property>
+              <property name="column">7</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -541,8 +541,8 @@
               <class name="x12"/>
             </style>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">1</property>
+              <property name="column">7</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -551,8 +551,8 @@
             <property name="label" translatable="yes">&lt;--
 1⅕x</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">0</property>
+              <property name="column">7</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -561,8 +561,8 @@
             <property name="label" translatable="yes">--&gt;
 1x</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -580,8 +580,8 @@
               <class name="x1"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -599,8 +599,8 @@
               <class name="x1"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -618,8 +618,8 @@
               <class name="x1"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -637,8 +637,8 @@
               <class name="x1"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">4</property>
+              <property name="column">6</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -647,8 +647,8 @@
             <property name="label" translatable="yes">&lt;--
 1x</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -666,8 +666,8 @@
               <class name="x1"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -685,8 +685,8 @@
               <class name="x1"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -704,8 +704,8 @@
               <class name="x1"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -723,8 +723,8 @@
               <class name="x1"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">4</property>
+              <property name="column">5</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -733,8 +733,8 @@
             <property name="label" translatable="yes">&lt;--
 ⅕x</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -743,8 +743,8 @@
             <property name="label" translatable="yes">--&gt;
 ⅕x</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -762,8 +762,8 @@
               <class name="x02"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -781,8 +781,8 @@
               <class name="x02"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -800,8 +800,8 @@
               <class name="x02"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -819,8 +819,8 @@
               <class name="x02"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -838,8 +838,8 @@
               <class name="x02"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -857,8 +857,8 @@
               <class name="x02"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -876,8 +876,8 @@
               <class name="x02"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -895,8 +895,8 @@
               <class name="x02"/>
             </style>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -905,8 +905,8 @@
             <property name="label" translatable="yes">&lt;--
 0x</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -915,8 +915,8 @@
             <property name="label" translatable="yes">--&gt;
 0x</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -934,8 +934,8 @@
               <class name="x0"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -953,8 +953,8 @@
               <class name="x0"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -972,8 +972,8 @@
               <class name="x0"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -991,8 +991,8 @@
               <class name="x0"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -1010,8 +1010,8 @@
               <class name="x0"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -1029,8 +1029,8 @@
               <class name="x0"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -1048,8 +1048,8 @@
               <class name="x0"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -1067,8 +1067,8 @@
               <class name="x0"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/background-color-transparent.ref.ui 
b/testsuite/reftests/background-color-transparent.ref.ui
index dd4d2ec07e..ccafe091c3 100644
--- a/testsuite/reftests/background-color-transparent.ref.ui
+++ b/testsuite/reftests/background-color-transparent.ref.ui
@@ -9,8 +9,8 @@
             <property name="label" translatable="yes">opaque</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -24,8 +24,8 @@
               <class name="reference"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/background-color-transparent.ui 
b/testsuite/reftests/background-color-transparent.ui
index 87dc7951e3..ce59c0e058 100644
--- a/testsuite/reftests/background-color-transparent.ui
+++ b/testsuite/reftests/background-color-transparent.ui
@@ -9,8 +9,8 @@
             <property name="label" translatable="yes">opaque</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -24,8 +24,8 @@
               <class name="transparent"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/background-position.ui b/testsuite/reftests/background-position.ui
index 2ffaa3f6b1..5874962a19 100644
--- a/testsuite/reftests/background-position.ui
+++ b/testsuite/reftests/background-position.ui
@@ -11,8 +11,8 @@
             <property name="receives_default">1</property>
             <property name="name">a</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -25,8 +25,8 @@
             <property name="receives_default">1</property>
             <property name="name">b</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -39,8 +39,8 @@
             <property name="receives_default">1</property>
             <property name="name">c</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -53,8 +53,8 @@
             <property name="receives_default">1</property>
             <property name="name">d</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -67,8 +67,8 @@
             <property name="receives_default">1</property>
             <property name="name">e</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -81,8 +81,8 @@
             <property name="receives_default">1</property>
             <property name="name">f</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -95,8 +95,8 @@
             <property name="receives_default">1</property>
             <property name="name">g</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -109,8 +109,8 @@
             <property name="receives_default">1</property>
             <property name="name">h</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -123,8 +123,8 @@
             <property name="receives_default">1</property>
             <property name="name">i</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/background-repeat.ref.ui b/testsuite/reftests/background-repeat.ref.ui
index 58913f65e8..897b77a26a 100644
--- a/testsuite/reftests/background-repeat.ref.ui
+++ b/testsuite/reftests/background-repeat.ref.ui
@@ -12,8 +12,8 @@
             <property name="height_request">60</property>
             <property name="pixbuf">border-image-ball-red.png</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -25,8 +25,8 @@
             <property name="height_request">60</property>
             <property name="pixbuf">border-image-3-balls-green.png</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -38,8 +38,8 @@
             <property name="height_request">60</property>
             <property name="pixbuf">border-image-3-balls-green.png</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -54,8 +54,8 @@
               <placeholder/>
             </child>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/background-repeat.ui b/testsuite/reftests/background-repeat.ui
index a01be2c656..c76531d2a9 100644
--- a/testsuite/reftests/background-repeat.ui
+++ b/testsuite/reftests/background-repeat.ui
@@ -15,8 +15,8 @@
               <placeholder/>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -31,8 +31,8 @@
               <placeholder/>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -47,8 +47,8 @@
               <placeholder/>
             </child>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/background-size-keywords.ref.ui 
b/testsuite/reftests/background-size-keywords.ref.ui
index f65db5a673..d5dffc8e35 100644
--- a/testsuite/reftests/background-size-keywords.ref.ui
+++ b/testsuite/reftests/background-size-keywords.ref.ui
@@ -13,8 +13,8 @@
             <property name="receives_default">1</property>
             <property name="name">a</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -28,8 +28,8 @@
             <property name="receives_default">1</property>
             <property name="name">b</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -43,8 +43,8 @@
             <property name="receives_default">1</property>
             <property name="name">c</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -58,8 +58,8 @@
             <property name="receives_default">1</property>
             <property name="name">d</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -73,8 +73,8 @@
             <property name="receives_default">1</property>
             <property name="name">e</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -88,8 +88,8 @@
             <property name="receives_default">1</property>
             <property name="name">f</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -103,8 +103,8 @@
             <property name="receives_default">1</property>
             <property name="name">g</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -118,8 +118,8 @@
             <property name="receives_default">1</property>
             <property name="name">h</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -133,8 +133,8 @@
             <property name="receives_default">1</property>
             <property name="name">i</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -148,8 +148,8 @@
             <property name="receives_default">1</property>
             <property name="name">j</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -163,8 +163,8 @@
             <property name="receives_default">1</property>
             <property name="name">k</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -178,8 +178,8 @@
             <property name="receives_default">1</property>
             <property name="name">l</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/background-size-keywords.ui b/testsuite/reftests/background-size-keywords.ui
index 0c3f15ce08..db6b54b8db 100644
--- a/testsuite/reftests/background-size-keywords.ui
+++ b/testsuite/reftests/background-size-keywords.ui
@@ -12,8 +12,8 @@
             <property name="receives_default">1</property>
             <property name="name">a</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -27,8 +27,8 @@
             <property name="receives_default">1</property>
             <property name="name">b</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -42,8 +42,8 @@
             <property name="receives_default">1</property>
             <property name="name">c</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -57,8 +57,8 @@
             <property name="receives_default">1</property>
             <property name="name">d</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -72,8 +72,8 @@
             <property name="receives_default">1</property>
             <property name="name">e</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -87,8 +87,8 @@
             <property name="receives_default">1</property>
             <property name="name">f</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -102,8 +102,8 @@
             <property name="receives_default">1</property>
             <property name="name">g</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -117,8 +117,8 @@
             <property name="receives_default">1</property>
             <property name="name">h</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -132,8 +132,8 @@
             <property name="receives_default">1</property>
             <property name="name">i</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -147,8 +147,8 @@
             <property name="receives_default">1</property>
             <property name="name">j</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -162,8 +162,8 @@
             <property name="receives_default">1</property>
             <property name="name">k</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -177,8 +177,8 @@
             <property name="receives_default">1</property>
             <property name="name">l</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/background-size.ref.ui b/testsuite/reftests/background-size.ref.ui
index d6b7e8bd78..089698f5f6 100644
--- a/testsuite/reftests/background-size.ref.ui
+++ b/testsuite/reftests/background-size.ref.ui
@@ -13,8 +13,8 @@
             <property name="receives_default">1</property>
             <property name="name">a</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -28,8 +28,8 @@
             <property name="receives_default">1</property>
             <property name="name">b</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -43,8 +43,8 @@
             <property name="receives_default">1</property>
             <property name="name">c</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -58,8 +58,8 @@
             <property name="receives_default">1</property>
             <property name="name">d</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -73,8 +73,8 @@
             <property name="receives_default">1</property>
             <property name="name">e</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -88,8 +88,8 @@
             <property name="receives_default">1</property>
             <property name="name">f</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -103,8 +103,8 @@
             <property name="receives_default">1</property>
             <property name="name">g</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -118,8 +118,8 @@
             <property name="receives_default">1</property>
             <property name="name">h</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -133,8 +133,8 @@
             <property name="receives_default">1</property>
             <property name="name">i</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -148,8 +148,8 @@
             <property name="receives_default">1</property>
             <property name="name">j</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -163,8 +163,8 @@
             <property name="receives_default">1</property>
             <property name="name">k</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -178,8 +178,8 @@
             <property name="receives_default">1</property>
             <property name="name">l</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/background-size.ui b/testsuite/reftests/background-size.ui
index 0af3a92e7a..4e5cc87337 100644
--- a/testsuite/reftests/background-size.ui
+++ b/testsuite/reftests/background-size.ui
@@ -12,8 +12,8 @@
             <property name="receives_default">1</property>
             <property name="name">a</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -27,8 +27,8 @@
             <property name="receives_default">1</property>
             <property name="name">b</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -42,8 +42,8 @@
             <property name="receives_default">1</property>
             <property name="name">c</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -57,8 +57,8 @@
             <property name="receives_default">1</property>
             <property name="name">d</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -72,8 +72,8 @@
             <property name="receives_default">1</property>
             <property name="name">e</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -87,8 +87,8 @@
             <property name="receives_default">1</property>
             <property name="name">f</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -102,8 +102,8 @@
             <property name="receives_default">1</property>
             <property name="name">g</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -117,8 +117,8 @@
             <property name="receives_default">1</property>
             <property name="name">h</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -132,8 +132,8 @@
             <property name="receives_default">1</property>
             <property name="name">i</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -147,8 +147,8 @@
             <property name="receives_default">1</property>
             <property name="name">j</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -162,8 +162,8 @@
             <property name="receives_default">1</property>
             <property name="name">k</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -177,8 +177,8 @@
             <property name="receives_default">1</property>
             <property name="name">l</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui 
b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
index aa59cce60d..2b111b6855 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
@@ -10,8 +10,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -20,8 +20,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -30,8 +30,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -40,8 +40,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -50,8 +50,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -60,8 +60,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -70,8 +70,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -80,8 +80,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -90,8 +90,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -100,8 +100,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -110,8 +110,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -120,8 +120,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -130,8 +130,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -140,8 +140,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -150,8 +150,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -160,8 +160,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ui 
b/testsuite/reftests/border-corner-zero-width-rendering.ui
index c70e277ca9..21c1f7e72d 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ui
@@ -10,8 +10,8 @@
             <property name="label" translatable="yes">button</property>
             <property name="receives_default">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -23,8 +23,8 @@
               <class name="top"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -37,8 +37,8 @@
               <class name="top"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -50,8 +50,8 @@
               <class name="bottom"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -64,8 +64,8 @@
               <class name="right"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -77,8 +77,8 @@
               <class name="right"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -90,8 +90,8 @@
               <class name="left"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -106,8 +106,8 @@
               <class name="right"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -121,8 +121,8 @@
               <class name="right"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -136,8 +136,8 @@
               <class name="right"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -151,8 +151,8 @@
               <class name="right"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -166,8 +166,8 @@
               <class name="left"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -180,8 +180,8 @@
               <class name="right"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -194,8 +194,8 @@
               <class name="right"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -208,8 +208,8 @@
               <class name="left"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -222,8 +222,8 @@
               <class name="left"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/border-image-excess-size.ref.ui 
b/testsuite/reftests/border-image-excess-size.ref.ui
index 6ffc441118..ed0195db9e 100644
--- a/testsuite/reftests/border-image-excess-size.ref.ui
+++ b/testsuite/reftests/border-image-excess-size.ref.ui
@@ -11,8 +11,8 @@
             <property name="width_request">1</property>
             <property name="height_request">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -23,8 +23,8 @@
             <property name="width_request">1</property>
             <property name="height_request">1</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -35,8 +35,8 @@
             <property name="width_request">1</property>
             <property name="height_request">1</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -47,8 +47,8 @@
             <property name="width_request">1</property>
             <property name="height_request">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/border-style.ref.ui b/testsuite/reftests/border-style.ref.ui
index 2b45286142..3120e7d830 100644
--- a/testsuite/reftests/border-style.ref.ui
+++ b/testsuite/reftests/border-style.ref.ui
@@ -13,8 +13,8 @@
               <class name="button-border"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/border-style.ui b/testsuite/reftests/border-style.ui
index 4d0721b167..4d26fbbe10 100644
--- a/testsuite/reftests/border-style.ui
+++ b/testsuite/reftests/border-style.ui
@@ -13,8 +13,8 @@
               <class name="button-top-left"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -29,8 +29,8 @@
               <class name="button-top-right"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -45,8 +45,8 @@
               <class name="button-bottom-left"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -61,8 +61,8 @@
               <class name="button-bottom-right"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/box-order.ref.ui b/testsuite/reftests/box-order.ref.ui
index 42a8c35e39..5cf8975e94 100644
--- a/testsuite/reftests/box-order.ref.ui
+++ b/testsuite/reftests/box-order.ref.ui
@@ -43,8 +43,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -86,8 +86,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -129,8 +129,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -172,8 +172,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -215,8 +215,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/box-order.ui b/testsuite/reftests/box-order.ui
index 27826c4b11..1e1f18b07b 100644
--- a/testsuite/reftests/box-order.ui
+++ b/testsuite/reftests/box-order.ui
@@ -43,8 +43,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -86,8 +86,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -149,8 +149,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -192,8 +192,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -235,8 +235,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/box-shadow-spec-inset.ref.ui b/testsuite/reftests/box-shadow-spec-inset.ref.ui
index 9aff2f360f..bd5910753c 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ref.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ref.ui
@@ -16,8 +16,8 @@
               <class name="column1"/>
             </style>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -33,8 +33,8 @@
               <class name="column2"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -90,8 +90,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -137,8 +137,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -194,8 +194,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -241,8 +241,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/box-shadow-spec-inset.ui b/testsuite/reftests/box-shadow-spec-inset.ui
index f30bad18f9..f614a480cc 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ui
@@ -15,8 +15,8 @@
               <class name="row1"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -31,8 +31,8 @@
               <class name="row2"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -47,8 +47,8 @@
               <class name="row3"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -63,8 +63,8 @@
               <class name="row1"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -79,8 +79,8 @@
               <class name="row2"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -95,8 +95,8 @@
               <class name="row3"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/cross-fade-syntax.ref.ui b/testsuite/reftests/cross-fade-syntax.ref.ui
index 5aaf669e88..f4a7732870 100644
--- a/testsuite/reftests/cross-fade-syntax.ref.ui
+++ b/testsuite/reftests/cross-fade-syntax.ref.ui
@@ -12,8 +12,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -25,8 +25,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -38,8 +38,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -51,8 +51,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -64,8 +64,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -77,8 +77,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -90,8 +90,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -103,8 +103,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">0</property>
+              <property name="column">7</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -116,8 +116,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">0</property>
+              <property name="column">8</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -129,8 +129,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">0</property>
+              <property name="column">9</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -142,8 +142,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -155,8 +155,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -168,8 +168,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -181,8 +181,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -194,8 +194,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -207,8 +207,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -220,8 +220,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -233,8 +233,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">1</property>
+              <property name="column">7</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -246,8 +246,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">1</property>
+              <property name="column">8</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -259,8 +259,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">1</property>
+              <property name="column">9</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -272,8 +272,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -285,8 +285,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -298,8 +298,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -311,8 +311,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -324,8 +324,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -337,8 +337,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -350,8 +350,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -363,8 +363,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">2</property>
+              <property name="column">7</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -376,8 +376,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">2</property>
+              <property name="column">8</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -389,8 +389,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">2</property>
+              <property name="column">9</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -402,8 +402,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -415,8 +415,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -428,8 +428,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -441,8 +441,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -454,8 +454,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -467,8 +467,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -480,8 +480,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -493,8 +493,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">3</property>
+              <property name="column">7</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -506,8 +506,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">3</property>
+              <property name="column">8</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -519,8 +519,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">3</property>
+              <property name="column">9</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -532,8 +532,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -545,8 +545,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -558,8 +558,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -571,8 +571,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -584,8 +584,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -597,8 +597,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">4</property>
+              <property name="column">5</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -610,8 +610,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">4</property>
+              <property name="column">6</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -623,8 +623,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">4</property>
+              <property name="column">7</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -636,8 +636,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">4</property>
+              <property name="column">8</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -649,8 +649,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">4</property>
+              <property name="column">9</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -662,8 +662,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -675,8 +675,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -688,8 +688,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -701,8 +701,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">5</property>
+              <property name="column">3</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -714,8 +714,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">5</property>
+              <property name="column">4</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -727,8 +727,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">5</property>
+              <property name="column">5</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -740,8 +740,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">5</property>
+              <property name="column">6</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -753,8 +753,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">5</property>
+              <property name="column">7</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -766,8 +766,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">5</property>
+              <property name="column">8</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -779,8 +779,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">5</property>
+              <property name="column">9</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -792,8 +792,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -805,8 +805,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -818,8 +818,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">6</property>
+              <property name="column">2</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -831,8 +831,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">6</property>
+              <property name="column">3</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -844,8 +844,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">6</property>
+              <property name="column">4</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -857,8 +857,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">6</property>
+              <property name="column">5</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -870,8 +870,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">6</property>
+              <property name="column">6</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -883,8 +883,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">6</property>
+              <property name="column">7</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -896,8 +896,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">6</property>
+              <property name="column">8</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -909,8 +909,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">6</property>
+              <property name="column">9</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -922,8 +922,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">7</property>
+              <property name="column">0</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -935,8 +935,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -948,8 +948,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">7</property>
+              <property name="column">2</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -961,8 +961,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">7</property>
+              <property name="column">3</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -974,8 +974,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">7</property>
+              <property name="column">4</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -987,8 +987,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">7</property>
+              <property name="column">5</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1000,8 +1000,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">7</property>
+              <property name="column">6</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1013,8 +1013,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">7</property>
+              <property name="column">7</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1026,8 +1026,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">7</property>
+              <property name="column">8</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1039,8 +1039,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">7</property>
+              <property name="column">9</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1052,8 +1052,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">8</property>
+              <property name="column">0</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1065,8 +1065,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">8</property>
+              <property name="column">1</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1078,8 +1078,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1091,8 +1091,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">8</property>
+              <property name="column">3</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1104,8 +1104,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">8</property>
+              <property name="column">4</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1117,8 +1117,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">8</property>
+              <property name="column">5</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1130,8 +1130,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">8</property>
+              <property name="column">6</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1143,8 +1143,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">8</property>
+              <property name="column">7</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1156,8 +1156,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">8</property>
+              <property name="column">8</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1169,8 +1169,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">8</property>
+              <property name="column">9</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1182,8 +1182,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">9</property>
+              <property name="column">0</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1195,8 +1195,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">9</property>
+              <property name="column">1</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1208,8 +1208,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">9</property>
+              <property name="column">2</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1221,8 +1221,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">9</property>
+              <property name="column">3</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1234,8 +1234,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">9</property>
+              <property name="column">4</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1247,8 +1247,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">9</property>
+              <property name="column">5</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1260,8 +1260,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">9</property>
+              <property name="column">6</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1273,8 +1273,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">9</property>
+              <property name="column">7</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1286,8 +1286,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">9</property>
+              <property name="column">8</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1299,8 +1299,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">9</property>
+              <property name="column">9</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/cross-fade-syntax.ui b/testsuite/reftests/cross-fade-syntax.ui
index 2ea329f4ec..2ec58f7eed 100644
--- a/testsuite/reftests/cross-fade-syntax.ui
+++ b/testsuite/reftests/cross-fade-syntax.ui
@@ -12,8 +12,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -25,8 +25,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -38,8 +38,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -51,8 +51,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -64,8 +64,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -77,8 +77,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -90,8 +90,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -103,8 +103,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">0</property>
+              <property name="column">7</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -116,8 +116,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">0</property>
+              <property name="column">8</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -129,8 +129,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">0</property>
+              <property name="column">9</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -142,8 +142,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -155,8 +155,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -168,8 +168,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -181,8 +181,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -194,8 +194,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -207,8 +207,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -220,8 +220,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -233,8 +233,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">1</property>
+              <property name="column">7</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -246,8 +246,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">1</property>
+              <property name="column">8</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -259,8 +259,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">1</property>
+              <property name="column">9</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -272,8 +272,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -285,8 +285,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -298,8 +298,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -311,8 +311,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -324,8 +324,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -337,8 +337,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -350,8 +350,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -363,8 +363,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">2</property>
+              <property name="column">7</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -376,8 +376,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">2</property>
+              <property name="column">8</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -389,8 +389,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">2</property>
+              <property name="column">9</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -402,8 +402,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -415,8 +415,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -428,8 +428,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -441,8 +441,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -454,8 +454,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -467,8 +467,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -480,8 +480,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -493,8 +493,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">3</property>
+              <property name="column">7</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -506,8 +506,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">3</property>
+              <property name="column">8</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -519,8 +519,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">3</property>
+              <property name="column">9</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -532,8 +532,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -545,8 +545,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -558,8 +558,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -571,8 +571,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -584,8 +584,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -597,8 +597,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">4</property>
+              <property name="column">5</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -610,8 +610,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">4</property>
+              <property name="column">6</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -623,8 +623,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">4</property>
+              <property name="column">7</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -636,8 +636,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">4</property>
+              <property name="column">8</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -649,8 +649,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">4</property>
+              <property name="column">9</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -662,8 +662,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -675,8 +675,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -688,8 +688,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -701,8 +701,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">5</property>
+              <property name="column">3</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -714,8 +714,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">5</property>
+              <property name="column">4</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -727,8 +727,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">5</property>
+              <property name="column">5</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -740,8 +740,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">5</property>
+              <property name="column">6</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -753,8 +753,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">5</property>
+              <property name="column">7</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -766,8 +766,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">5</property>
+              <property name="column">8</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -779,8 +779,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">5</property>
+              <property name="column">9</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -792,8 +792,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -805,8 +805,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -818,8 +818,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">6</property>
+              <property name="column">2</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -831,8 +831,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">6</property>
+              <property name="column">3</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -844,8 +844,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">6</property>
+              <property name="column">4</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -857,8 +857,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">6</property>
+              <property name="column">5</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -870,8 +870,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">6</property>
+              <property name="column">6</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -883,8 +883,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">6</property>
+              <property name="column">7</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -896,8 +896,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">6</property>
+              <property name="column">8</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -909,8 +909,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">6</property>
+              <property name="column">9</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -922,8 +922,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">7</property>
+              <property name="column">0</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -935,8 +935,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -948,8 +948,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">7</property>
+              <property name="column">2</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -961,8 +961,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">7</property>
+              <property name="column">3</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -974,8 +974,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">7</property>
+              <property name="column">4</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -987,8 +987,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">7</property>
+              <property name="column">5</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1000,8 +1000,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">7</property>
+              <property name="column">6</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1013,8 +1013,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">7</property>
+              <property name="column">7</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1026,8 +1026,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">7</property>
+              <property name="column">8</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1039,8 +1039,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">7</property>
+              <property name="column">9</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1052,8 +1052,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">8</property>
+              <property name="column">0</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1065,8 +1065,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">8</property>
+              <property name="column">1</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1078,8 +1078,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1091,8 +1091,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">8</property>
+              <property name="column">3</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1104,8 +1104,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">8</property>
+              <property name="column">4</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1117,8 +1117,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">8</property>
+              <property name="column">5</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1130,8 +1130,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">8</property>
+              <property name="column">6</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1143,8 +1143,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">8</property>
+              <property name="column">7</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1156,8 +1156,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">8</property>
+              <property name="column">8</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1169,8 +1169,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">8</property>
+              <property name="column">9</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1182,8 +1182,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">9</property>
+              <property name="column">0</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1195,8 +1195,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">9</property>
+              <property name="column">1</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1208,8 +1208,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">9</property>
+              <property name="column">2</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1221,8 +1221,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">9</property>
+              <property name="column">3</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1234,8 +1234,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">9</property>
+              <property name="column">4</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1247,8 +1247,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">9</property>
+              <property name="column">5</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1260,8 +1260,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">9</property>
+              <property name="column">6</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1273,8 +1273,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">9</property>
+              <property name="column">7</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1286,8 +1286,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">9</property>
+              <property name="column">8</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1299,8 +1299,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">9</property>
+              <property name="column">9</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/css-em-label-size.ref.ui b/testsuite/reftests/css-em-label-size.ref.ui
index 786d4620c8..85f4f83069 100644
--- a/testsuite/reftests/css-em-label-size.ref.ui
+++ b/testsuite/reftests/css-em-label-size.ref.ui
@@ -12,8 +12,8 @@
             <property name="label" translatable="yes">px</property>
             <property name="height-request">100&gt;</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -21,8 +21,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">pt</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -30,8 +30,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">in</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -39,8 +39,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">cm</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -48,8 +48,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">mm</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -57,8 +57,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">em</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -66,8 +66,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">ex</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -91,8 +91,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -116,8 +116,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -141,8 +141,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -166,8 +166,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -191,8 +191,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -216,8 +216,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -241,8 +241,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/css-em-label-size.ui b/testsuite/reftests/css-em-label-size.ui
index b3a2c9f33d..fa89508222 100644
--- a/testsuite/reftests/css-em-label-size.ui
+++ b/testsuite/reftests/css-em-label-size.ui
@@ -12,8 +12,8 @@
             <property name="label" translatable="yes">px</property>
             <property name="height-request">100&gt;</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -21,8 +21,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">pt</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -30,8 +30,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">in</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -39,8 +39,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">cm</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -48,8 +48,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">mm</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -57,8 +57,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">em</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -66,8 +66,8 @@
           <object class="GtkLabel">
             <property name="label" translatable="yes">ex</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -87,8 +87,8 @@
               <class name="px"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -108,8 +108,8 @@
               <class name="pt"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -129,8 +129,8 @@
               <class name="in"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -150,8 +150,8 @@
               <class name="cm"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -171,8 +171,8 @@
               <class name="mm"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -192,8 +192,8 @@
               <class name="em"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -213,8 +213,8 @@
               <class name="ex"/>
             </style>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/css-match-descendant-later.ui 
b/testsuite/reftests/css-match-descendant-later.ui
index 711dd67047..fd0ff99e1d 100644
--- a/testsuite/reftests/css-match-descendant-later.ui
+++ b/testsuite/reftests/css-match-descendant-later.ui
@@ -14,16 +14,16 @@
                   <placeholder/>
                 </child>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/css-match-exact.ui b/testsuite/reftests/css-match-exact.ui
index 669d50da7a..5ecd712660 100644
--- a/testsuite/reftests/css-match-exact.ui
+++ b/testsuite/reftests/css-match-exact.ui
@@ -11,8 +11,8 @@
             <property name="width_request">10</property>
             <property name="height_request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/grid-empty-with-spacing.ui b/testsuite/reftests/grid-empty-with-spacing.ui
index cd1dd008b4..91bb531d0d 100644
--- a/testsuite/reftests/grid-empty-with-spacing.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ui
@@ -11,8 +11,8 @@
             <property name="visible">0</property>
             <property name="label" translatable="yes">invisible</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/grid-expand.ref.ui b/testsuite/reftests/grid-expand.ref.ui
index c2959be5f4..19f059784a 100644
--- a/testsuite/reftests/grid-expand.ref.ui
+++ b/testsuite/reftests/grid-expand.ref.ui
@@ -14,8 +14,8 @@
               <placeholder/>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -29,8 +29,8 @@
               <placeholder/>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -44,8 +44,8 @@
               <placeholder/>
             </child>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/grid-expand.ui b/testsuite/reftests/grid-expand.ui
index 1267b3a451..0afc2947b6 100644
--- a/testsuite/reftests/grid-expand.ui
+++ b/testsuite/reftests/grid-expand.ui
@@ -18,8 +18,8 @@
                   <placeholder/>
                 </child>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -37,8 +37,8 @@
                   <placeholder/>
                 </child>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -54,8 +54,8 @@
                   <placeholder/>
                 </child>
                 <layout>
-                  <property name="left_attach">2</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">2</property>
+                  <property name="row">2</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
diff --git a/testsuite/reftests/grid-homogeneous.ref.ui b/testsuite/reftests/grid-homogeneous.ref.ui
index 69203a4c0e..47293899f8 100644
--- a/testsuite/reftests/grid-homogeneous.ref.ui
+++ b/testsuite/reftests/grid-homogeneous.ref.ui
@@ -10,8 +10,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -23,8 +23,8 @@
             <property name="width_request">20</property>
             <property name="height_request">20</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -36,8 +36,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -49,8 +49,8 @@
             <property name="width_request">20</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -62,8 +62,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -75,8 +75,8 @@
             <property name="width_request">30</property>
             <property name="height_request">20</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -88,8 +88,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -101,8 +101,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/grid-homogeneous.ui b/testsuite/reftests/grid-homogeneous.ui
index ad4f54c5cf..187d62ef95 100644
--- a/testsuite/reftests/grid-homogeneous.ui
+++ b/testsuite/reftests/grid-homogeneous.ui
@@ -12,8 +12,8 @@
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -25,16 +25,16 @@
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -49,8 +49,8 @@
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -62,16 +62,16 @@
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -86,8 +86,8 @@
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -99,16 +99,16 @@
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -124,8 +124,8 @@
                 <property name="width_request">30</property>
                 <property name="height_request">30</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -137,16 +137,16 @@
                 <property name="width_request">20</property>
                 <property name="height_request">20</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/grid-spacing1.ui b/testsuite/reftests/grid-spacing1.ui
index 225f8151de..e387e4ce26 100644
--- a/testsuite/reftests/grid-spacing1.ui
+++ b/testsuite/reftests/grid-spacing1.ui
@@ -11,7 +11,7 @@
               <object class="GtkLabel" id="one">
                 <property name="label">One</property>
                 <layout>
-                  <property name="left_attach">0</property>
+                  <property name="column">0</property>
                 </layout>
               </object>
             </child>
@@ -19,7 +19,7 @@
               <object class="GtkLabel" id="two">
                 <property name="label">Two</property>
                 <layout>
-                  <property name="left_attach">1</property>
+                  <property name="column">1</property>
                 </layout>
               </object>
             </child>
@@ -27,13 +27,13 @@
               <object class="GtkLabel" id="three">
                 <property name="label">Three</property>
                 <layout>
-                  <property name="left_attach">2</property>
+                  <property name="column">2</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -44,7 +44,7 @@
               <object class="GtkLabel" id="long">
                 <property name="label">Verylongtext</property>
                 <layout>
-                  <property name="left_attach">0</property>
+                  <property name="column">0</property>
                 </layout>
               </object>
             </child>
@@ -52,13 +52,13 @@
               <object class="GtkLabel" id="short">
                 <property name="label">Short</property>
                 <layout>
-                  <property name="left_attach">1</property>
+                  <property name="column">1</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -68,7 +68,7 @@
               <object class="GtkLabel" id="a">
                 <property name="label">A</property>
                 <layout>
-                  <property name="left_attach">0</property>
+                  <property name="column">0</property>
                 </layout>
               </object>
             </child>
@@ -77,7 +77,7 @@
                 <property name="label">B</property>
                 <property name="hexpand">1</property>
                 <layout>
-                  <property name="left_attach">1</property>
+                  <property name="column">1</property>
                 </layout>
               </object>
             </child>
@@ -85,13 +85,13 @@
               <object class="GtkLabel" id="c">
                 <property name="label">C</property>
                 <layout>
-                  <property name="left_attach">2</property>
+                  <property name="column">2</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/grid-spacing2.ui b/testsuite/reftests/grid-spacing2.ui
index fc5c0d8616..c559ddb35d 100644
--- a/testsuite/reftests/grid-spacing2.ui
+++ b/testsuite/reftests/grid-spacing2.ui
@@ -11,8 +11,8 @@
               <object class="GtkLabel" id="one">
                 <property name="label">One</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -20,8 +20,8 @@
               <object class="GtkLabel" id="two">
                 <property name="label">Two</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -29,14 +29,14 @@
               <object class="GtkLabel" id="three">
                 <property name="label">Three</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -47,8 +47,8 @@
               <object class="GtkLabel" id="long">
                 <property name="label">Verylongtext</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -56,14 +56,14 @@
               <object class="GtkLabel" id="short">
                 <property name="label">Short</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -73,8 +73,8 @@
               <object class="GtkLabel" id="a">
                 <property name="label">A</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -83,8 +83,8 @@
                 <property name="label">B</property>
                 <property name="vexpand">1</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -92,14 +92,14 @@
               <object class="GtkLabel" id="c">
                 <property name="label">C</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/grid-spacing3.ref.ui b/testsuite/reftests/grid-spacing3.ref.ui
index 1ea0d32e5e..8668cc1482 100644
--- a/testsuite/reftests/grid-spacing3.ref.ui
+++ b/testsuite/reftests/grid-spacing3.ref.ui
@@ -12,8 +12,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -25,8 +25,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -38,8 +38,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -51,8 +51,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/grid-spacing3.ui b/testsuite/reftests/grid-spacing3.ui
index 1bf76e464d..49ad7e3f3d 100644
--- a/testsuite/reftests/grid-spacing3.ui
+++ b/testsuite/reftests/grid-spacing3.ui
@@ -12,8 +12,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -25,8 +25,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">0</property>
+              <property name="column">10</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -38,8 +38,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">10</property>
+              <property name="column">0</property>
+              <property name="row">10</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -51,8 +51,8 @@
             <property name="width_request">30</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">10</property>
+              <property name="column">10</property>
+              <property name="row">10</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/grid-wfh.ref.ui b/testsuite/reftests/grid-wfh.ref.ui
index bf17b58d55..fe0e0e9af2 100644
--- a/testsuite/reftests/grid-wfh.ref.ui
+++ b/testsuite/reftests/grid-wfh.ref.ui
@@ -8,8 +8,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">GNOME is awesome!</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -19,8 +19,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">GNOME is awesome!</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/grid-wfh.ui b/testsuite/reftests/grid-wfh.ui
index b304aa189a..9490279d78 100644
--- a/testsuite/reftests/grid-wfh.ui
+++ b/testsuite/reftests/grid-wfh.ui
@@ -9,8 +9,8 @@
             <property name="label" translatable="yes">GNOME is awesome!</property>
             <property name="wrap">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -20,8 +20,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">GNOME is awesome!</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/gtk-image-effect-inherit.ui b/testsuite/reftests/gtk-image-effect-inherit.ui
index 37e6fc5c30..a408a5b6ac 100644
--- a/testsuite/reftests/gtk-image-effect-inherit.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ui
@@ -10,8 +10,8 @@
               <object class="GtkImage" id="image1">
                 <property name="icon_name">dialog-error</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -25,8 +25,8 @@
               <object class="GtkImage" id="image2">
                 <property name="icon_name">dialog-error</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -40,8 +40,8 @@
               <object class="GtkImage" id="image3">
                 <property name="icon_name">dialog-error</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
diff --git a/testsuite/reftests/icon-style-basics.ref.ui b/testsuite/reftests/icon-style-basics.ref.ui
index df4846d1f4..55301e93e4 100644
--- a/testsuite/reftests/icon-style-basics.ref.ui
+++ b/testsuite/reftests/icon-style-basics.ref.ui
@@ -19,8 +19,8 @@
           <object class="GtkImage" id="image1">
             <property name="icon_name">edit-delete</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -28,8 +28,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">icon name</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -37,8 +37,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">symbolic icon name</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -46,8 +46,8 @@
           <object class="GtkImage" id="image2">
             <property name="icon_name">edit-delete</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -55,8 +55,8 @@
           <object class="GtkImage" id="image3">
             <property name="icon_name">edit-delete-symbolic</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -64,8 +64,8 @@
           <object class="GtkImage" id="image4">
             <property name="icon_name">edit-delete-symbolic</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -73,8 +73,8 @@
           <object class="GtkImage" id="image5">
             <property name="icon_name">edit-delete</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -82,8 +82,8 @@
           <object class="GtkImage" id="image6">
             <property name="icon_name">edit-delete-symbolic</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -107,8 +107,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -133,8 +133,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -159,8 +159,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -185,8 +185,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -211,8 +211,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -237,8 +237,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -246,8 +246,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">GThemedIcon</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -255,8 +255,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">symbolic GThemedIcon</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -264,8 +264,8 @@
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">GEmeblemedIcon</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -273,8 +273,8 @@
           <object class="GtkLabel" id="label6">
             <property name="label" translatable="yes">symbolic GEmblemedIcon</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -282,8 +282,8 @@
           <object class="GtkImage" id="image7">
             <property name="gicon">themediconsymbolic</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -291,8 +291,8 @@
           <object class="GtkImage" id="image8">
             <property name="gicon">themedicon</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -300,8 +300,8 @@
           <object class="GtkImage" id="image9">
             <property name="gicon">emblemedicon</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -309,8 +309,8 @@
           <object class="GtkImage" id="image10">
             <property name="gicon">emblemediconsymbolic</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -318,8 +318,8 @@
           <object class="GtkImage" id="image11">
             <property name="gicon">themedicon</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -327,8 +327,8 @@
           <object class="GtkImage" id="image12">
             <property name="gicon">themedicon</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -336,8 +336,8 @@
           <object class="GtkImage" id="image13">
             <property name="gicon">emblemedicon</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -345,8 +345,8 @@
           <object class="GtkImage" id="image14">
             <property name="gicon">emblemedicon</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -354,8 +354,8 @@
           <object class="GtkImage" id="image15">
             <property name="gicon">themediconsymbolic</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -363,8 +363,8 @@
           <object class="GtkImage" id="image16">
             <property name="gicon">themediconsymbolic</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -372,8 +372,8 @@
           <object class="GtkImage" id="image17">
             <property name="gicon">emblemediconsymbolic</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -381,8 +381,8 @@
           <object class="GtkImage" id="image18">
             <property name="gicon">emblemediconsymbolic</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">5</property>
+              <property name="column">3</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -407,8 +407,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -433,8 +433,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -459,8 +459,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -485,8 +485,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">5</property>
+              <property name="column">4</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -511,8 +511,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -537,8 +537,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -563,8 +563,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">4</property>
+              <property name="column">5</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -589,8 +589,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">5</property>
+              <property name="column">5</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -615,8 +615,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -641,8 +641,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -667,8 +667,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">4</property>
+              <property name="column">6</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -693,8 +693,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">5</property>
+              <property name="column">6</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/icon-style-basics.ui b/testsuite/reftests/icon-style-basics.ui
index 246099bced..0b79f497c9 100644
--- a/testsuite/reftests/icon-style-basics.ui
+++ b/testsuite/reftests/icon-style-basics.ui
@@ -19,8 +19,8 @@
           <object class="GtkImage" id="image1">
             <property name="icon_name">edit-delete</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -28,8 +28,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">icon name</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -37,8 +37,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">symbolic icon name</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -49,8 +49,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -61,8 +61,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -70,8 +70,8 @@
           <object class="GtkImage" id="image4">
             <property name="icon_name">edit-delete-symbolic</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -82,8 +82,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -94,8 +94,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -119,8 +119,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -148,8 +148,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -177,8 +177,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -203,8 +203,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -232,8 +232,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -261,8 +261,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -270,8 +270,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">GThemedIcon</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -279,8 +279,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">symbolic GThemedIcon</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -288,8 +288,8 @@
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">GEmeblemedIcon</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -297,8 +297,8 @@
           <object class="GtkLabel" id="label6">
             <property name="label" translatable="yes">symbolic GEmblemedIcon</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -306,8 +306,8 @@
           <object class="GtkImage" id="image7">
             <property name="gicon">themediconsymbolic</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -315,8 +315,8 @@
           <object class="GtkImage" id="image8">
             <property name="gicon">themedicon</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -324,8 +324,8 @@
           <object class="GtkImage" id="image9">
             <property name="gicon">emblemedicon</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -333,8 +333,8 @@
           <object class="GtkImage" id="image10">
             <property name="gicon">emblemediconsymbolic</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -345,8 +345,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -357,8 +357,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -369,8 +369,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -381,8 +381,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -393,8 +393,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -405,8 +405,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -417,8 +417,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -429,8 +429,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">5</property>
+              <property name="column">3</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -455,8 +455,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -481,8 +481,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -507,8 +507,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -533,8 +533,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">5</property>
+              <property name="column">4</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -562,8 +562,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -591,8 +591,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -620,8 +620,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">4</property>
+              <property name="column">5</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -649,8 +649,8 @@
               <class name="regular"/>
             </style>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">5</property>
+              <property name="column">5</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -678,8 +678,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -707,8 +707,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -736,8 +736,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">4</property>
+              <property name="column">6</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -765,8 +765,8 @@
               <class name="symbolic"/>
             </style>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">5</property>
+              <property name="column">6</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/icon-vfuncs.ref.ui b/testsuite/reftests/icon-vfuncs.ref.ui
index d0103a01b3..387fd028da 100644
--- a/testsuite/reftests/icon-vfuncs.ref.ui
+++ b/testsuite/reftests/icon-vfuncs.ref.ui
@@ -8,8 +8,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">Spinner</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -17,8 +17,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">Check</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -26,8 +26,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">Option</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -35,8 +35,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">Arrow</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -44,8 +44,8 @@
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">Expander</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -56,8 +56,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -68,8 +68,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -80,8 +80,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -92,8 +92,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -104,8 +104,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/icon-vfuncs.ui b/testsuite/reftests/icon-vfuncs.ui
index c959577d86..5b46b0fd14 100644
--- a/testsuite/reftests/icon-vfuncs.ui
+++ b/testsuite/reftests/icon-vfuncs.ui
@@ -8,8 +8,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">Spinner</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -18,8 +18,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -27,8 +27,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">Check</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -36,8 +36,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">Option</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -45,8 +45,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">Arrow</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -54,8 +54,8 @@
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">Expander</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -64,8 +64,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -75,8 +75,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -86,8 +86,8 @@
             <property name="halign">center</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -102,8 +102,8 @@
               <placeholder/>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/iconview-empty.ref.ui b/testsuite/reftests/iconview-empty.ref.ui
index f497bd026e..4588838944 100644
--- a/testsuite/reftests/iconview-empty.ref.ui
+++ b/testsuite/reftests/iconview-empty.ref.ui
@@ -13,8 +13,8 @@
             <property name="width-request">0</property>
             <property name="height-request">0</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -27,8 +27,8 @@
             <property name="width-request">0</property>
             <property name="height-request">0</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -41,8 +41,8 @@
             <property name="width-request">0</property>
             <property name="height-request">0</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -55,8 +55,8 @@
             <property name="width-request">0</property>
             <property name="height-request">0</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -69,8 +69,8 @@
             <property name="width-request">0</property>
             <property name="height-request">0</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -83,8 +83,8 @@
             <property name="width-request">0</property>
             <property name="height-request">0</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -97,8 +97,8 @@
             <property name="width-request">0</property>
             <property name="height-request">0</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -111,8 +111,8 @@
             <property name="width-request">0</property>
             <property name="height-request">0</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -125,8 +125,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -139,8 +139,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -153,8 +153,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -167,8 +167,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -181,8 +181,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -195,8 +195,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -209,8 +209,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -223,8 +223,8 @@
             <property name="width-request">10</property>
             <property name="height-request">10</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/iconview-empty.ui b/testsuite/reftests/iconview-empty.ui
index e1c656ca8d..cb7173f614 100644
--- a/testsuite/reftests/iconview-empty.ui
+++ b/testsuite/reftests/iconview-empty.ui
@@ -15,8 +15,8 @@
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -31,8 +31,8 @@
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -48,8 +48,8 @@
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -65,8 +65,8 @@
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -81,8 +81,8 @@
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -97,8 +97,8 @@
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -114,8 +114,8 @@
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -131,8 +131,8 @@
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -147,8 +147,8 @@
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -163,8 +163,8 @@
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -180,8 +180,8 @@
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -197,8 +197,8 @@
             <property name="row-spacing">0</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -213,8 +213,8 @@
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -229,8 +229,8 @@
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -246,8 +246,8 @@
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -263,8 +263,8 @@
             <property name="row-spacing">5</property>
             <property name="valign">center</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/label-sizing.ref.ui b/testsuite/reftests/label-sizing.ref.ui
index 9b860df9c0..1616ef4f2f 100644
--- a/testsuite/reftests/label-sizing.ref.ui
+++ b/testsuite/reftests/label-sizing.ref.ui
@@ -12,8 +12,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">wrap</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -21,8 +21,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">ellipsize</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -30,8 +30,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">width-chars</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -39,8 +39,8 @@
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">max-width-chars</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -48,8 +48,8 @@
           <object class="GtkLabel" id="label6">
             <property name="label" translatable="yes">results</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -57,8 +57,8 @@
           <object class="GtkLabel" id="wrap1">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -66,8 +66,8 @@
           <object class="GtkLabel" id="ellipsize1">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -75,8 +75,8 @@
           <object class="GtkLabel" id="width_chars1">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -84,8 +84,8 @@
           <object class="GtkLabel" id="max_width_chars1">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -155,8 +155,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -164,8 +164,8 @@
           <object class="GtkLabel" id="wrap2">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -173,8 +173,8 @@
           <object class="GtkLabel" id="ellipsize2">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -182,8 +182,8 @@
           <object class="GtkLabel" id="width_chars2">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -191,8 +191,8 @@
           <object class="GtkLabel" id="max_width_chars2">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -264,8 +264,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -273,8 +273,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap3">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -282,8 +282,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize3">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -291,8 +291,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars3">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -300,8 +300,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars3">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -371,8 +371,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -380,8 +380,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap4">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -389,8 +389,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize4">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -398,8 +398,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars4">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -407,8 +407,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars4">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -478,8 +478,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -487,8 +487,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap5">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -496,8 +496,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize5">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -505,8 +505,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars5">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -514,8 +514,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars5">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">5</property>
+              <property name="column">3</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -589,8 +589,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">5</property>
+              <property name="column">4</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -598,8 +598,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap6">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -607,8 +607,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize6">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -616,8 +616,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars6">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">6</property>
+              <property name="column">2</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -625,8 +625,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars6">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">6</property>
+              <property name="column">3</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -702,8 +702,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">6</property>
+              <property name="column">4</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -711,8 +711,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap7">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">7</property>
+              <property name="column">0</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -720,8 +720,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize7">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -729,8 +729,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars7">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">7</property>
+              <property name="column">2</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -738,8 +738,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars7">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">7</property>
+              <property name="column">3</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -813,8 +813,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">7</property>
+              <property name="column">4</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -822,8 +822,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap8">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">8</property>
+              <property name="column">0</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -831,8 +831,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize8">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">8</property>
+              <property name="column">1</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -840,8 +840,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars8">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -849,8 +849,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars8">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">8</property>
+              <property name="column">3</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -924,8 +924,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">8</property>
+              <property name="column">4</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -933,8 +933,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap9">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">9</property>
+              <property name="column">0</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -942,8 +942,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize9">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">9</property>
+              <property name="column">1</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -951,8 +951,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars9">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">9</property>
+              <property name="column">2</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -960,8 +960,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars9">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">9</property>
+              <property name="column">3</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -1035,8 +1035,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">9</property>
+              <property name="column">4</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -1044,8 +1044,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap10">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">10</property>
+              <property name="column">0</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1053,8 +1053,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize10">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">10</property>
+              <property name="column">1</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1062,8 +1062,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars10">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">10</property>
+              <property name="column">2</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1071,8 +1071,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars10">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">10</property>
+              <property name="column">3</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1148,8 +1148,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">10</property>
+              <property name="column">4</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1157,8 +1157,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap11">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">11</property>
+              <property name="column">0</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1166,8 +1166,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize11">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">11</property>
+              <property name="column">1</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1175,8 +1175,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars11">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">11</property>
+              <property name="column">2</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1184,8 +1184,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars11">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">11</property>
+              <property name="column">3</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1259,8 +1259,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">11</property>
+              <property name="column">4</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1268,8 +1268,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap12">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">12</property>
+              <property name="column">0</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1277,8 +1277,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize12">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">12</property>
+              <property name="column">1</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1286,8 +1286,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars12">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">12</property>
+              <property name="column">2</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1295,8 +1295,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars12">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">12</property>
+              <property name="column">3</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1370,8 +1370,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">12</property>
+              <property name="column">4</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1379,8 +1379,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap13">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">13</property>
+              <property name="column">0</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1388,8 +1388,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize13">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">13</property>
+              <property name="column">1</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1397,8 +1397,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars13">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">13</property>
+              <property name="column">2</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1406,8 +1406,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars13">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">13</property>
+              <property name="column">3</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1481,8 +1481,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">13</property>
+              <property name="column">4</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1490,8 +1490,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap14">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">14</property>
+              <property name="column">0</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1499,8 +1499,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize14">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">14</property>
+              <property name="column">1</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1508,8 +1508,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars14">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">14</property>
+              <property name="column">2</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1517,8 +1517,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars14">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">14</property>
+              <property name="column">3</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1592,8 +1592,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">14</property>
+              <property name="column">4</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1601,8 +1601,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap15">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">15</property>
+              <property name="column">0</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1610,8 +1610,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize15">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">15</property>
+              <property name="column">1</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1619,8 +1619,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars15">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">15</property>
+              <property name="column">2</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1628,8 +1628,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars15">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">15</property>
+              <property name="column">3</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1703,8 +1703,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">15</property>
+              <property name="column">4</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1712,8 +1712,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap16">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">16</property>
+              <property name="column">0</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1721,8 +1721,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize16">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">16</property>
+              <property name="column">1</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1730,8 +1730,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars16">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">16</property>
+              <property name="column">2</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1739,8 +1739,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars16">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">16</property>
+              <property name="column">3</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1814,8 +1814,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">16</property>
+              <property name="column">4</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1823,8 +1823,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap17">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">17</property>
+              <property name="column">0</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1832,8 +1832,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize17">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">17</property>
+              <property name="column">1</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1841,8 +1841,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars17">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">17</property>
+              <property name="column">2</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1850,8 +1850,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars17">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">17</property>
+              <property name="column">3</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1925,8 +1925,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">17</property>
+              <property name="column">4</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1934,8 +1934,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap18">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">18</property>
+              <property name="column">0</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -1943,8 +1943,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize18">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">18</property>
+              <property name="column">1</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -1952,8 +1952,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars18">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">18</property>
+              <property name="column">2</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -1961,8 +1961,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars18">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">18</property>
+              <property name="column">3</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -2040,8 +2040,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">18</property>
+              <property name="column">4</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -2049,8 +2049,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap19">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">19</property>
+              <property name="column">0</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2058,8 +2058,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize19">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">19</property>
+              <property name="column">1</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2067,8 +2067,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars19">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">19</property>
+              <property name="column">2</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2076,8 +2076,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars19">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">19</property>
+              <property name="column">3</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2151,8 +2151,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">19</property>
+              <property name="column">4</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2160,8 +2160,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap20">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">20</property>
+              <property name="column">0</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2169,8 +2169,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize20">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">20</property>
+              <property name="column">1</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2178,8 +2178,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars20">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">20</property>
+              <property name="column">2</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2187,8 +2187,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars20">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">20</property>
+              <property name="column">3</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2262,8 +2262,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">20</property>
+              <property name="column">4</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2271,8 +2271,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap21">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">21</property>
+              <property name="column">0</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2280,8 +2280,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize21">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">21</property>
+              <property name="column">1</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2289,8 +2289,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars21">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">21</property>
+              <property name="column">2</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2298,8 +2298,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars21">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">21</property>
+              <property name="column">3</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2377,8 +2377,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">21</property>
+              <property name="column">4</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2386,8 +2386,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap22">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">22</property>
+              <property name="column">0</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2395,8 +2395,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize22">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">22</property>
+              <property name="column">1</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2404,8 +2404,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars22">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">22</property>
+              <property name="column">2</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2413,8 +2413,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars22">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">22</property>
+              <property name="column">3</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2496,8 +2496,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">22</property>
+              <property name="column">4</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2505,8 +2505,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap23">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">23</property>
+              <property name="column">0</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2514,8 +2514,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize23">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">23</property>
+              <property name="column">1</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2523,8 +2523,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars23">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">23</property>
+              <property name="column">2</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2532,8 +2532,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars23">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">23</property>
+              <property name="column">3</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2611,8 +2611,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">23</property>
+              <property name="column">4</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2620,8 +2620,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap24">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">24</property>
+              <property name="column">0</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2629,8 +2629,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize24">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">24</property>
+              <property name="column">1</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2638,8 +2638,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars24">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">24</property>
+              <property name="column">2</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2647,8 +2647,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars24">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">24</property>
+              <property name="column">3</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2726,8 +2726,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">24</property>
+              <property name="column">4</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2735,8 +2735,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap25">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">25</property>
+              <property name="column">0</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2744,8 +2744,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize25">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">25</property>
+              <property name="column">1</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2753,8 +2753,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars25">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">25</property>
+              <property name="column">2</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2762,8 +2762,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars25">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">25</property>
+              <property name="column">3</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2841,8 +2841,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">25</property>
+              <property name="column">4</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2850,8 +2850,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap26">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">26</property>
+              <property name="column">0</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -2859,8 +2859,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize26">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">26</property>
+              <property name="column">1</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -2868,8 +2868,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars26">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">26</property>
+              <property name="column">2</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -2877,8 +2877,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars26">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">26</property>
+              <property name="column">3</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -2960,8 +2960,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">26</property>
+              <property name="column">4</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -2969,8 +2969,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap27">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">27</property>
+              <property name="column">0</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -2978,8 +2978,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize27">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">27</property>
+              <property name="column">1</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -2987,8 +2987,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars27">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">27</property>
+              <property name="column">2</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -2996,8 +2996,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars27">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">27</property>
+              <property name="column">3</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -3075,8 +3075,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">27</property>
+              <property name="column">4</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -3084,8 +3084,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap28">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">28</property>
+              <property name="column">0</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3093,8 +3093,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize28">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">28</property>
+              <property name="column">1</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3102,8 +3102,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars28">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">28</property>
+              <property name="column">2</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3111,8 +3111,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars28">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">28</property>
+              <property name="column">3</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3190,8 +3190,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">28</property>
+              <property name="column">4</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3199,8 +3199,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap29">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">29</property>
+              <property name="column">0</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3208,8 +3208,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize29">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">29</property>
+              <property name="column">1</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3217,8 +3217,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars29">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">29</property>
+              <property name="column">2</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3226,8 +3226,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars29">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">29</property>
+              <property name="column">3</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3305,8 +3305,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">29</property>
+              <property name="column">4</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3314,8 +3314,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap30">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">30</property>
+              <property name="column">0</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3323,8 +3323,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize30">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">30</property>
+              <property name="column">1</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3332,8 +3332,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars30">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">30</property>
+              <property name="column">2</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3341,8 +3341,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars30">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">30</property>
+              <property name="column">3</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3420,8 +3420,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">30</property>
+              <property name="column">4</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3429,8 +3429,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap31">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">31</property>
+              <property name="column">0</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3438,8 +3438,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize31">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">31</property>
+              <property name="column">1</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3447,8 +3447,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars31">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">31</property>
+              <property name="column">2</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3456,8 +3456,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars31">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">31</property>
+              <property name="column">3</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3535,8 +3535,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">31</property>
+              <property name="column">4</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3544,8 +3544,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap32">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">32</property>
+              <property name="column">0</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3553,8 +3553,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize32">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">32</property>
+              <property name="column">1</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3562,8 +3562,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars32">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">32</property>
+              <property name="column">2</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3571,8 +3571,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars32">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">32</property>
+              <property name="column">3</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3650,8 +3650,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">32</property>
+              <property name="column">4</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3659,8 +3659,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap33">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">33</property>
+              <property name="column">0</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3668,8 +3668,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize33">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">33</property>
+              <property name="column">1</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3677,8 +3677,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars33">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">33</property>
+              <property name="column">2</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3686,8 +3686,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars33">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">33</property>
+              <property name="column">3</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3761,8 +3761,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">33</property>
+              <property name="column">4</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3770,8 +3770,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap34">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">34</property>
+              <property name="column">0</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3779,8 +3779,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize34">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">34</property>
+              <property name="column">1</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3788,8 +3788,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars34">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">34</property>
+              <property name="column">2</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3797,8 +3797,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars34">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">34</property>
+              <property name="column">3</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3876,8 +3876,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">34</property>
+              <property name="column">4</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3885,8 +3885,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap35">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">35</property>
+              <property name="column">0</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -3894,8 +3894,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize35">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">35</property>
+              <property name="column">1</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -3903,8 +3903,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars35">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">35</property>
+              <property name="column">2</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -3912,8 +3912,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars35">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">35</property>
+              <property name="column">3</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -3987,8 +3987,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">35</property>
+              <property name="column">4</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -3996,8 +3996,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap36">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">36</property>
+              <property name="column">0</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4005,8 +4005,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize36">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">36</property>
+              <property name="column">1</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4014,8 +4014,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars36">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">36</property>
+              <property name="column">2</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4023,8 +4023,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars36">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">36</property>
+              <property name="column">3</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4098,8 +4098,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">36</property>
+              <property name="column">4</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4107,8 +4107,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap37">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">37</property>
+              <property name="column">0</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4116,8 +4116,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize37">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">37</property>
+              <property name="column">1</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4125,8 +4125,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars37">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">37</property>
+              <property name="column">2</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4134,8 +4134,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars37">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">37</property>
+              <property name="column">3</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4213,8 +4213,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">37</property>
+              <property name="column">4</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4222,8 +4222,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap38">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">38</property>
+              <property name="column">0</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4231,8 +4231,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize38">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">38</property>
+              <property name="column">1</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4240,8 +4240,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars38">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">38</property>
+              <property name="column">2</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4249,8 +4249,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars38">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">38</property>
+              <property name="column">3</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4332,8 +4332,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">38</property>
+              <property name="column">4</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4341,8 +4341,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap39">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">39</property>
+              <property name="column">0</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4350,8 +4350,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize39">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">39</property>
+              <property name="column">1</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4359,8 +4359,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars39">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">39</property>
+              <property name="column">2</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4368,8 +4368,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars39">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">39</property>
+              <property name="column">3</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4447,8 +4447,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">39</property>
+              <property name="column">4</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4456,8 +4456,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap40">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">40</property>
+              <property name="column">0</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4465,8 +4465,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize40">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">40</property>
+              <property name="column">1</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4474,8 +4474,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars40">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">40</property>
+              <property name="column">2</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4483,8 +4483,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars40">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">40</property>
+              <property name="column">3</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4562,8 +4562,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">40</property>
+              <property name="column">4</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4571,8 +4571,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap41">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">41</property>
+              <property name="column">0</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4580,8 +4580,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize41">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">41</property>
+              <property name="column">1</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4589,8 +4589,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars41">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">41</property>
+              <property name="column">2</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4598,8 +4598,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars41">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">41</property>
+              <property name="column">3</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4677,8 +4677,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">41</property>
+              <property name="column">4</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4686,8 +4686,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap42">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">42</property>
+              <property name="column">0</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4695,8 +4695,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize42">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">42</property>
+              <property name="column">1</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4704,8 +4704,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars42">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">42</property>
+              <property name="column">2</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4713,8 +4713,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars42">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">42</property>
+              <property name="column">3</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4796,8 +4796,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">42</property>
+              <property name="column">4</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4805,8 +4805,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap43">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">43</property>
+              <property name="column">0</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -4814,8 +4814,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize43">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">43</property>
+              <property name="column">1</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -4823,8 +4823,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars43">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">43</property>
+              <property name="column">2</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -4832,8 +4832,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars43">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">43</property>
+              <property name="column">3</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -4911,8 +4911,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">43</property>
+              <property name="column">4</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -4920,8 +4920,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap44">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">44</property>
+              <property name="column">0</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -4929,8 +4929,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize44">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">44</property>
+              <property name="column">1</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -4938,8 +4938,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars44">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">44</property>
+              <property name="column">2</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -4947,8 +4947,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars44">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">44</property>
+              <property name="column">3</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -5026,8 +5026,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">44</property>
+              <property name="column">4</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -5035,8 +5035,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap45">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">45</property>
+              <property name="column">0</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5044,8 +5044,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize45">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">45</property>
+              <property name="column">1</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5053,8 +5053,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars45">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">45</property>
+              <property name="column">2</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5062,8 +5062,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars45">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">45</property>
+              <property name="column">3</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5141,8 +5141,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">45</property>
+              <property name="column">4</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5150,8 +5150,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap46">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">46</property>
+              <property name="column">0</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5159,8 +5159,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize46">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">46</property>
+              <property name="column">1</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5168,8 +5168,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars46">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">46</property>
+              <property name="column">2</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5177,8 +5177,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars46">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">46</property>
+              <property name="column">3</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5256,8 +5256,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">46</property>
+              <property name="column">4</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5265,8 +5265,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap47">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">47</property>
+              <property name="column">0</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5274,8 +5274,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize47">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">47</property>
+              <property name="column">1</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5283,8 +5283,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars47">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">47</property>
+              <property name="column">2</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5292,8 +5292,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars47">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">47</property>
+              <property name="column">3</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5371,8 +5371,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">47</property>
+              <property name="column">4</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5380,8 +5380,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap48">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">48</property>
+              <property name="column">0</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5389,8 +5389,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize48">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">48</property>
+              <property name="column">1</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5398,8 +5398,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars48">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">48</property>
+              <property name="column">2</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5407,8 +5407,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars48">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">48</property>
+              <property name="column">3</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5486,8 +5486,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">48</property>
+              <property name="column">4</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5495,8 +5495,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap49">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">49</property>
+              <property name="column">0</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5504,8 +5504,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize49">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">49</property>
+              <property name="column">1</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5513,8 +5513,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars49">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">49</property>
+              <property name="column">2</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5522,8 +5522,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars49">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">49</property>
+              <property name="column">3</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5597,8 +5597,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">49</property>
+              <property name="column">4</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5606,8 +5606,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap50">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">50</property>
+              <property name="column">0</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5615,8 +5615,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize50">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">50</property>
+              <property name="column">1</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5624,8 +5624,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars50">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">50</property>
+              <property name="column">2</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5633,8 +5633,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars50">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">50</property>
+              <property name="column">3</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5710,8 +5710,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">50</property>
+              <property name="column">4</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5719,8 +5719,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap51">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">51</property>
+              <property name="column">0</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5728,8 +5728,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize51">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">51</property>
+              <property name="column">1</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5737,8 +5737,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars51">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">51</property>
+              <property name="column">2</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5746,8 +5746,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars51">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">51</property>
+              <property name="column">3</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5821,8 +5821,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">51</property>
+              <property name="column">4</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5830,8 +5830,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap52">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">52</property>
+              <property name="column">0</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -5839,8 +5839,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize52">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">52</property>
+              <property name="column">1</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -5848,8 +5848,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars52">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">52</property>
+              <property name="column">2</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -5857,8 +5857,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars52">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">52</property>
+              <property name="column">3</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -5932,8 +5932,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">52</property>
+              <property name="column">4</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -5941,8 +5941,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap53">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">53</property>
+              <property name="column">0</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -5950,8 +5950,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize53">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">53</property>
+              <property name="column">1</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -5959,8 +5959,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars53">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">53</property>
+              <property name="column">2</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -5968,8 +5968,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars53">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">53</property>
+              <property name="column">3</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -6047,8 +6047,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">53</property>
+              <property name="column">4</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -6056,8 +6056,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap54">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">54</property>
+              <property name="column">0</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6065,8 +6065,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize54">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">54</property>
+              <property name="column">1</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6074,8 +6074,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars54">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">54</property>
+              <property name="column">2</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6083,8 +6083,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars54">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">54</property>
+              <property name="column">3</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6164,8 +6164,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">54</property>
+              <property name="column">4</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6173,8 +6173,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap55">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">55</property>
+              <property name="column">0</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6182,8 +6182,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize55">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">55</property>
+              <property name="column">1</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6191,8 +6191,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars55">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">55</property>
+              <property name="column">2</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6200,8 +6200,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars55">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">55</property>
+              <property name="column">3</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6279,8 +6279,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">55</property>
+              <property name="column">4</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6288,8 +6288,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap56">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">56</property>
+              <property name="column">0</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6297,8 +6297,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize56">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">56</property>
+              <property name="column">1</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6306,8 +6306,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars56">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">56</property>
+              <property name="column">2</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6315,8 +6315,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars56">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">56</property>
+              <property name="column">3</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6394,8 +6394,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">56</property>
+              <property name="column">4</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6403,8 +6403,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap57">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">57</property>
+              <property name="column">0</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6412,8 +6412,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize57">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">57</property>
+              <property name="column">1</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6421,8 +6421,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars57">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">57</property>
+              <property name="column">2</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6430,8 +6430,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars57">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">57</property>
+              <property name="column">3</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6509,8 +6509,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">57</property>
+              <property name="column">4</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6518,8 +6518,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap58">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">58</property>
+              <property name="column">0</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6527,8 +6527,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize58">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">58</property>
+              <property name="column">1</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6536,8 +6536,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars58">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">58</property>
+              <property name="column">2</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6545,8 +6545,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars58">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">58</property>
+              <property name="column">3</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6626,8 +6626,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">58</property>
+              <property name="column">4</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6635,8 +6635,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap59">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">59</property>
+              <property name="column">0</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6644,8 +6644,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize59">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">59</property>
+              <property name="column">1</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6653,8 +6653,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars59">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">59</property>
+              <property name="column">2</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6662,8 +6662,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars59">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">59</property>
+              <property name="column">3</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6741,8 +6741,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">59</property>
+              <property name="column">4</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6750,8 +6750,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap60">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">60</property>
+              <property name="column">0</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -6759,8 +6759,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize60">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">60</property>
+              <property name="column">1</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -6768,8 +6768,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars60">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">60</property>
+              <property name="column">2</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -6777,8 +6777,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars60">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">60</property>
+              <property name="column">3</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -6856,8 +6856,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">60</property>
+              <property name="column">4</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -6865,8 +6865,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap61">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">61</property>
+              <property name="column">0</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -6874,8 +6874,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize61">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">61</property>
+              <property name="column">1</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -6883,8 +6883,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars61">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">61</property>
+              <property name="column">2</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -6892,8 +6892,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars61">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">61</property>
+              <property name="column">3</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -6971,8 +6971,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">61</property>
+              <property name="column">4</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -6980,8 +6980,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap62">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">62</property>
+              <property name="column">0</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -6989,8 +6989,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize62">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">62</property>
+              <property name="column">1</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -6998,8 +6998,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars62">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">62</property>
+              <property name="column">2</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -7007,8 +7007,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars62">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">62</property>
+              <property name="column">3</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -7086,8 +7086,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">62</property>
+              <property name="column">4</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -7095,8 +7095,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap63">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">63</property>
+              <property name="column">0</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7104,8 +7104,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize63">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">63</property>
+              <property name="column">1</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7113,8 +7113,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars63">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">63</property>
+              <property name="column">2</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7122,8 +7122,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars63">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">63</property>
+              <property name="column">3</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7201,8 +7201,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">63</property>
+              <property name="column">4</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7210,8 +7210,8 @@ ABCD</property>
           <object class="GtkLabel" id="wrap64">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">64</property>
+              <property name="column">0</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
@@ -7219,8 +7219,8 @@ ABCD</property>
           <object class="GtkLabel" id="ellipsize64">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">64</property>
+              <property name="column">1</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
@@ -7228,8 +7228,8 @@ ABCD</property>
           <object class="GtkLabel" id="width_chars64">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">64</property>
+              <property name="column">2</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
@@ -7237,8 +7237,8 @@ ABCD</property>
           <object class="GtkLabel" id="max_width_chars64">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">64</property>
+              <property name="column">3</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
@@ -7316,8 +7316,8 @@ ABCD</property>
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">64</property>
+              <property name="column">4</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/label-sizing.ui b/testsuite/reftests/label-sizing.ui
index ca5f21b548..ad3309b997 100644
--- a/testsuite/reftests/label-sizing.ui
+++ b/testsuite/reftests/label-sizing.ui
@@ -12,8 +12,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">wrap</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -21,8 +21,8 @@
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes">ellipsize</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -30,8 +30,8 @@
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes">width-chars</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -39,8 +39,8 @@
           <object class="GtkLabel" id="label5">
             <property name="label" translatable="yes">max-width-chars</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -48,8 +48,8 @@
           <object class="GtkLabel" id="label6">
             <property name="label" translatable="yes">results</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -57,8 +57,8 @@
           <object class="GtkLabel" id="wrap1">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -66,8 +66,8 @@
           <object class="GtkLabel" id="ellipsize1">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -75,8 +75,8 @@
           <object class="GtkLabel" id="width_chars1">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -84,8 +84,8 @@
           <object class="GtkLabel" id="max_width_chars1">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -155,8 +155,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -164,8 +164,8 @@
           <object class="GtkLabel" id="wrap2">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -173,8 +173,8 @@
           <object class="GtkLabel" id="ellipsize2">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -182,8 +182,8 @@
           <object class="GtkLabel" id="width_chars2">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -191,8 +191,8 @@
           <object class="GtkLabel" id="max_width_chars2">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -266,8 +266,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -275,8 +275,8 @@
           <object class="GtkLabel" id="wrap3">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -284,8 +284,8 @@
           <object class="GtkLabel" id="ellipsize3">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -293,8 +293,8 @@
           <object class="GtkLabel" id="width_chars3">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -302,8 +302,8 @@
           <object class="GtkLabel" id="max_width_chars3">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -377,8 +377,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -386,8 +386,8 @@
           <object class="GtkLabel" id="wrap4">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -395,8 +395,8 @@
           <object class="GtkLabel" id="ellipsize4">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -404,8 +404,8 @@
           <object class="GtkLabel" id="width_chars4">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -413,8 +413,8 @@
           <object class="GtkLabel" id="max_width_chars4">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -492,8 +492,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -501,8 +501,8 @@
           <object class="GtkLabel" id="wrap5">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -510,8 +510,8 @@
           <object class="GtkLabel" id="ellipsize5">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -519,8 +519,8 @@
           <object class="GtkLabel" id="width_chars5">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -528,8 +528,8 @@
           <object class="GtkLabel" id="max_width_chars5">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">5</property>
+              <property name="column">3</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -603,8 +603,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">5</property>
+              <property name="column">4</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -612,8 +612,8 @@
           <object class="GtkLabel" id="wrap6">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -621,8 +621,8 @@
           <object class="GtkLabel" id="ellipsize6">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -630,8 +630,8 @@
           <object class="GtkLabel" id="width_chars6">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">6</property>
+              <property name="column">2</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -639,8 +639,8 @@
           <object class="GtkLabel" id="max_width_chars6">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">6</property>
+              <property name="column">3</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -718,8 +718,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">6</property>
+              <property name="column">4</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -727,8 +727,8 @@
           <object class="GtkLabel" id="wrap7">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">7</property>
+              <property name="column">0</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -736,8 +736,8 @@
           <object class="GtkLabel" id="ellipsize7">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -745,8 +745,8 @@
           <object class="GtkLabel" id="width_chars7">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">7</property>
+              <property name="column">2</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -754,8 +754,8 @@
           <object class="GtkLabel" id="max_width_chars7">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">7</property>
+              <property name="column">3</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -833,8 +833,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">7</property>
+              <property name="column">4</property>
+              <property name="row">7</property>
             </layout>
           </object>
         </child>
@@ -842,8 +842,8 @@
           <object class="GtkLabel" id="wrap8">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">8</property>
+              <property name="column">0</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -851,8 +851,8 @@
           <object class="GtkLabel" id="ellipsize8">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">8</property>
+              <property name="column">1</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -860,8 +860,8 @@
           <object class="GtkLabel" id="width_chars8">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -869,8 +869,8 @@
           <object class="GtkLabel" id="max_width_chars8">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">8</property>
+              <property name="column">3</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -952,8 +952,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">8</property>
+              <property name="column">4</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>
@@ -961,8 +961,8 @@
           <object class="GtkLabel" id="wrap9">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">9</property>
+              <property name="column">0</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -970,8 +970,8 @@
           <object class="GtkLabel" id="ellipsize9">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">9</property>
+              <property name="column">1</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -979,8 +979,8 @@
           <object class="GtkLabel" id="width_chars9">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">9</property>
+              <property name="column">2</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -988,8 +988,8 @@
           <object class="GtkLabel" id="max_width_chars9">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">9</property>
+              <property name="column">3</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -1063,8 +1063,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">9</property>
+              <property name="column">4</property>
+              <property name="row">9</property>
             </layout>
           </object>
         </child>
@@ -1072,8 +1072,8 @@
           <object class="GtkLabel" id="wrap10">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">10</property>
+              <property name="column">0</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1081,8 +1081,8 @@
           <object class="GtkLabel" id="ellipsize10">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">10</property>
+              <property name="column">1</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1090,8 +1090,8 @@
           <object class="GtkLabel" id="width_chars10">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">10</property>
+              <property name="column">2</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1099,8 +1099,8 @@
           <object class="GtkLabel" id="max_width_chars10">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">10</property>
+              <property name="column">3</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1178,8 +1178,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">10</property>
+              <property name="column">4</property>
+              <property name="row">10</property>
             </layout>
           </object>
         </child>
@@ -1187,8 +1187,8 @@
           <object class="GtkLabel" id="wrap11">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">11</property>
+              <property name="column">0</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1196,8 +1196,8 @@
           <object class="GtkLabel" id="ellipsize11">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">11</property>
+              <property name="column">1</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1205,8 +1205,8 @@
           <object class="GtkLabel" id="width_chars11">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">11</property>
+              <property name="column">2</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1214,8 +1214,8 @@
           <object class="GtkLabel" id="max_width_chars11">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">11</property>
+              <property name="column">3</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1293,8 +1293,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">11</property>
+              <property name="column">4</property>
+              <property name="row">11</property>
             </layout>
           </object>
         </child>
@@ -1302,8 +1302,8 @@
           <object class="GtkLabel" id="wrap12">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">12</property>
+              <property name="column">0</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1311,8 +1311,8 @@
           <object class="GtkLabel" id="ellipsize12">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">12</property>
+              <property name="column">1</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1320,8 +1320,8 @@
           <object class="GtkLabel" id="width_chars12">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">12</property>
+              <property name="column">2</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1329,8 +1329,8 @@
           <object class="GtkLabel" id="max_width_chars12">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">12</property>
+              <property name="column">3</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1412,8 +1412,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">12</property>
+              <property name="column">4</property>
+              <property name="row">12</property>
             </layout>
           </object>
         </child>
@@ -1421,8 +1421,8 @@
           <object class="GtkLabel" id="wrap13">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">13</property>
+              <property name="column">0</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1430,8 +1430,8 @@
           <object class="GtkLabel" id="ellipsize13">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">13</property>
+              <property name="column">1</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1439,8 +1439,8 @@
           <object class="GtkLabel" id="width_chars13">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">13</property>
+              <property name="column">2</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1448,8 +1448,8 @@
           <object class="GtkLabel" id="max_width_chars13">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">13</property>
+              <property name="column">3</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1523,8 +1523,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">13</property>
+              <property name="column">4</property>
+              <property name="row">13</property>
             </layout>
           </object>
         </child>
@@ -1532,8 +1532,8 @@
           <object class="GtkLabel" id="wrap14">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">14</property>
+              <property name="column">0</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1541,8 +1541,8 @@
           <object class="GtkLabel" id="ellipsize14">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">14</property>
+              <property name="column">1</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1550,8 +1550,8 @@
           <object class="GtkLabel" id="width_chars14">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">14</property>
+              <property name="column">2</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1559,8 +1559,8 @@
           <object class="GtkLabel" id="max_width_chars14">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">14</property>
+              <property name="column">3</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1638,8 +1638,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">14</property>
+              <property name="column">4</property>
+              <property name="row">14</property>
             </layout>
           </object>
         </child>
@@ -1647,8 +1647,8 @@
           <object class="GtkLabel" id="wrap15">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">15</property>
+              <property name="column">0</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1656,8 +1656,8 @@
           <object class="GtkLabel" id="ellipsize15">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">15</property>
+              <property name="column">1</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1665,8 +1665,8 @@
           <object class="GtkLabel" id="width_chars15">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">15</property>
+              <property name="column">2</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1674,8 +1674,8 @@
           <object class="GtkLabel" id="max_width_chars15">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">15</property>
+              <property name="column">3</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1753,8 +1753,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">15</property>
+              <property name="column">4</property>
+              <property name="row">15</property>
             </layout>
           </object>
         </child>
@@ -1762,8 +1762,8 @@
           <object class="GtkLabel" id="wrap16">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">16</property>
+              <property name="column">0</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1771,8 +1771,8 @@
           <object class="GtkLabel" id="ellipsize16">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">16</property>
+              <property name="column">1</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1780,8 +1780,8 @@
           <object class="GtkLabel" id="width_chars16">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">16</property>
+              <property name="column">2</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1789,8 +1789,8 @@
           <object class="GtkLabel" id="max_width_chars16">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">16</property>
+              <property name="column">3</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1872,8 +1872,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">16</property>
+              <property name="column">4</property>
+              <property name="row">16</property>
             </layout>
           </object>
         </child>
@@ -1881,8 +1881,8 @@
           <object class="GtkLabel" id="wrap17">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">17</property>
+              <property name="column">0</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1890,8 +1890,8 @@
           <object class="GtkLabel" id="ellipsize17">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">17</property>
+              <property name="column">1</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1899,8 +1899,8 @@
           <object class="GtkLabel" id="width_chars17">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">17</property>
+              <property name="column">2</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1908,8 +1908,8 @@
           <object class="GtkLabel" id="max_width_chars17">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">17</property>
+              <property name="column">3</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1983,8 +1983,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">17</property>
+              <property name="column">4</property>
+              <property name="row">17</property>
             </layout>
           </object>
         </child>
@@ -1992,8 +1992,8 @@
           <object class="GtkLabel" id="wrap18">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">18</property>
+              <property name="column">0</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -2001,8 +2001,8 @@
           <object class="GtkLabel" id="ellipsize18">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">18</property>
+              <property name="column">1</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -2010,8 +2010,8 @@
           <object class="GtkLabel" id="width_chars18">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">18</property>
+              <property name="column">2</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -2019,8 +2019,8 @@
           <object class="GtkLabel" id="max_width_chars18">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">18</property>
+              <property name="column">3</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -2098,8 +2098,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">18</property>
+              <property name="column">4</property>
+              <property name="row">18</property>
             </layout>
           </object>
         </child>
@@ -2107,8 +2107,8 @@
           <object class="GtkLabel" id="wrap19">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">19</property>
+              <property name="column">0</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2116,8 +2116,8 @@
           <object class="GtkLabel" id="ellipsize19">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">19</property>
+              <property name="column">1</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2125,8 +2125,8 @@
           <object class="GtkLabel" id="width_chars19">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">19</property>
+              <property name="column">2</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2134,8 +2134,8 @@
           <object class="GtkLabel" id="max_width_chars19">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">19</property>
+              <property name="column">3</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2213,8 +2213,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">19</property>
+              <property name="column">4</property>
+              <property name="row">19</property>
             </layout>
           </object>
         </child>
@@ -2222,8 +2222,8 @@
           <object class="GtkLabel" id="wrap20">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">20</property>
+              <property name="column">0</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2231,8 +2231,8 @@
           <object class="GtkLabel" id="ellipsize20">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">20</property>
+              <property name="column">1</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2240,8 +2240,8 @@
           <object class="GtkLabel" id="width_chars20">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">20</property>
+              <property name="column">2</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2249,8 +2249,8 @@
           <object class="GtkLabel" id="max_width_chars20">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">20</property>
+              <property name="column">3</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2332,8 +2332,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">20</property>
+              <property name="column">4</property>
+              <property name="row">20</property>
             </layout>
           </object>
         </child>
@@ -2341,8 +2341,8 @@
           <object class="GtkLabel" id="wrap21">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">21</property>
+              <property name="column">0</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2350,8 +2350,8 @@
           <object class="GtkLabel" id="ellipsize21">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">21</property>
+              <property name="column">1</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2359,8 +2359,8 @@
           <object class="GtkLabel" id="width_chars21">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">21</property>
+              <property name="column">2</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2368,8 +2368,8 @@
           <object class="GtkLabel" id="max_width_chars21">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">21</property>
+              <property name="column">3</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2447,8 +2447,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">21</property>
+              <property name="column">4</property>
+              <property name="row">21</property>
             </layout>
           </object>
         </child>
@@ -2456,8 +2456,8 @@
           <object class="GtkLabel" id="wrap22">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">22</property>
+              <property name="column">0</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2465,8 +2465,8 @@
           <object class="GtkLabel" id="ellipsize22">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">22</property>
+              <property name="column">1</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2474,8 +2474,8 @@
           <object class="GtkLabel" id="width_chars22">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">22</property>
+              <property name="column">2</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2483,8 +2483,8 @@
           <object class="GtkLabel" id="max_width_chars22">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">22</property>
+              <property name="column">3</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2566,8 +2566,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">22</property>
+              <property name="column">4</property>
+              <property name="row">22</property>
             </layout>
           </object>
         </child>
@@ -2575,8 +2575,8 @@
           <object class="GtkLabel" id="wrap23">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">23</property>
+              <property name="column">0</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2584,8 +2584,8 @@
           <object class="GtkLabel" id="ellipsize23">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">23</property>
+              <property name="column">1</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2593,8 +2593,8 @@
           <object class="GtkLabel" id="width_chars23">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">23</property>
+              <property name="column">2</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2602,8 +2602,8 @@
           <object class="GtkLabel" id="max_width_chars23">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">23</property>
+              <property name="column">3</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2685,8 +2685,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">23</property>
+              <property name="column">4</property>
+              <property name="row">23</property>
             </layout>
           </object>
         </child>
@@ -2694,8 +2694,8 @@
           <object class="GtkLabel" id="wrap24">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">24</property>
+              <property name="column">0</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2703,8 +2703,8 @@
           <object class="GtkLabel" id="ellipsize24">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">24</property>
+              <property name="column">1</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2712,8 +2712,8 @@
           <object class="GtkLabel" id="width_chars24">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">24</property>
+              <property name="column">2</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2721,8 +2721,8 @@
           <object class="GtkLabel" id="max_width_chars24">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">24</property>
+              <property name="column">3</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2808,8 +2808,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">24</property>
+              <property name="column">4</property>
+              <property name="row">24</property>
             </layout>
           </object>
         </child>
@@ -2817,8 +2817,8 @@
           <object class="GtkLabel" id="wrap25">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">25</property>
+              <property name="column">0</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2826,8 +2826,8 @@
           <object class="GtkLabel" id="ellipsize25">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">25</property>
+              <property name="column">1</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2835,8 +2835,8 @@
           <object class="GtkLabel" id="width_chars25">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">25</property>
+              <property name="column">2</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2844,8 +2844,8 @@
           <object class="GtkLabel" id="max_width_chars25">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">25</property>
+              <property name="column">3</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2923,8 +2923,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">25</property>
+              <property name="column">4</property>
+              <property name="row">25</property>
             </layout>
           </object>
         </child>
@@ -2932,8 +2932,8 @@
           <object class="GtkLabel" id="wrap26">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">26</property>
+              <property name="column">0</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -2941,8 +2941,8 @@
           <object class="GtkLabel" id="ellipsize26">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">26</property>
+              <property name="column">1</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -2950,8 +2950,8 @@
           <object class="GtkLabel" id="width_chars26">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">26</property>
+              <property name="column">2</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -2959,8 +2959,8 @@
           <object class="GtkLabel" id="max_width_chars26">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">26</property>
+              <property name="column">3</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -3042,8 +3042,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">26</property>
+              <property name="column">4</property>
+              <property name="row">26</property>
             </layout>
           </object>
         </child>
@@ -3051,8 +3051,8 @@
           <object class="GtkLabel" id="wrap27">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">27</property>
+              <property name="column">0</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -3060,8 +3060,8 @@
           <object class="GtkLabel" id="ellipsize27">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">27</property>
+              <property name="column">1</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -3069,8 +3069,8 @@
           <object class="GtkLabel" id="width_chars27">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">27</property>
+              <property name="column">2</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -3078,8 +3078,8 @@
           <object class="GtkLabel" id="max_width_chars27">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">27</property>
+              <property name="column">3</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -3161,8 +3161,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">27</property>
+              <property name="column">4</property>
+              <property name="row">27</property>
             </layout>
           </object>
         </child>
@@ -3170,8 +3170,8 @@
           <object class="GtkLabel" id="wrap28">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">28</property>
+              <property name="column">0</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3179,8 +3179,8 @@
           <object class="GtkLabel" id="ellipsize28">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">28</property>
+              <property name="column">1</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3188,8 +3188,8 @@
           <object class="GtkLabel" id="width_chars28">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">28</property>
+              <property name="column">2</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3197,8 +3197,8 @@
           <object class="GtkLabel" id="max_width_chars28">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">28</property>
+              <property name="column">3</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3284,8 +3284,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">28</property>
+              <property name="column">4</property>
+              <property name="row">28</property>
             </layout>
           </object>
         </child>
@@ -3293,8 +3293,8 @@
           <object class="GtkLabel" id="wrap29">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">29</property>
+              <property name="column">0</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3302,8 +3302,8 @@
           <object class="GtkLabel" id="ellipsize29">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">29</property>
+              <property name="column">1</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3311,8 +3311,8 @@
           <object class="GtkLabel" id="width_chars29">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">29</property>
+              <property name="column">2</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3320,8 +3320,8 @@
           <object class="GtkLabel" id="max_width_chars29">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">29</property>
+              <property name="column">3</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3399,8 +3399,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">29</property>
+              <property name="column">4</property>
+              <property name="row">29</property>
             </layout>
           </object>
         </child>
@@ -3408,8 +3408,8 @@
           <object class="GtkLabel" id="wrap30">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">30</property>
+              <property name="column">0</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3417,8 +3417,8 @@
           <object class="GtkLabel" id="ellipsize30">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">30</property>
+              <property name="column">1</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3426,8 +3426,8 @@
           <object class="GtkLabel" id="width_chars30">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">30</property>
+              <property name="column">2</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3435,8 +3435,8 @@
           <object class="GtkLabel" id="max_width_chars30">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">30</property>
+              <property name="column">3</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3518,8 +3518,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">30</property>
+              <property name="column">4</property>
+              <property name="row">30</property>
             </layout>
           </object>
         </child>
@@ -3527,8 +3527,8 @@
           <object class="GtkLabel" id="wrap31">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">31</property>
+              <property name="column">0</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3536,8 +3536,8 @@
           <object class="GtkLabel" id="ellipsize31">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">31</property>
+              <property name="column">1</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3545,8 +3545,8 @@
           <object class="GtkLabel" id="width_chars31">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">31</property>
+              <property name="column">2</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3554,8 +3554,8 @@
           <object class="GtkLabel" id="max_width_chars31">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">31</property>
+              <property name="column">3</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3637,8 +3637,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">31</property>
+              <property name="column">4</property>
+              <property name="row">31</property>
             </layout>
           </object>
         </child>
@@ -3646,8 +3646,8 @@
           <object class="GtkLabel" id="wrap32">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">32</property>
+              <property name="column">0</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3655,8 +3655,8 @@
           <object class="GtkLabel" id="ellipsize32">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">32</property>
+              <property name="column">1</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3664,8 +3664,8 @@
           <object class="GtkLabel" id="width_chars32">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">32</property>
+              <property name="column">2</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3673,8 +3673,8 @@
           <object class="GtkLabel" id="max_width_chars32">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">32</property>
+              <property name="column">3</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3760,8 +3760,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">32</property>
+              <property name="column">4</property>
+              <property name="row">32</property>
             </layout>
           </object>
         </child>
@@ -3769,8 +3769,8 @@
           <object class="GtkLabel" id="wrap33">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">33</property>
+              <property name="column">0</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3778,8 +3778,8 @@
           <object class="GtkLabel" id="ellipsize33">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">33</property>
+              <property name="column">1</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3787,8 +3787,8 @@
           <object class="GtkLabel" id="width_chars33">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">33</property>
+              <property name="column">2</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3796,8 +3796,8 @@
           <object class="GtkLabel" id="max_width_chars33">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">33</property>
+              <property name="column">3</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3871,8 +3871,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">33</property>
+              <property name="column">4</property>
+              <property name="row">33</property>
             </layout>
           </object>
         </child>
@@ -3880,8 +3880,8 @@
           <object class="GtkLabel" id="wrap34">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">34</property>
+              <property name="column">0</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3889,8 +3889,8 @@
           <object class="GtkLabel" id="ellipsize34">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">34</property>
+              <property name="column">1</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3898,8 +3898,8 @@
           <object class="GtkLabel" id="width_chars34">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">34</property>
+              <property name="column">2</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3907,8 +3907,8 @@
           <object class="GtkLabel" id="max_width_chars34">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">34</property>
+              <property name="column">3</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3986,8 +3986,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">34</property>
+              <property name="column">4</property>
+              <property name="row">34</property>
             </layout>
           </object>
         </child>
@@ -3995,8 +3995,8 @@
           <object class="GtkLabel" id="wrap35">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">35</property>
+              <property name="column">0</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -4004,8 +4004,8 @@
           <object class="GtkLabel" id="ellipsize35">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">35</property>
+              <property name="column">1</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -4013,8 +4013,8 @@
           <object class="GtkLabel" id="width_chars35">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">35</property>
+              <property name="column">2</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -4022,8 +4022,8 @@
           <object class="GtkLabel" id="max_width_chars35">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">35</property>
+              <property name="column">3</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -4101,8 +4101,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">35</property>
+              <property name="column">4</property>
+              <property name="row">35</property>
             </layout>
           </object>
         </child>
@@ -4110,8 +4110,8 @@
           <object class="GtkLabel" id="wrap36">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">36</property>
+              <property name="column">0</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4119,8 +4119,8 @@
           <object class="GtkLabel" id="ellipsize36">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">36</property>
+              <property name="column">1</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4128,8 +4128,8 @@
           <object class="GtkLabel" id="width_chars36">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">36</property>
+              <property name="column">2</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4137,8 +4137,8 @@
           <object class="GtkLabel" id="max_width_chars36">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">36</property>
+              <property name="column">3</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4220,8 +4220,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">36</property>
+              <property name="column">4</property>
+              <property name="row">36</property>
             </layout>
           </object>
         </child>
@@ -4229,8 +4229,8 @@
           <object class="GtkLabel" id="wrap37">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">37</property>
+              <property name="column">0</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4238,8 +4238,8 @@
           <object class="GtkLabel" id="ellipsize37">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">37</property>
+              <property name="column">1</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4247,8 +4247,8 @@
           <object class="GtkLabel" id="width_chars37">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">37</property>
+              <property name="column">2</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4256,8 +4256,8 @@
           <object class="GtkLabel" id="max_width_chars37">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">37</property>
+              <property name="column">3</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4335,8 +4335,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">37</property>
+              <property name="column">4</property>
+              <property name="row">37</property>
             </layout>
           </object>
         </child>
@@ -4344,8 +4344,8 @@
           <object class="GtkLabel" id="wrap38">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">38</property>
+              <property name="column">0</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4353,8 +4353,8 @@
           <object class="GtkLabel" id="ellipsize38">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">38</property>
+              <property name="column">1</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4362,8 +4362,8 @@
           <object class="GtkLabel" id="width_chars38">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">38</property>
+              <property name="column">2</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4371,8 +4371,8 @@
           <object class="GtkLabel" id="max_width_chars38">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">38</property>
+              <property name="column">3</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4454,8 +4454,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">38</property>
+              <property name="column">4</property>
+              <property name="row">38</property>
             </layout>
           </object>
         </child>
@@ -4463,8 +4463,8 @@
           <object class="GtkLabel" id="wrap39">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">39</property>
+              <property name="column">0</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4472,8 +4472,8 @@
           <object class="GtkLabel" id="ellipsize39">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">39</property>
+              <property name="column">1</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4481,8 +4481,8 @@
           <object class="GtkLabel" id="width_chars39">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">39</property>
+              <property name="column">2</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4490,8 +4490,8 @@
           <object class="GtkLabel" id="max_width_chars39">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">39</property>
+              <property name="column">3</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4573,8 +4573,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">39</property>
+              <property name="column">4</property>
+              <property name="row">39</property>
             </layout>
           </object>
         </child>
@@ -4582,8 +4582,8 @@
           <object class="GtkLabel" id="wrap40">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">40</property>
+              <property name="column">0</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4591,8 +4591,8 @@
           <object class="GtkLabel" id="ellipsize40">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">40</property>
+              <property name="column">1</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4600,8 +4600,8 @@
           <object class="GtkLabel" id="width_chars40">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">40</property>
+              <property name="column">2</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4609,8 +4609,8 @@
           <object class="GtkLabel" id="max_width_chars40">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">40</property>
+              <property name="column">3</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4696,8 +4696,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">40</property>
+              <property name="column">4</property>
+              <property name="row">40</property>
             </layout>
           </object>
         </child>
@@ -4705,8 +4705,8 @@
           <object class="GtkLabel" id="wrap41">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">41</property>
+              <property name="column">0</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4714,8 +4714,8 @@
           <object class="GtkLabel" id="ellipsize41">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">41</property>
+              <property name="column">1</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4723,8 +4723,8 @@
           <object class="GtkLabel" id="width_chars41">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">41</property>
+              <property name="column">2</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4732,8 +4732,8 @@
           <object class="GtkLabel" id="max_width_chars41">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">41</property>
+              <property name="column">3</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4811,8 +4811,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">41</property>
+              <property name="column">4</property>
+              <property name="row">41</property>
             </layout>
           </object>
         </child>
@@ -4820,8 +4820,8 @@
           <object class="GtkLabel" id="wrap42">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">42</property>
+              <property name="column">0</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4829,8 +4829,8 @@
           <object class="GtkLabel" id="ellipsize42">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">42</property>
+              <property name="column">1</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4838,8 +4838,8 @@
           <object class="GtkLabel" id="width_chars42">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">42</property>
+              <property name="column">2</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4847,8 +4847,8 @@
           <object class="GtkLabel" id="max_width_chars42">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">42</property>
+              <property name="column">3</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4930,8 +4930,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">42</property>
+              <property name="column">4</property>
+              <property name="row">42</property>
             </layout>
           </object>
         </child>
@@ -4939,8 +4939,8 @@
           <object class="GtkLabel" id="wrap43">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">43</property>
+              <property name="column">0</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -4948,8 +4948,8 @@
           <object class="GtkLabel" id="ellipsize43">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">43</property>
+              <property name="column">1</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -4957,8 +4957,8 @@
           <object class="GtkLabel" id="width_chars43">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">43</property>
+              <property name="column">2</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -4966,8 +4966,8 @@
           <object class="GtkLabel" id="max_width_chars43">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">43</property>
+              <property name="column">3</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -5049,8 +5049,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">43</property>
+              <property name="column">4</property>
+              <property name="row">43</property>
             </layout>
           </object>
         </child>
@@ -5058,8 +5058,8 @@
           <object class="GtkLabel" id="wrap44">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">44</property>
+              <property name="column">0</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -5067,8 +5067,8 @@
           <object class="GtkLabel" id="ellipsize44">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">44</property>
+              <property name="column">1</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -5076,8 +5076,8 @@
           <object class="GtkLabel" id="width_chars44">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">44</property>
+              <property name="column">2</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -5085,8 +5085,8 @@
           <object class="GtkLabel" id="max_width_chars44">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">44</property>
+              <property name="column">3</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -5172,8 +5172,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">44</property>
+              <property name="column">4</property>
+              <property name="row">44</property>
             </layout>
           </object>
         </child>
@@ -5181,8 +5181,8 @@
           <object class="GtkLabel" id="wrap45">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">45</property>
+              <property name="column">0</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5190,8 +5190,8 @@
           <object class="GtkLabel" id="ellipsize45">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">45</property>
+              <property name="column">1</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5199,8 +5199,8 @@
           <object class="GtkLabel" id="width_chars45">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">45</property>
+              <property name="column">2</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5208,8 +5208,8 @@
           <object class="GtkLabel" id="max_width_chars45">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">45</property>
+              <property name="column">3</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5287,8 +5287,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">45</property>
+              <property name="column">4</property>
+              <property name="row">45</property>
             </layout>
           </object>
         </child>
@@ -5296,8 +5296,8 @@
           <object class="GtkLabel" id="wrap46">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">46</property>
+              <property name="column">0</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5305,8 +5305,8 @@
           <object class="GtkLabel" id="ellipsize46">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">46</property>
+              <property name="column">1</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5314,8 +5314,8 @@
           <object class="GtkLabel" id="width_chars46">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">46</property>
+              <property name="column">2</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5323,8 +5323,8 @@
           <object class="GtkLabel" id="max_width_chars46">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">46</property>
+              <property name="column">3</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5406,8 +5406,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">46</property>
+              <property name="column">4</property>
+              <property name="row">46</property>
             </layout>
           </object>
         </child>
@@ -5415,8 +5415,8 @@
           <object class="GtkLabel" id="wrap47">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">47</property>
+              <property name="column">0</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5424,8 +5424,8 @@
           <object class="GtkLabel" id="ellipsize47">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">47</property>
+              <property name="column">1</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5433,8 +5433,8 @@
           <object class="GtkLabel" id="width_chars47">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">47</property>
+              <property name="column">2</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5442,8 +5442,8 @@
           <object class="GtkLabel" id="max_width_chars47">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">47</property>
+              <property name="column">3</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5525,8 +5525,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">47</property>
+              <property name="column">4</property>
+              <property name="row">47</property>
             </layout>
           </object>
         </child>
@@ -5534,8 +5534,8 @@
           <object class="GtkLabel" id="wrap48">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">48</property>
+              <property name="column">0</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5543,8 +5543,8 @@
           <object class="GtkLabel" id="ellipsize48">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">48</property>
+              <property name="column">1</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5552,8 +5552,8 @@
           <object class="GtkLabel" id="width_chars48">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">48</property>
+              <property name="column">2</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5561,8 +5561,8 @@
           <object class="GtkLabel" id="max_width_chars48">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">48</property>
+              <property name="column">3</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5648,8 +5648,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">48</property>
+              <property name="column">4</property>
+              <property name="row">48</property>
             </layout>
           </object>
         </child>
@@ -5657,8 +5657,8 @@
           <object class="GtkLabel" id="wrap49">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">49</property>
+              <property name="column">0</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5666,8 +5666,8 @@
           <object class="GtkLabel" id="ellipsize49">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">49</property>
+              <property name="column">1</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5675,8 +5675,8 @@
           <object class="GtkLabel" id="width_chars49">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">49</property>
+              <property name="column">2</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5684,8 +5684,8 @@
           <object class="GtkLabel" id="max_width_chars49">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">49</property>
+              <property name="column">3</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5759,8 +5759,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">49</property>
+              <property name="column">4</property>
+              <property name="row">49</property>
             </layout>
           </object>
         </child>
@@ -5768,8 +5768,8 @@
           <object class="GtkLabel" id="wrap50">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">50</property>
+              <property name="column">0</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5777,8 +5777,8 @@
           <object class="GtkLabel" id="ellipsize50">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">50</property>
+              <property name="column">1</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5786,8 +5786,8 @@
           <object class="GtkLabel" id="width_chars50">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">50</property>
+              <property name="column">2</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5795,8 +5795,8 @@
           <object class="GtkLabel" id="max_width_chars50">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">50</property>
+              <property name="column">3</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5874,8 +5874,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">50</property>
+              <property name="column">4</property>
+              <property name="row">50</property>
             </layout>
           </object>
         </child>
@@ -5883,8 +5883,8 @@
           <object class="GtkLabel" id="wrap51">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">51</property>
+              <property name="column">0</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5892,8 +5892,8 @@
           <object class="GtkLabel" id="ellipsize51">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">51</property>
+              <property name="column">1</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5901,8 +5901,8 @@
           <object class="GtkLabel" id="width_chars51">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">51</property>
+              <property name="column">2</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5910,8 +5910,8 @@
           <object class="GtkLabel" id="max_width_chars51">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">51</property>
+              <property name="column">3</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5989,8 +5989,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">51</property>
+              <property name="column">4</property>
+              <property name="row">51</property>
             </layout>
           </object>
         </child>
@@ -5998,8 +5998,8 @@
           <object class="GtkLabel" id="wrap52">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">52</property>
+              <property name="column">0</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -6007,8 +6007,8 @@
           <object class="GtkLabel" id="ellipsize52">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">52</property>
+              <property name="column">1</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -6016,8 +6016,8 @@
           <object class="GtkLabel" id="width_chars52">
             <property name="label" translatable="yes">-1</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">52</property>
+              <property name="column">2</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -6025,8 +6025,8 @@
           <object class="GtkLabel" id="max_width_chars52">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">52</property>
+              <property name="column">3</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -6108,8 +6108,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">52</property>
+              <property name="column">4</property>
+              <property name="row">52</property>
             </layout>
           </object>
         </child>
@@ -6117,8 +6117,8 @@
           <object class="GtkLabel" id="wrap53">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">53</property>
+              <property name="column">0</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -6126,8 +6126,8 @@
           <object class="GtkLabel" id="ellipsize53">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">53</property>
+              <property name="column">1</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -6135,8 +6135,8 @@
           <object class="GtkLabel" id="width_chars53">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">53</property>
+              <property name="column">2</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -6144,8 +6144,8 @@
           <object class="GtkLabel" id="max_width_chars53">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">53</property>
+              <property name="column">3</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -6223,8 +6223,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">53</property>
+              <property name="column">4</property>
+              <property name="row">53</property>
             </layout>
           </object>
         </child>
@@ -6232,8 +6232,8 @@
           <object class="GtkLabel" id="wrap54">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">54</property>
+              <property name="column">0</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6241,8 +6241,8 @@
           <object class="GtkLabel" id="ellipsize54">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">54</property>
+              <property name="column">1</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6250,8 +6250,8 @@
           <object class="GtkLabel" id="width_chars54">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">54</property>
+              <property name="column">2</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6259,8 +6259,8 @@
           <object class="GtkLabel" id="max_width_chars54">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">54</property>
+              <property name="column">3</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6342,8 +6342,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">54</property>
+              <property name="column">4</property>
+              <property name="row">54</property>
             </layout>
           </object>
         </child>
@@ -6351,8 +6351,8 @@
           <object class="GtkLabel" id="wrap55">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">55</property>
+              <property name="column">0</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6360,8 +6360,8 @@
           <object class="GtkLabel" id="ellipsize55">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">55</property>
+              <property name="column">1</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6369,8 +6369,8 @@
           <object class="GtkLabel" id="width_chars55">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">55</property>
+              <property name="column">2</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6378,8 +6378,8 @@
           <object class="GtkLabel" id="max_width_chars55">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">55</property>
+              <property name="column">3</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6461,8 +6461,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">55</property>
+              <property name="column">4</property>
+              <property name="row">55</property>
             </layout>
           </object>
         </child>
@@ -6470,8 +6470,8 @@
           <object class="GtkLabel" id="wrap56">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">56</property>
+              <property name="column">0</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6479,8 +6479,8 @@
           <object class="GtkLabel" id="ellipsize56">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">56</property>
+              <property name="column">1</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6488,8 +6488,8 @@
           <object class="GtkLabel" id="width_chars56">
             <property name="label" translatable="yes">4</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">56</property>
+              <property name="column">2</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6497,8 +6497,8 @@
           <object class="GtkLabel" id="max_width_chars56">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">56</property>
+              <property name="column">3</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6584,8 +6584,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">56</property>
+              <property name="column">4</property>
+              <property name="row">56</property>
             </layout>
           </object>
         </child>
@@ -6593,8 +6593,8 @@
           <object class="GtkLabel" id="wrap57">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">57</property>
+              <property name="column">0</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6602,8 +6602,8 @@
           <object class="GtkLabel" id="ellipsize57">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">57</property>
+              <property name="column">1</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6611,8 +6611,8 @@
           <object class="GtkLabel" id="width_chars57">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">57</property>
+              <property name="column">2</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6620,8 +6620,8 @@
           <object class="GtkLabel" id="max_width_chars57">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">57</property>
+              <property name="column">3</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6699,8 +6699,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">57</property>
+              <property name="column">4</property>
+              <property name="row">57</property>
             </layout>
           </object>
         </child>
@@ -6708,8 +6708,8 @@
           <object class="GtkLabel" id="wrap58">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">58</property>
+              <property name="column">0</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6717,8 +6717,8 @@
           <object class="GtkLabel" id="ellipsize58">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">58</property>
+              <property name="column">1</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6726,8 +6726,8 @@
           <object class="GtkLabel" id="width_chars58">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">58</property>
+              <property name="column">2</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6735,8 +6735,8 @@
           <object class="GtkLabel" id="max_width_chars58">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">58</property>
+              <property name="column">3</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6818,8 +6818,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">58</property>
+              <property name="column">4</property>
+              <property name="row">58</property>
             </layout>
           </object>
         </child>
@@ -6827,8 +6827,8 @@
           <object class="GtkLabel" id="wrap59">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">59</property>
+              <property name="column">0</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6836,8 +6836,8 @@
           <object class="GtkLabel" id="ellipsize59">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">59</property>
+              <property name="column">1</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6845,8 +6845,8 @@
           <object class="GtkLabel" id="width_chars59">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">59</property>
+              <property name="column">2</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6854,8 +6854,8 @@
           <object class="GtkLabel" id="max_width_chars59">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">59</property>
+              <property name="column">3</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6937,8 +6937,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">59</property>
+              <property name="column">4</property>
+              <property name="row">59</property>
             </layout>
           </object>
         </child>
@@ -6946,8 +6946,8 @@
           <object class="GtkLabel" id="wrap60">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">60</property>
+              <property name="column">0</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -6955,8 +6955,8 @@
           <object class="GtkLabel" id="ellipsize60">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">60</property>
+              <property name="column">1</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -6964,8 +6964,8 @@
           <object class="GtkLabel" id="width_chars60">
             <property name="label" translatable="yes">8</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">60</property>
+              <property name="column">2</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -6973,8 +6973,8 @@
           <object class="GtkLabel" id="max_width_chars60">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">60</property>
+              <property name="column">3</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -7060,8 +7060,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">60</property>
+              <property name="column">4</property>
+              <property name="row">60</property>
             </layout>
           </object>
         </child>
@@ -7069,8 +7069,8 @@
           <object class="GtkLabel" id="wrap61">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">61</property>
+              <property name="column">0</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -7078,8 +7078,8 @@
           <object class="GtkLabel" id="ellipsize61">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">61</property>
+              <property name="column">1</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -7087,8 +7087,8 @@
           <object class="GtkLabel" id="width_chars61">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">61</property>
+              <property name="column">2</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -7096,8 +7096,8 @@
           <object class="GtkLabel" id="max_width_chars61">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">61</property>
+              <property name="column">3</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -7175,8 +7175,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">61</property>
+              <property name="column">4</property>
+              <property name="row">61</property>
             </layout>
           </object>
         </child>
@@ -7184,8 +7184,8 @@
           <object class="GtkLabel" id="wrap62">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">62</property>
+              <property name="column">0</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -7193,8 +7193,8 @@
           <object class="GtkLabel" id="ellipsize62">
             <property name="label" translatable="yes">none</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">62</property>
+              <property name="column">1</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -7202,8 +7202,8 @@
           <object class="GtkLabel" id="width_chars62">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">62</property>
+              <property name="column">2</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -7211,8 +7211,8 @@
           <object class="GtkLabel" id="max_width_chars62">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">62</property>
+              <property name="column">3</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -7294,8 +7294,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">62</property>
+              <property name="column">4</property>
+              <property name="row">62</property>
             </layout>
           </object>
         </child>
@@ -7303,8 +7303,8 @@
           <object class="GtkLabel" id="wrap63">
             <property name="label" translatable="yes">False</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">63</property>
+              <property name="column">0</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7312,8 +7312,8 @@
           <object class="GtkLabel" id="ellipsize63">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">63</property>
+              <property name="column">1</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7321,8 +7321,8 @@
           <object class="GtkLabel" id="width_chars63">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">63</property>
+              <property name="column">2</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7330,8 +7330,8 @@
           <object class="GtkLabel" id="max_width_chars63">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">63</property>
+              <property name="column">3</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7413,8 +7413,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">63</property>
+              <property name="column">4</property>
+              <property name="row">63</property>
             </layout>
           </object>
         </child>
@@ -7422,8 +7422,8 @@
           <object class="GtkLabel" id="wrap64">
             <property name="label" translatable="yes">True</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">64</property>
+              <property name="column">0</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
@@ -7431,8 +7431,8 @@
           <object class="GtkLabel" id="ellipsize64">
             <property name="label" translatable="yes">end</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">64</property>
+              <property name="column">1</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
@@ -7440,8 +7440,8 @@
           <object class="GtkLabel" id="width_chars64">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">64</property>
+              <property name="column">2</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
@@ -7449,8 +7449,8 @@
           <object class="GtkLabel" id="max_width_chars64">
             <property name="label" translatable="yes">12</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">64</property>
+              <property name="column">3</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
@@ -7536,8 +7536,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">64</property>
+              <property name="column">4</property>
+              <property name="row">64</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/label-wrap-justify.ref.ui b/testsuite/reftests/label-wrap-justify.ref.ui
index cd8d257ad6..5d7000ec2f 100644
--- a/testsuite/reftests/label-wrap-justify.ref.ui
+++ b/testsuite/reftests/label-wrap-justify.ref.ui
@@ -10,8 +10,8 @@
 aligning&lt;/tt&gt;</property>
             <property name="use_markup">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -23,8 +23,8 @@ aligning&lt;/tt&gt;</property>
 aligning&lt;/tt&gt;</property>
             <property name="use_markup">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -36,8 +36,8 @@ aligning&lt;/tt&gt;</property>
 aligning&lt;/tt&gt;</property>
             <property name="use_markup">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -48,8 +48,8 @@ aligning&lt;/tt&gt;</property>
             <property name="label" translatable="yes">&lt;tt&gt;Make the widget wide 
enough&lt;/tt&gt;</property>
             <property name="use_markup">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/label-wrap-justify.ui b/testsuite/reftests/label-wrap-justify.ui
index 374451d123..b610623fd1 100644
--- a/testsuite/reftests/label-wrap-justify.ui
+++ b/testsuite/reftests/label-wrap-justify.ui
@@ -11,8 +11,8 @@ aligning&lt;/tt&gt;</property>
             <property name="use_markup">1</property>
             <property name="wrap">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -26,8 +26,8 @@ aligning&lt;/tt&gt;</property>
             <property name="justify">center</property>
             <property name="wrap">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -41,8 +41,8 @@ aligning&lt;/tt&gt;</property>
             <property name="justify">right</property>
             <property name="wrap">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -53,8 +53,8 @@ aligning&lt;/tt&gt;</property>
             <property name="label" translatable="yes">&lt;tt&gt;Make the widget wide 
enough&lt;/tt&gt;</property>
             <property name="use_markup">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/named-colors.ref.ui b/testsuite/reftests/named-colors.ref.ui
index 4489759244..4022c350af 100644
--- a/testsuite/reftests/named-colors.ref.ui
+++ b/testsuite/reftests/named-colors.ref.ui
@@ -10,8 +10,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference0</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -23,8 +23,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -36,8 +36,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference20</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -49,8 +49,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference30</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -62,8 +62,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference40</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -75,8 +75,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference50</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -88,8 +88,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference60</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -101,8 +101,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference70</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">0</property>
+              <property name="column">7</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -114,8 +114,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference80</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">0</property>
+              <property name="column">8</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -127,8 +127,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference90</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">0</property>
+              <property name="column">9</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -140,8 +140,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference100</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">0</property>
+              <property name="column">10</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -153,8 +153,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference110</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">0</property>
+              <property name="column">11</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -166,8 +166,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference120</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">0</property>
+              <property name="column">12</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -179,8 +179,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference130</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">0</property>
+              <property name="column">13</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -192,8 +192,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference140</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">0</property>
+              <property name="column">14</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -205,8 +205,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -218,8 +218,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference11</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -231,8 +231,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference21</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -244,8 +244,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference31</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -257,8 +257,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference41</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -270,8 +270,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference51</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -283,8 +283,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference61</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -296,8 +296,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference71</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">1</property>
+              <property name="column">7</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -309,8 +309,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference81</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">1</property>
+              <property name="column">8</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -322,8 +322,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference91</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">1</property>
+              <property name="column">9</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -335,8 +335,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference101</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">1</property>
+              <property name="column">10</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -348,8 +348,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference111</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">1</property>
+              <property name="column">11</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -361,8 +361,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference121</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">1</property>
+              <property name="column">12</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -374,8 +374,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference131</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">1</property>
+              <property name="column">13</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -387,8 +387,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference141</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">1</property>
+              <property name="column">14</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -400,8 +400,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference2</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -413,8 +413,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference12</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -426,8 +426,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference22</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -439,8 +439,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference32</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -452,8 +452,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference42</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -465,8 +465,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference52</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -478,8 +478,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference62</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -491,8 +491,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference72</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">2</property>
+              <property name="column">7</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -504,8 +504,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference82</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">2</property>
+              <property name="column">8</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -517,8 +517,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference92</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">2</property>
+              <property name="column">9</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -530,8 +530,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference102</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">2</property>
+              <property name="column">10</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -543,8 +543,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference112</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">2</property>
+              <property name="column">11</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -556,8 +556,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference122</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">2</property>
+              <property name="column">12</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -569,8 +569,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference132</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">2</property>
+              <property name="column">13</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -582,8 +582,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference142</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">2</property>
+              <property name="column">14</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -595,8 +595,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference3</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -608,8 +608,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference13</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -621,8 +621,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference23</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -634,8 +634,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference33</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -647,8 +647,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference43</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -660,8 +660,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference53</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -673,8 +673,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference63</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -686,8 +686,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference73</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">3</property>
+              <property name="column">7</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -699,8 +699,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference83</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">3</property>
+              <property name="column">8</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -712,8 +712,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference93</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">3</property>
+              <property name="column">9</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -725,8 +725,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference103</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">3</property>
+              <property name="column">10</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -738,8 +738,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference113</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">3</property>
+              <property name="column">11</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -751,8 +751,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference123</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">3</property>
+              <property name="column">12</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -764,8 +764,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference133</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">3</property>
+              <property name="column">13</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -777,8 +777,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference143</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">3</property>
+              <property name="column">14</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -790,8 +790,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference4</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -803,8 +803,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference14</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -816,8 +816,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference24</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -829,8 +829,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference34</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -842,8 +842,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference44</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -855,8 +855,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference54</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">4</property>
+              <property name="column">5</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -868,8 +868,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference64</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">4</property>
+              <property name="column">6</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -881,8 +881,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference74</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">4</property>
+              <property name="column">7</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -894,8 +894,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference84</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">4</property>
+              <property name="column">8</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -907,8 +907,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference94</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">4</property>
+              <property name="column">9</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -920,8 +920,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference104</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">4</property>
+              <property name="column">10</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -933,8 +933,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference114</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">4</property>
+              <property name="column">11</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -946,8 +946,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference124</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">4</property>
+              <property name="column">12</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -959,8 +959,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference134</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">4</property>
+              <property name="column">13</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -972,8 +972,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference144</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">4</property>
+              <property name="column">14</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -985,8 +985,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference5</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -998,8 +998,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference15</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1011,8 +1011,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference25</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1024,8 +1024,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference35</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">5</property>
+              <property name="column">3</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1037,8 +1037,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference45</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">5</property>
+              <property name="column">4</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1050,8 +1050,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference55</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">5</property>
+              <property name="column">5</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1063,8 +1063,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference65</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">5</property>
+              <property name="column">6</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1076,8 +1076,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference75</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">5</property>
+              <property name="column">7</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1089,8 +1089,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference85</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">5</property>
+              <property name="column">8</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1102,8 +1102,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference95</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">5</property>
+              <property name="column">9</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1115,8 +1115,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference105</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">5</property>
+              <property name="column">10</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1128,8 +1128,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference115</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">5</property>
+              <property name="column">11</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1141,8 +1141,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference125</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">5</property>
+              <property name="column">12</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1154,8 +1154,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference135</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">5</property>
+              <property name="column">13</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1167,8 +1167,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference145</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">5</property>
+              <property name="column">14</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1180,8 +1180,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference6</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1193,8 +1193,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference16</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1206,8 +1206,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference26</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">6</property>
+              <property name="column">2</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1219,8 +1219,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference36</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">6</property>
+              <property name="column">3</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1232,8 +1232,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference46</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">6</property>
+              <property name="column">4</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1245,8 +1245,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference56</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">6</property>
+              <property name="column">5</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1258,8 +1258,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference66</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">6</property>
+              <property name="column">6</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1271,8 +1271,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference76</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">6</property>
+              <property name="column">7</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1284,8 +1284,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference86</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">6</property>
+              <property name="column">8</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1297,8 +1297,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference96</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">6</property>
+              <property name="column">9</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1310,8 +1310,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference106</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">6</property>
+              <property name="column">10</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1323,8 +1323,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference116</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">6</property>
+              <property name="column">11</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1336,8 +1336,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference126</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">6</property>
+              <property name="column">12</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1349,8 +1349,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference136</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">6</property>
+              <property name="column">13</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1362,8 +1362,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference146</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">6</property>
+              <property name="column">14</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1375,8 +1375,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference7</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">7</property>
+              <property name="column">0</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1388,8 +1388,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference17</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1401,8 +1401,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference27</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">7</property>
+              <property name="column">2</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1414,8 +1414,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference37</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">7</property>
+              <property name="column">3</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1427,8 +1427,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference47</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">7</property>
+              <property name="column">4</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1440,8 +1440,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference57</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">7</property>
+              <property name="column">5</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1453,8 +1453,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference67</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">7</property>
+              <property name="column">6</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1466,8 +1466,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference77</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">7</property>
+              <property name="column">7</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1479,8 +1479,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference87</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">7</property>
+              <property name="column">8</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1492,8 +1492,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference97</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">7</property>
+              <property name="column">9</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1505,8 +1505,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference107</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">7</property>
+              <property name="column">10</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1518,8 +1518,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference117</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">7</property>
+              <property name="column">11</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1531,8 +1531,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference127</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">7</property>
+              <property name="column">12</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1544,8 +1544,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference137</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">7</property>
+              <property name="column">13</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1557,8 +1557,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference147</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">7</property>
+              <property name="column">14</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1570,8 +1570,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference8</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">8</property>
+              <property name="column">0</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1583,8 +1583,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference18</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">8</property>
+              <property name="column">1</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1596,8 +1596,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference28</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1609,8 +1609,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference38</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">8</property>
+              <property name="column">3</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1622,8 +1622,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference48</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">8</property>
+              <property name="column">4</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1635,8 +1635,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference58</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">8</property>
+              <property name="column">5</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1648,8 +1648,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference68</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">8</property>
+              <property name="column">6</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1661,8 +1661,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference78</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">8</property>
+              <property name="column">7</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1674,8 +1674,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference88</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">8</property>
+              <property name="column">8</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1687,8 +1687,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference98</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">8</property>
+              <property name="column">9</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1700,8 +1700,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference108</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">8</property>
+              <property name="column">10</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1713,8 +1713,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference118</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">8</property>
+              <property name="column">11</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1726,8 +1726,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference128</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">8</property>
+              <property name="column">12</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1739,8 +1739,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference138</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">8</property>
+              <property name="column">13</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1752,8 +1752,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference148</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">8</property>
+              <property name="column">14</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1765,8 +1765,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference9</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">9</property>
+              <property name="column">0</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1778,8 +1778,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference19</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">9</property>
+              <property name="column">1</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1791,8 +1791,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference29</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">9</property>
+              <property name="column">2</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1804,8 +1804,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference39</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">9</property>
+              <property name="column">3</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1817,8 +1817,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference49</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">9</property>
+              <property name="column">4</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1830,8 +1830,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference59</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">9</property>
+              <property name="column">5</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1843,8 +1843,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference69</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">9</property>
+              <property name="column">6</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1856,8 +1856,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference79</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">9</property>
+              <property name="column">7</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1869,8 +1869,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference89</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">9</property>
+              <property name="column">8</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1882,8 +1882,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference99</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">9</property>
+              <property name="column">9</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1895,8 +1895,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference109</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">9</property>
+              <property name="column">10</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1908,8 +1908,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference119</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">9</property>
+              <property name="column">11</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1921,8 +1921,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference129</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">9</property>
+              <property name="column">12</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1934,8 +1934,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference139</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">9</property>
+              <property name="column">13</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1947,8 +1947,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">reference149</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">9</property>
+              <property name="column">14</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/named-colors.ui b/testsuite/reftests/named-colors.ui
index f1f76b0345..8aee986f3a 100644
--- a/testsuite/reftests/named-colors.ui
+++ b/testsuite/reftests/named-colors.ui
@@ -10,8 +10,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color0</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -23,8 +23,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color10</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -36,8 +36,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color20</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -49,8 +49,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color30</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">0</property>
+              <property name="column">3</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -62,8 +62,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color40</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -75,8 +75,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color50</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -88,8 +88,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color60</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">0</property>
+              <property name="column">6</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -101,8 +101,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color70</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">0</property>
+              <property name="column">7</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -114,8 +114,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color80</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">0</property>
+              <property name="column">8</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -127,8 +127,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color90</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">0</property>
+              <property name="column">9</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -140,8 +140,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color100</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">0</property>
+              <property name="column">10</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -153,8 +153,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color110</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">0</property>
+              <property name="column">11</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -166,8 +166,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color120</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">0</property>
+              <property name="column">12</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -179,8 +179,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color130</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">0</property>
+              <property name="column">13</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -192,8 +192,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color140</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">0</property>
+              <property name="column">14</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -205,8 +205,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -218,8 +218,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color11</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -231,8 +231,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color21</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -244,8 +244,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color31</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -257,8 +257,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color41</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -270,8 +270,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color51</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -283,8 +283,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color61</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">1</property>
+              <property name="column">6</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -296,8 +296,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color71</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">1</property>
+              <property name="column">7</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -309,8 +309,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color81</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">1</property>
+              <property name="column">8</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -322,8 +322,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color91</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">1</property>
+              <property name="column">9</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -335,8 +335,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color101</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">1</property>
+              <property name="column">10</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -348,8 +348,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color111</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">1</property>
+              <property name="column">11</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -361,8 +361,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color121</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">1</property>
+              <property name="column">12</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -374,8 +374,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color131</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">1</property>
+              <property name="column">13</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -387,8 +387,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color141</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">1</property>
+              <property name="column">14</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -400,8 +400,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color2</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -413,8 +413,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color12</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -426,8 +426,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color22</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -439,8 +439,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color32</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -452,8 +452,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color42</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -465,8 +465,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color52</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">2</property>
+              <property name="column">5</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -478,8 +478,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color62</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">2</property>
+              <property name="column">6</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -491,8 +491,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color72</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">2</property>
+              <property name="column">7</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -504,8 +504,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color82</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">2</property>
+              <property name="column">8</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -517,8 +517,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color92</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">2</property>
+              <property name="column">9</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -530,8 +530,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color102</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">2</property>
+              <property name="column">10</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -543,8 +543,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color112</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">2</property>
+              <property name="column">11</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -556,8 +556,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color122</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">2</property>
+              <property name="column">12</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -569,8 +569,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color132</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">2</property>
+              <property name="column">13</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -582,8 +582,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color142</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">2</property>
+              <property name="column">14</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -595,8 +595,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color3</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -608,8 +608,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color13</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -621,8 +621,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color23</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -634,8 +634,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color33</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">3</property>
+              <property name="column">3</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -647,8 +647,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color43</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">3</property>
+              <property name="column">4</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -660,8 +660,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color53</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">3</property>
+              <property name="column">5</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -673,8 +673,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color63</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">3</property>
+              <property name="column">6</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -686,8 +686,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color73</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">3</property>
+              <property name="column">7</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -699,8 +699,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color83</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">3</property>
+              <property name="column">8</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -712,8 +712,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color93</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">3</property>
+              <property name="column">9</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -725,8 +725,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color103</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">3</property>
+              <property name="column">10</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -738,8 +738,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color113</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">3</property>
+              <property name="column">11</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -751,8 +751,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color123</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">3</property>
+              <property name="column">12</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -764,8 +764,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color133</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">3</property>
+              <property name="column">13</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -777,8 +777,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color143</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">3</property>
+              <property name="column">14</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -790,8 +790,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color4</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -803,8 +803,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color14</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -816,8 +816,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color24</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -829,8 +829,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color34</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">4</property>
+              <property name="column">3</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -842,8 +842,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color44</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">4</property>
+              <property name="column">4</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -855,8 +855,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color54</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">4</property>
+              <property name="column">5</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -868,8 +868,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color64</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">4</property>
+              <property name="column">6</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -881,8 +881,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color74</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">4</property>
+              <property name="column">7</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -894,8 +894,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color84</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">4</property>
+              <property name="column">8</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -907,8 +907,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color94</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">4</property>
+              <property name="column">9</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -920,8 +920,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color104</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">4</property>
+              <property name="column">10</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -933,8 +933,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color114</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">4</property>
+              <property name="column">11</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -946,8 +946,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color124</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">4</property>
+              <property name="column">12</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -959,8 +959,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color134</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">4</property>
+              <property name="column">13</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -972,8 +972,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color144</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">4</property>
+              <property name="column">14</property>
+              <property name="row">4</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -985,8 +985,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color5</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -998,8 +998,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color15</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1011,8 +1011,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color25</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1024,8 +1024,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color35</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">5</property>
+              <property name="column">3</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1037,8 +1037,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color45</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">5</property>
+              <property name="column">4</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1050,8 +1050,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color55</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">5</property>
+              <property name="column">5</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1063,8 +1063,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color65</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">5</property>
+              <property name="column">6</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1076,8 +1076,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color75</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">5</property>
+              <property name="column">7</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1089,8 +1089,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color85</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">5</property>
+              <property name="column">8</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1102,8 +1102,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color95</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">5</property>
+              <property name="column">9</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1115,8 +1115,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color105</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">5</property>
+              <property name="column">10</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1128,8 +1128,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color115</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">5</property>
+              <property name="column">11</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1141,8 +1141,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color125</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">5</property>
+              <property name="column">12</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1154,8 +1154,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color135</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">5</property>
+              <property name="column">13</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1167,8 +1167,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color145</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">5</property>
+              <property name="column">14</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1180,8 +1180,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color6</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1193,8 +1193,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color16</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1206,8 +1206,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color26</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">6</property>
+              <property name="column">2</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1219,8 +1219,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color36</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">6</property>
+              <property name="column">3</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1232,8 +1232,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color46</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">6</property>
+              <property name="column">4</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1245,8 +1245,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color56</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">6</property>
+              <property name="column">5</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1258,8 +1258,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color66</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">6</property>
+              <property name="column">6</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1271,8 +1271,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color76</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">6</property>
+              <property name="column">7</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1284,8 +1284,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color86</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">6</property>
+              <property name="column">8</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1297,8 +1297,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color96</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">6</property>
+              <property name="column">9</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1310,8 +1310,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color106</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">6</property>
+              <property name="column">10</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1323,8 +1323,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color116</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">6</property>
+              <property name="column">11</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1336,8 +1336,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color126</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">6</property>
+              <property name="column">12</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1349,8 +1349,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color136</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">6</property>
+              <property name="column">13</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1362,8 +1362,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color146</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">6</property>
+              <property name="column">14</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1375,8 +1375,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color7</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">7</property>
+              <property name="column">0</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1388,8 +1388,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color17</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1401,8 +1401,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color27</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">7</property>
+              <property name="column">2</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1414,8 +1414,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color37</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">7</property>
+              <property name="column">3</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1427,8 +1427,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color47</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">7</property>
+              <property name="column">4</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1440,8 +1440,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color57</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">7</property>
+              <property name="column">5</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1453,8 +1453,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color67</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">7</property>
+              <property name="column">6</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1466,8 +1466,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color77</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">7</property>
+              <property name="column">7</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1479,8 +1479,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color87</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">7</property>
+              <property name="column">8</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1492,8 +1492,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color97</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">7</property>
+              <property name="column">9</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1505,8 +1505,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color107</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">7</property>
+              <property name="column">10</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1518,8 +1518,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color117</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">7</property>
+              <property name="column">11</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1531,8 +1531,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color127</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">7</property>
+              <property name="column">12</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1544,8 +1544,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color137</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">7</property>
+              <property name="column">13</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1557,8 +1557,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color147</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">7</property>
+              <property name="column">14</property>
+              <property name="row">7</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1570,8 +1570,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color8</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">8</property>
+              <property name="column">0</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1583,8 +1583,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color18</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">8</property>
+              <property name="column">1</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1596,8 +1596,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color28</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1609,8 +1609,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color38</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">8</property>
+              <property name="column">3</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1622,8 +1622,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color48</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">8</property>
+              <property name="column">4</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1635,8 +1635,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color58</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">8</property>
+              <property name="column">5</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1648,8 +1648,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color68</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">8</property>
+              <property name="column">6</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1661,8 +1661,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color78</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">8</property>
+              <property name="column">7</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1674,8 +1674,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color88</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">8</property>
+              <property name="column">8</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1687,8 +1687,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color98</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">8</property>
+              <property name="column">9</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1700,8 +1700,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color108</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">8</property>
+              <property name="column">10</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1713,8 +1713,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color118</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">8</property>
+              <property name="column">11</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1726,8 +1726,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color128</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">8</property>
+              <property name="column">12</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1739,8 +1739,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color138</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">8</property>
+              <property name="column">13</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1752,8 +1752,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color148</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">8</property>
+              <property name="column">14</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1765,8 +1765,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color9</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">9</property>
+              <property name="column">0</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1778,8 +1778,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color19</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">9</property>
+              <property name="column">1</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1791,8 +1791,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color29</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">9</property>
+              <property name="column">2</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1804,8 +1804,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color39</property>
             <layout>
-              <property name="left_attach">3</property>
-              <property name="top_attach">9</property>
+              <property name="column">3</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1817,8 +1817,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color49</property>
             <layout>
-              <property name="left_attach">4</property>
-              <property name="top_attach">9</property>
+              <property name="column">4</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1830,8 +1830,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color59</property>
             <layout>
-              <property name="left_attach">5</property>
-              <property name="top_attach">9</property>
+              <property name="column">5</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1843,8 +1843,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color69</property>
             <layout>
-              <property name="left_attach">6</property>
-              <property name="top_attach">9</property>
+              <property name="column">6</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1856,8 +1856,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color79</property>
             <layout>
-              <property name="left_attach">7</property>
-              <property name="top_attach">9</property>
+              <property name="column">7</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1869,8 +1869,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color89</property>
             <layout>
-              <property name="left_attach">8</property>
-              <property name="top_attach">9</property>
+              <property name="column">8</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1882,8 +1882,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color99</property>
             <layout>
-              <property name="left_attach">9</property>
-              <property name="top_attach">9</property>
+              <property name="column">9</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1895,8 +1895,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color109</property>
             <layout>
-              <property name="left_attach">10</property>
-              <property name="top_attach">9</property>
+              <property name="column">10</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1908,8 +1908,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color119</property>
             <layout>
-              <property name="left_attach">11</property>
-              <property name="top_attach">9</property>
+              <property name="column">11</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1921,8 +1921,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color129</property>
             <layout>
-              <property name="left_attach">12</property>
-              <property name="top_attach">9</property>
+              <property name="column">12</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1934,8 +1934,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color139</property>
             <layout>
-              <property name="left_attach">13</property>
-              <property name="top_attach">9</property>
+              <property name="column">13</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -1947,8 +1947,8 @@
             <property name="label" translatable="yes">XXX</property>
             <property name="name">color149</property>
             <layout>
-              <property name="left_attach">14</property>
-              <property name="top_attach">9</property>
+              <property name="column">14</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/paned-undersized.ui b/testsuite/reftests/paned-undersized.ui
index cf60449800..bf087ba567 100644
--- a/testsuite/reftests/paned-undersized.ui
+++ b/testsuite/reftests/paned-undersized.ui
@@ -15,8 +15,8 @@
                 <property name="width_request">50</property>
                 <property name="height_request">50</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
diff --git a/testsuite/reftests/partial-rounded-border.ref.ui 
b/testsuite/reftests/partial-rounded-border.ref.ui
index 4b60261d5d..ba44543089 100644
--- a/testsuite/reftests/partial-rounded-border.ref.ui
+++ b/testsuite/reftests/partial-rounded-border.ref.ui
@@ -9,8 +9,8 @@
           <object class="GtkButton">
             <property name="label">topleft</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -18,8 +18,8 @@
           <object class="GtkButton">
             <property name="label">topright</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -27,8 +27,8 @@
           <object class="GtkButton">
             <property name="label">bottomleft</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -36,8 +36,8 @@
           <object class="GtkButton">
             <property name="label">bottomright</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/partial-rounded-border.ui b/testsuite/reftests/partial-rounded-border.ui
index e7b5ab0219..88e874de45 100644
--- a/testsuite/reftests/partial-rounded-border.ui
+++ b/testsuite/reftests/partial-rounded-border.ui
@@ -9,8 +9,8 @@
             <property name="label">topleft</property>
             <property name="name">topleft</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -19,8 +19,8 @@
             <property name="label">topright</property>
             <property name="name">topright</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -29,8 +29,8 @@
             <property name="label">bottomleft</property>
             <property name="name">bottomleft</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -39,8 +39,8 @@
             <property name="label">bottomright</property>
             <property name="name">bottomright</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/quit-mnemonic.ui b/testsuite/reftests/quit-mnemonic.ui
index d699bbf290..703715883f 100644
--- a/testsuite/reftests/quit-mnemonic.ui
+++ b/testsuite/reftests/quit-mnemonic.ui
@@ -11,8 +11,8 @@
               <attribute name="underline" value="low" start="0" end="1"></attribute>
             </attributes>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -22,8 +22,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes"> </property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/rotated-layout.ref.ui b/testsuite/reftests/rotated-layout.ref.ui
index 674e264d1d..2ee8da9d73 100644
--- a/testsuite/reftests/rotated-layout.ref.ui
+++ b/testsuite/reftests/rotated-layout.ref.ui
@@ -8,8 +8,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">label</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -19,8 +19,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">label</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/rotated-layout.ui b/testsuite/reftests/rotated-layout.ui
index ed14ce7bd4..dd444fd664 100644
--- a/testsuite/reftests/rotated-layout.ui
+++ b/testsuite/reftests/rotated-layout.ui
@@ -8,8 +8,8 @@
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes">label</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -19,8 +19,8 @@
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes">label</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/separator-size.ref.ui b/testsuite/reftests/separator-size.ref.ui
index d86610f7c1..44ea486f98 100644
--- a/testsuite/reftests/separator-size.ref.ui
+++ b/testsuite/reftests/separator-size.ref.ui
@@ -8,8 +8,8 @@
           <object class="GtkImage" id="image1">
             <property name="icon_name">help-about</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -19,8 +19,8 @@
           <object class="GtkImage" id="image2">
             <property name="icon_name">help-about</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -30,8 +30,8 @@
           <object class="GtkImage" id="image3">
             <property name="icon_name">help-about</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -41,8 +41,8 @@
           <object class="GtkImage" id="image4">
             <property name="icon_name">help-about</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -52,8 +52,8 @@
           <object class="GtkSeparator" id="separator1">
             <property name="orientation">vertical</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -62,8 +62,8 @@
         <child>
           <object class="GtkSeparator" id="separator2">
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -72,8 +72,8 @@
         <child>
           <object class="GtkSeparator" id="separator3">
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -83,8 +83,8 @@
           <object class="GtkSeparator" id="separator4">
             <property name="orientation">vertical</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui
index d9351d280e..0ebac1981b 100644
--- a/testsuite/reftests/separator-size.ui
+++ b/testsuite/reftests/separator-size.ui
@@ -18,8 +18,8 @@
               <object class="GtkSeparator" id="separator1"/>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">1</property>
               <property name="row-span">2</property>
             </layout>
@@ -40,8 +40,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
               <property name="row-span">1</property>
             </layout>
@@ -61,8 +61,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
               <property name="column-span">1</property>
               <property name="row-span">2</property>
             </layout>
@@ -86,8 +86,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -106,8 +106,8 @@
               </object>
             </child>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">2</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/sizegroups-basics.ref.ui b/testsuite/reftests/sizegroups-basics.ref.ui
index 1265d6b31d..d5118d743c 100644
--- a/testsuite/reftests/sizegroups-basics.ref.ui
+++ b/testsuite/reftests/sizegroups-basics.ref.ui
@@ -13,8 +13,8 @@
             <child>
               <object class="GtkLabel" id="label1">
                 <layout>
-                  <property name="top-attach">0</property>
-                  <property name="left-attach">0</property>
+                  <property name="row">0</property>
+                  <property name="column">0</property>
                 </layout>
               </object>
             </child>
@@ -22,8 +22,8 @@
               <object class="GtkLabel" id="label2">
                 <property name="label" translatable="yes">medium</property>
                 <layout>
-                  <property name="top-attach">1</property>
-                  <property name="left-attach">1</property>
+                  <property name="row">1</property>
+                  <property name="column">1</property>
                 </layout>
               </object>
             </child>
@@ -32,8 +32,8 @@
                 <property name="label" translatable="yes">wrap this very long text please or I&apos;ll need 
to write even more</property>
                 <property name="wrap">1</property>
                 <layout>
-                  <property name="top-attach">2</property>
-                  <property name="left-attach">2</property>
+                  <property name="row">2</property>
+                  <property name="column">2</property>
                 </layout>
               </object>
             </child>
diff --git a/testsuite/reftests/sizegroups-basics.ui b/testsuite/reftests/sizegroups-basics.ui
index aac033e236..7f4d9b5c88 100644
--- a/testsuite/reftests/sizegroups-basics.ui
+++ b/testsuite/reftests/sizegroups-basics.ui
@@ -11,8 +11,8 @@
             <child>
               <object class="GtkLabel" id="label1">
                 <layout>
-                  <property name="top-attach">0</property>
-                  <property name="left-attach">0</property>
+                  <property name="row">0</property>
+                  <property name="column">0</property>
                 </layout>
               </object>
             </child>
@@ -20,8 +20,8 @@
               <object class="GtkLabel" id="label2">
                 <property name="label" translatable="yes">medium</property>
                 <layout>
-                  <property name="top-attach">1</property>
-                  <property name="left-attach">1</property>
+                  <property name="row">1</property>
+                  <property name="column">1</property>
                 </layout>
               </object>
             </child>
@@ -30,8 +30,8 @@
                 <property name="label" translatable="yes">wrap this very long text please or I&apos;ll need 
to write even more</property>
                 <property name="wrap">1</property>
                 <layout>
-                  <property name="top-attach">2</property>
-                  <property name="left-attach">2</property>
+                  <property name="row">2</property>
+                  <property name="column">2</property>
                 </layout>
               </object>
             </child>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui 
b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
index 921237a6d7..ec123ee8f4 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
@@ -12,8 +12,8 @@
             <property name="label" translatable="yes">Please enter your name and email address below. The 
&quot;optional&quot; fields below do not need to be filled in, unless you wish to include this information in 
email you send.</property>
             <property name="wrap">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="column-span">2</property>
               <property name="row-span">1</property>
             </layout>
@@ -25,8 +25,8 @@
             <property name="label" translatable="yes">&lt;b&gt;Account Information&lt;/b&gt;</property>
             <property name="use_markup">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
               <property name="row-span">1</property>
             </layout>
@@ -39,8 +39,8 @@
             <property name="label" translatable="yes">Type the name by which you would like to refer to this 
account.
 For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
               <property name="row-span">1</property>
             </layout>
@@ -54,8 +54,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -66,8 +66,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -79,8 +79,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
             <property name="use_markup">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
               <property name="column-span">2</property>
               <property name="row-span">1</property>
             </layout>
@@ -94,8 +94,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry2</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -106,8 +106,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -119,8 +119,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="label" translatable="yes">Email _Address:</property>
             <property name="use_underline">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -131,8 +131,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -144,8 +144,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="label" translatable="yes">&lt;b&gt;Optional Information&lt;/b&gt;</property>
             <property name="use_markup">1</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">7</property>
+              <property name="column">0</property>
+              <property name="row">7</property>
               <property name="column-span">2</property>
               <property name="row-span">1</property>
             </layout>
@@ -159,8 +159,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry4</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">8</property>
+              <property name="column">0</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -171,8 +171,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="hexpand">1</property>
             <property name="invisible_char">●</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">8</property>
+              <property name="column">1</property>
+              <property name="row">8</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -186,8 +186,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
             <property name="use_underline">1</property>
             <property name="mnemonic_widget">entry5</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">9</property>
+              <property name="column">0</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
@@ -197,8 +197,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
           <object class="GtkEntry" id="entry5">
             <property name="invisible_char">●</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">9</property>
+              <property name="column">1</property>
+              <property name="row">9</property>
               <property name="column-span">1</property>
               <property name="row-span">1</property>
             </layout>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui 
b/testsuite/reftests/sizegroups-evolution-identity-page.ui
index 3679a754b8..27cce52c11 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui
@@ -23,8 +23,8 @@
                 <property name="label" translatable="yes">&lt;b&gt;Account Information&lt;/b&gt;</property>
                 <property name="use_markup">1</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">2</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -37,8 +37,8 @@
                 <property name="label" translatable="yes">Type the name by which you would like to refer to 
this account.
 For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                   <property name="column-span">2</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -52,8 +52,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry1</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -64,8 +64,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -83,8 +83,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
                 <property name="use_markup">1</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">2</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -98,8 +98,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry2</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -110,8 +110,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -123,8 +123,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="label" translatable="yes">Email _Address:</property>
                 <property name="use_underline">1</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -135,8 +135,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -154,8 +154,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="label" translatable="yes">&lt;b&gt;Optional Information&lt;/b&gt;</property>
                 <property name="use_markup">1</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">3</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -169,8 +169,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry4</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -181,8 +181,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                   <property name="column-span">2</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -196,8 +196,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
                 <property name="use_underline">1</property>
                 <property name="mnemonic_widget">entry5</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -207,8 +207,8 @@ For example, &quot;Work&quot; or &quot;Personal&quot;.</property>
               <object class="GtkEntry" id="entry5">
                 <property name="invisible_char">●</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                   <property name="column-span">2</property>
                   <property name="row-span">1</property>
                 </layout>
diff --git a/testsuite/reftests/textview-border-windows.ref.ui 
b/testsuite/reftests/textview-border-windows.ref.ui
index 4aaa49d082..1bb083dad4 100644
--- a/testsuite/reftests/textview-border-windows.ref.ui
+++ b/testsuite/reftests/textview-border-windows.ref.ui
@@ -10,8 +10,8 @@
             <property name="width_request">100</property>
             <property name="height_request">100</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -20,8 +20,8 @@
             <property name="name">label_n</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -30,8 +30,8 @@
             <property name="name">label_w</property>
             <property name="width_request">30</property>
             <layout>
-              <property name="left_attach">0</property>
-              <property name="top_attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -40,8 +40,8 @@
             <property name="name">label_e</property>
             <property name="width_request">30</property>
             <layout>
-              <property name="left_attach">2</property>
-              <property name="top_attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -50,8 +50,8 @@
             <property name="name">label_s</property>
             <property name="height_request">30</property>
             <layout>
-              <property name="left_attach">1</property>
-              <property name="top_attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/window-height-for-width.ref.ui 
b/testsuite/reftests/window-height-for-width.ref.ui
index bbeb775b00..f4a1e93ab5 100644
--- a/testsuite/reftests/window-height-for-width.ref.ui
+++ b/testsuite/reftests/window-height-for-width.ref.ui
@@ -35,8 +35,8 @@ Ts</property>
                 <property name="use_underline">1</property>
                 <property name="mnemonic_widget">screen_reader_switch</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -46,8 +46,8 @@ Ts</property>
               <object class="GtkSwitch" id="screen_reader_switch">
                 <property name="halign">end</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
diff --git a/testsuite/reftests/window-height-for-width.ui b/testsuite/reftests/window-height-for-width.ui
index 7751a0dda2..bf001952e2 100644
--- a/testsuite/reftests/window-height-for-width.ui
+++ b/testsuite/reftests/window-height-for-width.ui
@@ -36,8 +36,8 @@
                 <property name="use_underline">1</property>
                 <property name="mnemonic_widget">screen_reader_switch</property>
                 <layout>
-                  <property name="left_attach">0</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>
@@ -47,8 +47,8 @@
               <object class="GtkSwitch" id="screen_reader_switch">
                 <property name="halign">end</property>
                 <layout>
-                  <property name="left_attach">1</property>
-                  <property name="top_attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                   <property name="column-span">1</property>
                   <property name="row-span">1</property>
                 </layout>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]