diff -r c9b8b9e0cfe8 -r d781436e2490 ui/wpf/container.c
--- a/ui/wpf/container.c	Mon Jan 23 10:50:22 2017 +0100
+++ b/ui/wpf/container.c	Mon Jan 23 12:17:34 2017 +0100
@@ -33,9 +33,17 @@
 #include "../common/object.h"
 
 UIWIDGET ui_vbox(UiObject *obj) {
+    return ui_vbox_sp(obj, 0, 0);
+}
+
+UIWIDGET ui_hbox(UiObject *obj) {
+    return ui_hbox_sp(obj, 0, 0);
+}
+
+UIWIDGET ui_vbox_sp(UiObject *obj, int margin, int spacing) {
     UiContainer *ct = uic_get_current_container(obj);
     
-    UIWIDGET vbox = UIvbox(ct);
+    UIWIDGET vbox = UIvbox(ct, margin, spacing);
     
     UiObject *newobj = uic_object_new(obj, vbox);
     newobj->container = (UiContainer*)vbox;
@@ -44,10 +52,10 @@
     return vbox;
 }
 
-UIWIDGET ui_hbox(UiObject *obj) {
+UIWIDGET ui_hbox_sp(UiObject *obj, int margin, int spacing) {
     UiContainer *ct = uic_get_current_container(obj);
     
-    UIWIDGET hbox = UIhbox(ct);
+    UIWIDGET hbox = UIhbox(ct, margin, spacing);
     
     UiObject *newobj = uic_object_new(obj, hbox);
     newobj->container = (UiContainer*)hbox;
@@ -72,6 +80,40 @@
     return grid;
 }
 
+UIWIDGET ui_scrolledwindow(UiObject *obj) {
+    UiContainer *ct = uic_get_current_container(obj);
+    
+    UIWIDGET scrolledwindow = UIscrolledwindow(ct);
+    
+    UiObject *newobj = uic_object_new(obj, scrolledwindow);
+    newobj->container = (UiContainer*)scrolledwindow;
+    uic_obj_add(obj, newobj);
+    
+    return scrolledwindow;
+}
+
+/*
+ * TODO: sidebar
+ */
+
+UIWIDGET ui_tabview(UiObject *obj) {
+    UiContainer *ct = uic_get_current_container(obj);
+    
+    UIWIDGET tabview = UItabview(ct);
+    
+    UiObject *newobj = uic_object_new(obj, tabview);
+    newobj->container = (UiContainer*)tabview;
+    uic_obj_add(obj, newobj);
+    
+    return tabview;
+}
+
+void ui_tab(UiObject *obj, char *title) {
+    UiContainer *ct = uic_get_current_container(obj);
+    UItab(ct, title);
+}
+
+
 /*
  * -------------------- Layout Functions --------------------
  *