--- a/ui/qt/container.h	Wed Jan 20 11:35:01 2016 +0100
+++ b/ui/qt/container.h	Wed Jan 20 16:00:05 2016 +0100
@@ -55,6 +55,8 @@
     UiLayoutBool fill;
     bool newline;
     char *label;
+    bool hexpand;
+    bool vexpand;
 };
 
 struct UiContainer {
@@ -81,9 +83,8 @@
     QGridLayout *grid;
     int x = 0;
     int y = 0;
-    QSpacerItem *space = NULL;
     
-    UiGridContainer(QGridLayout *grid);
+    UiGridContainer(QGridLayout *grid, int margin, int columnspacing, int rowspacing);
     
     virtual void add(QWidget *widget, bool fill);
 };