diff -r 4daddc326877 -r 70fd1b24e395 make/vs/testapp/main.c
--- a/make/vs/testapp/main.c	Sun Oct 01 16:39:03 2023 +0200
+++ b/make/vs/testapp/main.c	Sun Oct 01 16:53:02 2023 +0200
@@ -69,7 +69,7 @@
     wdata->toggle = ui_int_new(obj->ctx, "toggle");
     wdata->radio = ui_int_new(obj->ctx, "radio");
 
-    UI_GRID_SP(obj, 10, 5, 20) {
+    ui_grid(obj, .margin=10, .columnspacing=5, .rowspacing=20) {
         ui_button(obj, .label="Button1", .onclick=action1, .onclickdata="action1");
         ui_button(obj, .label="Button2", .onclick=action1, .onclickdata="action2");
         ui_button(obj, .label="Button3", .onclick=action1, .onclickdata="action3", .hexpand=true);
@@ -86,8 +86,7 @@
         ui_togglebutton(obj, .label = "Option 2", .value = wdata->toggle);
         ui_newline(obj);
 
-        ui_layout_colspan(obj, 3);
-        UI_HBOX(obj) {
+        ui_hbox(obj, .colspan=3) {
             ui_radiobutton(obj, .label = "Radio 1", .value = wdata->radio);
             ui_radiobutton(obj, .label = "Radio 2", .value = wdata->radio);
             ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio);