diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 375d85be..bbc519b1 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/INC/LIBTUI.I.txt b/INC/LIBTUI.I.txt
index e9bcfde9..beb8fb78 100644
--- a/INC/LIBTUI.I.txt
+++ b/INC/LIBTUI.I.txt
@@ -84,7 +84,7 @@ S.OBJ.pVar		.EQ 26
 *--------------------------------------
 S.OBJ.Childs	.EQ 32
 *
-S.OBJ			.EQ 48
+S.OBJ			.EQ 64
 *--------------------------------------
 S.SCRN			.EQ S.OBJ
 *--------------------------------------
diff --git a/LIB/LIBTUI.S.DLG.txt b/LIB/LIBTUI.S.DLG.txt
index ad1584ba..dafc6914 100644
--- a/LIB/LIBTUI.S.DLG.txt
+++ b/LIB/LIBTUI.S.DLG.txt
@@ -24,17 +24,19 @@ DLG.New			lda #S.OBJ.T.DLG
 				>SYSCALL2 GetMemPtr
 				>STYA ZPPtr2
 
-				ldy #S.OBJ.W
+				ldy #S.CTX.W
 				lda (ZPPtr2),y
 				sec
+				ldy #S.OBJ.W
 				sbc (ZPObjPtr),y
 				lsr
 				ldy #S.OBJ.X1
 				sta (ZPObjPtr),y
 
-				ldy #S.OBJ.H
+				ldy #S.CTX.H
 				lda (ZPPtr2),y
 				sec
+				ldy #S.OBJ.H
 				sbc (ZPObjPtr),y
 				lsr
 				ldy #S.OBJ.Y1
diff --git a/LIB/LIBTUI.S.OBJ.txt b/LIB/LIBTUI.S.OBJ.txt
index ce98cfcf..46d75807 100644
--- a/LIB/LIBTUI.S.OBJ.txt
+++ b/LIB/LIBTUI.S.OBJ.txt
@@ -182,7 +182,6 @@ OBJ.SetX2Y2		ldy #S.OBJ.X1
 *--------------------------------------
 OBJ.Exec		>PUSHA					hOBJ
 				jsr LIB.GetOBJ
-
 				jsr LIB.GetCTX
 
 .1				jsr IO.GetC
diff --git a/LIB/LIBTUI.S.txt b/LIB/LIBTUI.S.txt
index cda85d65..6329ea06 100644
--- a/LIB/LIBTUI.S.txt
+++ b/LIB/LIBTUI.S.txt
@@ -297,10 +297,11 @@ LIB.GetCTX		>LDYA ZPObjPtr
 				>STYA ZPCtxPtr
 
 .1				lda (ZPCtxPtr)
-*				cmp #S.OBJ.T.SCRN
-				beq .8
+				cmp #S.OBJ.T.DLG+1
+				bcc .8
 
 				jsr .8
+
 				bra .1
 
 .8				ldy #S.OBJ.hParent