diff -r efaae97bd95b -r ea1a2d5de765 ui/motif/container.h
--- a/ui/motif/container.h	Mon Nov 30 14:09:55 2015 +0100
+++ b/ui/motif/container.h	Tue Jan 12 17:41:08 2016 +0100
@@ -67,6 +67,8 @@
     UiLayoutBool fill;
     UiBool       newline;
     char         *label;
+    UiLayoutBool hexpand;
+    UiLayoutBool vexpand;
 };
 
 struct UiContainer {
@@ -89,6 +91,8 @@
     UiContainer container;
     UcxList     *lines;
     UcxList     *current;
+    int         columnspacing;
+    int         rowspacing;
 };
 
 struct UiTabViewContainer {
@@ -125,7 +129,7 @@
 Widget ui_box_container_prepare(UiContainer *ct, Arg *args, int *n, UiBool fill);
 void ui_box_container_add(UiContainer *ct, Widget widget);
 
-UiContainer* ui_grid_container(UiObject *obj, Widget rowcolumn);
+UiContainer* ui_grid_container(UiObject *obj, Widget form, int columnspacing, int rowspacing);
 Widget ui_grid_container_prepare(UiContainer *ct, Arg *args, int *n, UiBool fill);
 void ui_grid_container_add(UiContainer *ct, Widget widget);