Index: uspace/app/uidemo/uidemo.c
===================================================================
--- uspace/app/uidemo/uidemo.c	(revision 7896f23a4702b4b153b74f28a8e09330dfc264bf)
+++ uspace/app/uidemo/uidemo.c	(revision ab3bfc1396a2bb5cb16eaa49ab4b46de3dbad3a2)
@@ -426,6 +426,6 @@
 		params.rect.p0.x = 0;
 		params.rect.p0.y = 0;
-		params.rect.p1.x = 80;
-		params.rect.p1.y = 25;
+		params.rect.p1.x = 44;
+		params.rect.p1.y = 21;
 	} else {
 		params.rect.p0.x = 0;
@@ -541,5 +541,5 @@
 		rect.p0.x = 1;
 		rect.p0.y = 1;
-		rect.p1.x = 79;
+		rect.p1.x = 43;
 		rect.p1.y = 2;
 	} else {
@@ -565,8 +565,8 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 20;
-		rect.p0.y = 4;
-		rect.p1.x = 60;
-		rect.p1.y = 5;
+		rect.p0.x = 2;
+		rect.p0.y = 3;
+		rect.p1.x = 42;
+		rect.p1.y = 4;
 	} else {
 		rect.p0.x = 15;
@@ -593,8 +593,8 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 20;
-		rect.p0.y = 6;
-		rect.p1.x = 60;
-		rect.p1.y = 7;
+		rect.p0.x = 2;
+		rect.p0.y = 5;
+		rect.p1.x = 42;
+		rect.p1.y = 6;
 	} else {
 		rect.p0.x = 60;
@@ -623,8 +623,8 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 20;
-		rect.p0.y = 8;
-		rect.p1.x = 30;
-		rect.p1.y = 9;
+		rect.p0.x = 2;
+		rect.p0.y = 7;
+		rect.p1.x = 12;
+		rect.p1.y = 8;
 	} else {
 		rect.p0.x = 15;
@@ -653,8 +653,8 @@
 
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 50;
-		rect.p0.y = 8;
-		rect.p1.x = 60;
-		rect.p1.y = 9;
+		rect.p0.x = 32;
+		rect.p0.y = 7;
+		rect.p1.x = 42;
+		rect.p1.y = 8;
 	} else {
 		rect.p0.x = 115;
@@ -700,6 +700,6 @@
 
 	if (ui_is_textmode(ui)) {
-		off.x = 20;
-		off.y = 10;
+		off.x = 2;
+		off.y = 9;
 	} else {
 		off.x = 15;
@@ -734,8 +734,8 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 20;
-		rect.p0.y = 13;
-		rect.p1.x = 40;
-		rect.p1.y = 14;
+		rect.p0.x = 2;
+		rect.p0.y = 12;
+		rect.p1.x = 12;
+		rect.p1.y = 13;
 	} else {
 		rect.p0.x = 15;
@@ -771,8 +771,8 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 20;
-		rect.p0.y = 15;
-		rect.p1.x = 40;
-		rect.p1.y = 16;
+		rect.p0.x = 2;
+		rect.p0.y = 14;
+		rect.p1.x = 12;
+		rect.p1.y = 15;
 	} else {
 		rect.p0.x = 15;
@@ -798,8 +798,8 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 20;
-		rect.p0.y = 16;
-		rect.p1.x = 40;
-		rect.p1.y = 17;
+		rect.p0.x = 2;
+		rect.p0.y = 15;
+		rect.p1.x = 12;
+		rect.p1.y = 16;
 	} else {
 		rect.p0.x = 15;
@@ -826,8 +826,8 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 20;
-		rect.p0.y = 17;
-		rect.p1.x = 40;
-		rect.p1.y = 18;
+		rect.p0.x = 2;
+		rect.p0.y = 16;
+		rect.p1.x = 12;
+		rect.p1.y = 17;
 	} else {
 		rect.p0.x = 15;
@@ -854,8 +854,8 @@
 	/* FIXME: Auto layout */
 	if (ui_is_textmode(ui)) {
-		rect.p0.x = 20;
-		rect.p0.y = 19;
-		rect.p1.x = 40;
-		rect.p1.y = 20;
+		rect.p0.x = 2;
+		rect.p0.y = 18;
+		rect.p1.x = 12;
+		rect.p1.y = 19;
 	} else {
 		rect.p0.x = 15;