Index: uspace/app/uidemo/uidemo.c
===================================================================
--- uspace/app/uidemo/uidemo.c	(revision 570a3f383acc893b1355dd2d5c791922b2885796)
+++ uspace/app/uidemo/uidemo.c	(revision daadfa699247351099d4c91048e2f9e9a29c346a)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -51,4 +51,6 @@
 #include <ui/promptdialog.h>
 #include <ui/resource.h>
+#include <ui/tab.h>
+#include <ui/tabset.h>
 #include <ui/ui.h>
 #include <ui/window.h>
@@ -615,11 +617,11 @@
 		params.rect.p0.x = 0;
 		params.rect.p0.y = 0;
-		params.rect.p1.x = 44;
-		params.rect.p1.y = 23;
+		params.rect.p1.x = 46;
+		params.rect.p1.y = 25;
 	} else {
 		params.rect.p0.x = 0;
 		params.rect.p0.y = 0;
-		params.rect.p1.x = 250;
-		params.rect.p1.y = 370;
+		params.rect.p1.x = 255;
+		params.rect.p1.y = 410;
 	}
 
@@ -743,7 +745,8 @@
 		rect.p0.x = 4;
 		rect.p0.y = 30;
-		rect.p1.x = 216;
+		rect.p1.x = 251;
 		rect.p1.y = 52;
 	}
+
 	ui_menu_bar_set_rect(demo.mbar, &rect);
 
@@ -754,4 +757,49 @@
 	}
 
+	rc = ui_tab_set_create(ui_res, &demo.tabset);
+	if (rc != EOK) {
+		printf("Error creating tab set.\n");
+		return rc;
+	}
+
+	/* FIXME: Auto layout */
+	if (ui_is_textmode(ui)) {
+		rect.p0.x = 2;
+		rect.p0.y = 2;
+		rect.p1.x = 44;
+		rect.p1.y = 24;
+	} else {
+		rect.p0.x = 8;
+		rect.p0.y = 53;
+		rect.p1.x = 250;
+		rect.p1.y = 405;
+	}
+
+	ui_tab_set_set_rect(demo.tabset, &rect);
+
+	rc = ui_tab_create(demo.tabset, "Basic", &demo.tbasic);
+	if (rc != EOK) {
+		printf("Error creating tab.\n");
+		return rc;
+	}
+
+	rc = ui_tab_create(demo.tabset, "Lists", &demo.tlists);
+	if (rc != EOK) {
+		printf("Error creating tab.\n");
+		return rc;
+	}
+
+	rc = ui_fixed_add(demo.fixed, ui_tab_set_ctl(demo.tabset));
+	if (rc != EOK) {
+		printf("Error adding control to layout.\n");
+		return rc;
+	}
+
+	rc = ui_fixed_create(&demo.bfixed);
+	if (rc != EOK) {
+		printf("Error creating fixed layout.\n");
+		return rc;
+	}
+
 	rc = ui_entry_create(window, "", &demo.entry);
 	if (rc != EOK) {
@@ -762,13 +810,13 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 3;
-		rect.p1.x = 39;
-		rect.p1.y = 4;
+		rect.p0.x = 4;
+		rect.p0.y = 5;
+		rect.p1.x = 41;
+		rect.p1.y = 6;
 	} else {
 		rect.p0.x = 15;
-		rect.p0.y = 53;
+		rect.p0.y = 88;
 		rect.p1.x = 205;
-		rect.p1.y = 78;
+		rect.p1.y = 113;
 	}
 
@@ -776,5 +824,5 @@
 	ui_entry_set_halign(demo.entry, gfx_halign_center);
 
-	rc = ui_fixed_add(demo.fixed, ui_entry_ctl(demo.entry));
+	rc = ui_fixed_add(demo.bfixed, ui_entry_ctl(demo.entry));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -790,13 +838,13 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 5;
-		rect.p1.x = 42;
-		rect.p1.y = 6;
+		rect.p0.x = 4;
+		rect.p0.y = 7;
+		rect.p1.x = 41;
+		rect.p1.y = 8;
 	} else {
 		rect.p0.x = 60;
-		rect.p0.y = 88;
+		rect.p0.y = 123;
 		rect.p1.x = 160;
-		rect.p1.y = 101;
+		rect.p1.y = 136;
 	}
 
@@ -804,5 +852,5 @@
 	ui_label_set_halign(demo.label, gfx_halign_center);
 
-	rc = ui_fixed_add(demo.fixed, ui_label_ctl(demo.label));
+	rc = ui_fixed_add(demo.bfixed, ui_label_ctl(demo.label));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -820,13 +868,13 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 7;
-		rect.p1.x = 12;
-		rect.p1.y = 8;
+		rect.p0.x = 4;
+		rect.p0.y = 9;
+		rect.p1.x = 15;
+		rect.p1.y = 10;
 	} else {
 		rect.p0.x = 15;
-		rect.p0.y = 111;
+		rect.p0.y = 146;
 		rect.p1.x = 105;
-		rect.p1.y = 139;
+		rect.p1.y = 174;
 	}
 
@@ -835,5 +883,5 @@
 	ui_pbutton_set_default(demo.pb1, true);
 
-	rc = ui_fixed_add(demo.fixed, ui_pbutton_ctl(demo.pb1));
+	rc = ui_fixed_add(demo.bfixed, ui_pbutton_ctl(demo.pb1));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -850,18 +898,18 @@
 
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 29;
-		rect.p0.y = 7;
-		rect.p1.x = 39;
-		rect.p1.y = 8;
+		rect.p0.x = 30;
+		rect.p0.y = 9;
+		rect.p1.x = 41;
+		rect.p1.y = 10;
 	} else {
 		rect.p0.x = 115;
-		rect.p0.y = 111;
+		rect.p0.y = 146;
 		rect.p1.x = 205;
-		rect.p1.y = 139;
+		rect.p1.y = 174;
 	}
 
 	ui_pbutton_set_rect(demo.pb2, &rect);
 
-	rc = ui_fixed_add(demo.fixed, ui_pbutton_ctl(demo.pb2));
+	rc = ui_fixed_add(demo.bfixed, ui_pbutton_ctl(demo.pb2));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -897,9 +945,9 @@
 
 	if (ui_is_textmode(ui)) {
-		off.x = 2;
-		off.y = 9;
+		off.x = 4;
+		off.y = 11;
 	} else {
 		off.x = 15;
-		off.y = 155;
+		off.y = 190;
 	}
 
@@ -915,5 +963,5 @@
 	ui_image_set_rect(demo.image, &rect);
 
-	rc = ui_fixed_add(demo.fixed, ui_image_ctl(demo.image));
+	rc = ui_fixed_add(demo.bfixed, ui_image_ctl(demo.image));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -931,18 +979,18 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 12;
-		rect.p1.x = 12;
-		rect.p1.y = 13;
+		rect.p0.x = 4;
+		rect.p0.y = 14;
+		rect.p1.x = 14;
+		rect.p1.y = 15;
 	} else {
 		rect.p0.x = 15;
-		rect.p0.y = 190;
+		rect.p0.y = 225;
 		rect.p1.x = 140;
-		rect.p1.y = 210;
+		rect.p1.y = 245;
 	}
 
 	ui_checkbox_set_rect(demo.checkbox, &rect);
 
-	rc = ui_fixed_add(demo.fixed, ui_checkbox_ctl(demo.checkbox));
+	rc = ui_fixed_add(demo.bfixed, ui_checkbox_ctl(demo.checkbox));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -968,17 +1016,17 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 14;
-		rect.p1.x = 12;
-		rect.p1.y = 15;
+		rect.p0.x = 4;
+		rect.p0.y = 16;
+		rect.p1.x = 14;
+		rect.p1.y = 17;
 	} else {
 		rect.p0.x = 15;
-		rect.p0.y = 220;
+		rect.p0.y = 255;
 		rect.p1.x = 140;
-		rect.p1.y = 240;
+		rect.p1.y = 275;
 	}
 	ui_rbutton_set_rect(demo.rbleft, &rect);
 
-	rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rbleft));
+	rc = ui_fixed_add(demo.bfixed, ui_rbutton_ctl(demo.rbleft));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -995,18 +1043,18 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 15;
-		rect.p1.x = 12;
-		rect.p1.y = 16;
+		rect.p0.x = 4;
+		rect.p0.y = 17;
+		rect.p1.x = 14;
+		rect.p1.y = 18;
 	} else {
 		rect.p0.x = 15;
-		rect.p0.y = 250;
+		rect.p0.y = 285;
 		rect.p1.x = 140;
-		rect.p1.y = 270;
+		rect.p1.y = 305;
 	}
 	ui_rbutton_set_rect(demo.rbcenter, &rect);
 	ui_rbutton_select(demo.rbcenter);
 
-	rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rbcenter));
+	rc = ui_fixed_add(demo.bfixed, ui_rbutton_ctl(demo.rbcenter));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -1023,17 +1071,17 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 16;
-		rect.p1.x = 12;
-		rect.p1.y = 17;
+		rect.p0.x = 4;
+		rect.p0.y = 18;
+		rect.p1.x = 14;
+		rect.p1.y = 19;
 	} else {
 		rect.p0.x = 15;
-		rect.p0.y = 280;
+		rect.p0.y = 315;
 		rect.p1.x = 140;
-		rect.p1.y = 300;
+		rect.p1.y = 335;
 	}
 	ui_rbutton_set_rect(demo.rbright, &rect);
 
-	rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rbright));
+	rc = ui_fixed_add(demo.bfixed, ui_rbutton_ctl(demo.rbright));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -1051,18 +1099,18 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 18;
-		rect.p1.x = 28;
-		rect.p1.y = 19;
+		rect.p0.x = 4;
+		rect.p0.y = 20;
+		rect.p1.x = 32;
+		rect.p1.y = 21;
 	} else {
 		rect.p0.x = 15;
-		rect.p0.y = 310;
+		rect.p0.y = 345;
 		rect.p1.x = 130;
-		rect.p1.y = 330;
+		rect.p1.y = 365;
 	}
 
 	ui_slider_set_rect(demo.slider, &rect);
 
-	rc = ui_fixed_add(demo.fixed, ui_slider_ctl(demo.slider));
+	rc = ui_fixed_add(demo.bfixed, ui_slider_ctl(demo.slider));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -1080,13 +1128,13 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 2;
-		rect.p0.y = 20;
-		rect.p1.x = 40;
-		rect.p1.y = 21;
+		rect.p0.x = 4;
+		rect.p0.y = 22;
+		rect.p1.x = 42;
+		rect.p1.y = 23;
 	} else {
 		rect.p0.x = 15;
-		rect.p0.y = 340;
+		rect.p0.y = 375;
 		rect.p1.x = 220;
-		rect.p1.y = 363;
+		rect.p1.y = 398;
 	}
 
@@ -1096,5 +1144,5 @@
 	    ui_scrollbar_through_length(demo.hscrollbar) / 4);
 
-	rc = ui_fixed_add(demo.fixed, ui_scrollbar_ctl(demo.hscrollbar));
+	rc = ui_fixed_add(demo.bfixed, ui_scrollbar_ctl(demo.hscrollbar));
 	if (rc != EOK) {
 		printf("Error adding control to layout.\n");
@@ -1112,13 +1160,13 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 40;
-		rect.p0.y = 3;
-		rect.p1.x = 41;
-		rect.p1.y = 20;
+		rect.p0.x = 42;
+		rect.p0.y = 5;
+		rect.p1.x = 43;
+		rect.p1.y = 22;
 	} else {
 		rect.p0.x = 220;
-		rect.p0.y = 53;
+		rect.p0.y = 88;
 		rect.p1.x = 243;
-		rect.p1.y = 340;
+		rect.p1.y = 375;
 	}
 
@@ -1128,9 +1176,11 @@
 	    ui_scrollbar_through_length(demo.vscrollbar) / 4);
 
-	rc = ui_fixed_add(demo.fixed, ui_scrollbar_ctl(demo.vscrollbar));
-	if (rc != EOK) {
-		printf("Error adding control to layout.\n");
-		return rc;
-	}
+	rc = ui_fixed_add(demo.bfixed, ui_scrollbar_ctl(demo.vscrollbar));
+	if (rc != EOK) {
+		printf("Error adding control to layout.\n");
+		return rc;
+	}
+
+	ui_tab_add(demo.tbasic, ui_fixed_ctl(demo.bfixed));
 
 	ui_window_add(window, ui_fixed_ctl(demo.fixed));
Index: uspace/app/uidemo/uidemo.h
===================================================================
--- uspace/app/uidemo/uidemo.h	(revision 570a3f383acc893b1355dd2d5c791922b2885796)
+++ uspace/app/uidemo/uidemo.h	(revision daadfa699247351099d4c91048e2f9e9a29c346a)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -48,4 +48,6 @@
 #include <ui/scrollbar.h>
 #include <ui/slider.h>
+#include <ui/tab.h>
+#include <ui/tabset.h>
 #include <ui/ui.h>
 #include <ui/window.h>
@@ -56,4 +58,5 @@
 	ui_window_t *window;
 	ui_fixed_t *fixed;
+	ui_fixed_t *bfixed;
 	ui_menu_bar_t *mbar;
 	ui_menu_t *mfile;
@@ -61,4 +64,7 @@
 	ui_menu_t *mpreferences;
 	ui_menu_t *mhelp;
+	ui_tab_set_t *tabset;
+	ui_tab_t *tbasic;
+	ui_tab_t *tlists;
 	ui_entry_t *entry;
 	ui_image_t *image;