diff --git a/avr/devices/c03/test/main.asm b/avr/devices/c03/test/main.asm
index 519906c..f67b73d 100644
--- a/avr/devices/c03/test/main.asm
+++ b/avr/devices/c03/test/main.asm
@@ -268,6 +268,207 @@ DEBUG_STOP3:
 
 
 
+DEBUG_DUMPCTX:
+  lds yl, guiApp
+  lds yh, guiApp+1
+  bigcall GuiApp_GetRootWindow
+  mov yl, r18
+  mov yh, r19
+
+  bigcall Widget_Clear
+
+  clr r4
+  clr r5
+  clr r6
+  clr r7
+  
+  adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
+  ld r24, X+
+
+DEBUG_DUMPCTX_loop:
+    clr r4
+    clr r5
+    rcall DEBUG_DUMPCTXITEM
+    ldi r16, 20
+    clr r17
+    add r6, r16
+    adc r7, r17
+    dec r24
+  brne DEBUG_DUMPCTX_loop
+  bigjmp DEBUG3
+
+
+DEBUG_DUMPONEITEM:
+  lds yl, guiApp
+  lds yh, guiApp+1
+  bigcall GuiApp_GetRootWindow
+  mov yl, r18
+  mov yh, r19
+  bigcall Widget_Clear
+
+  clr r4
+  clr r5
+  clr r6
+  clr r7
+  rjmp DEBUG_DUMPCTXITEM
+
+DEBUG_DUMPCTXITEM:
+  adiw xh:xl, LAYOUT_CTX_ITEM_OFFS_POS_LO
+  ld r20, X+             ; pos
+  ld r21, X+
+  rcall DEBUG_WRITE_INT
+  ldi r16, 65
+  clr r17
+  add r4, r16
+  adc r5, r17
+
+  ld r20, X+             ; size
+  ld r21, X+
+  rcall DEBUG_WRITE_INT
+  ldi r16, 65
+  clr r17
+  add r4, r16
+  adc r5, r17
+
+  ld r20, X+             ; flags
+  clr r21
+  rcall DEBUG_WRITE_INT
+  ldi r16, 65
+  clr r17
+  add r4, r16
+  adc r5, r17
+  ret
+
+
+
+DEBUG_DUMPWDG:
+  lds yl, guiApp
+  lds yh, guiApp+1
+  bigcall GuiApp_GetRootWindow
+  mov yl, r18
+  mov yh, r19
+
+  push zl
+    push zh
+      bigcall Widget_Clear
+    pop zh
+  pop zl
+
+  clr r4
+  clr r5
+  clr r6
+  clr r7
+  
+  push yl
+    push yh
+      mov yl, zl
+      mov yh, zh
+      bigcall OBJ_GetFirstChild
+    pop yh
+  pop yl
+  mov zl, r18
+  mov zh, r19
+  ldi r24, 11
+DEBUG_DUMPWDG_loop:
+    rcall DEBUG_DUMPCWDG
+
+    ldi r16, 20
+    clr r17
+    add r6, r16
+    adc r7, r17
+    dec r24
+    breq DEBUG_DUMPWDG_end
+    push yl
+      push yh
+        mov yl, zl
+        mov yh, zh
+        bigcall OBJ_GetNext
+      pop yh
+    pop yl
+    mov zl, r18
+    mov zh, r19
+    brcc DEBUG_DUMPWDG_end
+  rjmp DEBUG_DUMPWDG_loop
+
+DEBUG_DUMPWDG_end:
+  bigjmp DEBUG3
+
+
+DEBUG_DUMPCWDG:
+  clr r4
+  clr r5
+
+  ldd r20, Z+WIDGET_OFFS_X_LO
+  ldd r21, Z+WIDGET_OFFS_X_HI
+  rcall DEBUG_WRITE_INT
+  ldi r16, 65
+  clr r17
+  add r4, r16
+  adc r5, r17
+
+  ldd r20, Z+WIDGET_OFFS_Y_LO
+  ldd r21, Z+WIDGET_OFFS_Y_HI
+  rcall DEBUG_WRITE_INT
+  ldi r16, 65
+  clr r17
+  add r4, r16
+  adc r5, r17
+
+  ldd r20, Z+WIDGET_OFFS_WIDTH_LO
+  ldd r21, Z+WIDGET_OFFS_WIDTH_HI
+  rcall DEBUG_WRITE_INT
+  ldi r16, 65
+  clr r17
+  add r4, r16
+  adc r5, r17
+
+  ldd r20, Z+WIDGET_OFFS_HEIGHT_LO
+  ldd r21, Z+WIDGET_OFFS_HEIGHT_HI
+  rcall DEBUG_WRITE_INT
+  ldi r16, 65
+  clr r17
+  add r4, r16
+  adc r5, r17
+
+  ldd r20, Z+WIDGET_OFFS_TMP_LO
+  ldd r21, Z+WIDGET_OFFS_TMP_HI
+  rcall DEBUG_WRITE_INT
+  ldi r16, 65
+  clr r17
+  add r4, r16
+  adc r5, r17
+  ret
+
+
+
+
+; @param r21:r20: number
+DEBUG_WRITE_INT:
+  push r24
+    push zl
+      push zh
+        ldi r24, 0
+        push xl
+          push xh
+            bigcall IntToAscii                        ; X=pointer to text
+            push r4
+              push r5
+                bigcall Widget_DrawTextRam   ; (any, !Y)
+              pop r5
+            pop r4
+          pop xh
+        pop xl
+      pop zh
+    pop zl
+  pop r24
+  ret
+; @end
+
+
+
+
+
+
 Debug_Style:
   .dw DISPLAY_COLOR_BLACK      ; frontCol_norm
   .dw DISPLAY_COLOR_GREEN      ; backCol_norm
@@ -334,6 +535,7 @@ GUI2_MODULE_BEGIN:
 .include "modules/lcd2/gui2/aqhome/sensorwatch.asm"
 .include "modules/lcd2/gui2/base/layout2.asm"
 .include "modules/lcd2/gui2/base/hlayout2.asm"
+.include "modules/lcd2/gui2/base/mclayout.asm"
 GUI2_MODULE_END:
 .equ MODULE_SIZE_GUI2 = GUI2_MODULE_END-GUI2_MODULE_BEGIN
 
diff --git a/avr/devices/c03/test/w_climate.asm b/avr/devices/c03/test/w_climate.asm
index 39231fd..43b9b2d 100644
--- a/avr/devices/c03/test/w_climate.asm
+++ b/avr/devices/c03/test/w_climate.asm
@@ -96,9 +96,9 @@ ClimateWin_Init_ret:
 climateWinCreateSensorWatches:
   ldi r16, 0                                                                                           ; OPTS
   ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
-  ldi r20, HLAYOUT_MODE_SPREAD
-;  ldi r20, HLAYOUT_MODE_EXPAND
-  bigcall HLayout_new
+;  ldi r20, HLAYOUT2_MODE_SPREAD
+  ldi r20, HLAYOUT2_MODE_EXPAND
+  bigcall HLayout2_new
   brcc climateWinCreateSensorWatches_ret
   
   mov xl, yl                          ; use HLayout as parent
diff --git a/avr/devices/c03/test/w_netstats.asm b/avr/devices/c03/test/w_netstats.asm
index 21d22b2..461f15c 100644
--- a/avr/devices/c03/test/w_netstats.asm
+++ b/avr/devices/c03/test/w_netstats.asm
@@ -152,9 +152,8 @@ netStatWinCreateContent:
   ; create MLayout
   ldi r16, 0                                                                                           ; OPTS
   ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
-  ldi r20, MLAYOUT_MODE_COLUMNS
-  ldi r21, 2                               ; columns per row
-  bigcall MLayout_new
+  ldi r20, 2                               ; columns per row
+  bigcall MCLayout_new
   brcc netStatWinCreateContent_ret
 
   mov xl, yl                               ; use MLayout as parent
diff --git a/avr/modules/lcd2/gui2/base/hlayout2.asm b/avr/modules/lcd2/gui2/base/hlayout2.asm
index db91c60..17892b2 100644
--- a/avr/modules/lcd2/gui2/base/hlayout2.asm
+++ b/avr/modules/lcd2/gui2/base/hlayout2.asm
@@ -98,7 +98,7 @@ HLayout2_Init:
 
 HLayout2_OnLayout:
   ; create and preset context
-  rcall LayoutCtx_CreateContextFor1D
+  rcall LayoutCtx_CreateContextFor1D    ; X=ctx, r16=num of children
   brcc HLayout2_OnLayout_ret
   ; do layout
   mov r25, r16
@@ -129,6 +129,8 @@ HLayout2_OnGetDefaultHeight:
 ;  rcall Layout_SetDefaultHeights
 ;  rcall Layout_GetMaxTmp
 ;  bigcall Widget_AddOuterStyleBorders   ; (r20, r21)
+  ldi r18, 10
+  clr r19
   sec
   ret
 
@@ -146,6 +148,8 @@ HLayout2_OnGetDefaultHeight:
 HLayout2_OnGetDefaultWidth:
 ;  rcall Layout_SetDefaultWidths
 ;  rcall Layout_SumTmpValues     ; r19:r18=default width
+  ldi r18, 10
+  clr r19
   sec
   ret
 ; @end
@@ -201,7 +205,7 @@ hLayout2PrepareVertical:
 
 
 ; ---------------------------------------------------------------------------
-; @routine hLayout2ReadLayoutWriteHorizontal
+; @routine hLayout2ReadLayoutWriteVertical
 ;
 ; @param Y pointer to widget
 ; @param X layout context
@@ -209,57 +213,28 @@ hLayout2PrepareVertical:
 ; @clobbers r16-r24
 
 hLayout2ReadLayoutWriteVertical:
-  push yl
-    push yh
-      push r24
-        bigcall OBJ_GetFirstChild
-        mov yl, r18
-        mov yh, r19
+  ; read positions and flags into new layout context
+  bigcall LayoutCtx_ReadYDimsContiguous   ; (R16, r18, r19, Z)
 
-        ; read positions and flags into new layout context
-        push r25
-          push yl
-            push yh
-              bigcall LayoutCtx_ReadYDimsContiguous
-            pop yh
-          pop yl
-        pop r25
-      pop r24
+  ; layout
+  bigcall LayoutCtx_GetMaxSize            ; r19:r18=max default size (r18, r19, r20, r21, r24)
+  bigcall LayoutCtx_SetFixedSize          ; (r24)
+  adiw xh:xl, LAYOUT_CTX_OFFS_BORDERS
+  ld r18, X
+  clr r19
+  sbiw xh:xl, LAYOUT_CTX_OFFS_BORDERS
+  bigcall LayoutCtx_SetFixedPos           ; (r24)
 
-      ; layout
-      bigcall LayoutCtx_GetMaxSize        ; r19:r18=max default size (r18, r19, r20, r21, r24)
-      bigcall LayoutCtx_SetFixedSize      ; (r24)
-      push r25
-        bigcall LayoutCtxSetPos           ; (r16-r25)
-      pop r25
+  ; pack
+  bigcall LayoutCtx_PackYContiguous       ; (R16, r18, r19, Z)
 
-      ; pack
-      push r25
-        push yl
-          push yh
-            bigcall LayoutCtx_PackYContiguous
-          pop yh
-        pop yl
-      pop r25
-
-      ; write back dims
-      push r25
-        push yl
-          push yh
-            bigcall LayoutCtx_WriteYDimsContiguous
-          pop yh
-        pop yl
-      pop r25
-    pop yh
-  pop yl
+  ; write back dims
+  bigcall LayoutCtx_WriteYDimsContiguous  ; (R16, r18, r19, Z)
   ret
 ; @end
 
 
 
-
-
-
 ; ---------------------------------------------------------------------------
 ; @routine hLayout2Horizontally
 ;
@@ -276,8 +251,6 @@ hLayout2Horizontally:
 
 
 
-
-
 ; ---------------------------------------------------------------------------
 ; @routine hLayout2PrepareHorizontal
 ;
@@ -322,51 +295,27 @@ hLayout2PrepareHorizontal:
 hLayout2ReadLayoutWriteHorizontal:
   ; layout
   ldd r24, Y+HLAYOUT2_OFFS_MODE
-  push yl
-    push yh
-      push r24
-        bigcall OBJ_GetFirstChild         ; (none)
-        mov yl, r18
-        mov yh, r19
-        ; read X positions and flags into new layout context
-        push r25
-          push yl
-            push yh
-              bigcall LayoutCtx_ReadXDimsContiguous    ; (r16, r18, r19, r24, Y)
-            pop yh
-          pop yl
-        pop r25
-      pop r24
-      ; layout
-      push r25
-        cpi r24, HLAYOUT_MODE_SPREAD
-        breq hLayout2ReadLayoutWriteHorizontal_spread
-        bigcall LayoutCtx_LayoutExpand                 ; (r16-r25)
-        rjmp hLayout2ReadLayoutWriteHorizontal_pack
-hLayout2ReadLayoutWriteHorizontal_spread:
-        bigcall LayoutCtx_LayoutSpread                 ; (r16-r25)
-hLayout2ReadLayoutWriteHorizontal_pack:
-      pop r25
-      ; pack
-      push r25
-        push yl
-          push yh
-            bigcall LayoutCtx_PackXContiguous          ; (r16-r21, r24, r25, Y)
-          pop yh
-        pop yl
-      pop r25
-      
-      ; write back dims
-      push r25
-        push yl
-          push yh
-            bigcall LayoutCtx_WriteXDimsContiguous     ; (r16, r18, r19, r24, Y)
-          pop yh
-        pop yl
-      pop r25
+  ; read X positions and flags into new layout context
+  bigcall LayoutCtx_ReadXDimsContiguous            ; (R16, r18, r19, Z)
 
-    pop yh
-  pop yl
+  ; layout
+  push r25
+    cpi r24, HLAYOUT_MODE_SPREAD
+    breq hLayout2ReadLayoutWriteHorizontal_spread
+    bigcall LayoutCtx_LayoutExpand                 ; (r16-r25)
+    rjmp hLayout2ReadLayoutWriteHorizontal_pack
+hLayout2ReadLayoutWriteHorizontal_spread:
+    bigcall LayoutCtx_LayoutSpread                 ; (r16-r25)
+hLayout2ReadLayoutWriteHorizontal_pack:
+  pop r25
+
+  ; pack
+  push r25
+    bigcall LayoutCtx_PackXContiguous              ; (r16-r21, r24, r25)
+  pop r25
+  
+  ; write back dims
+  bigcall LayoutCtx_WriteXDimsContiguous           ; (r16, r18, r19, r24)
   ret
 ; @end
 
diff --git a/avr/modules/lcd2/gui2/base/layout2.asm b/avr/modules/lcd2/gui2/base/layout2.asm
index 12fa8ea..c6ed4d5 100644
--- a/avr/modules/lcd2/gui2/base/layout2.asm
+++ b/avr/modules/lcd2/gui2/base/layout2.asm
@@ -20,7 +20,7 @@
 .equ LAYOUT_CTX_OFFS_BORDERS      = 2
 .equ LAYOUT_CTX_OFFS_SPACING      = 3
 .equ LAYOUT_CTX_OFFS_NUMITEMS     = 4
-.equ LAYOUT_CTX_OFFS_ITEMS        = 6
+.equ LAYOUT_CTX_OFFS_ITEMS        = 5
 
 .equ LAYOUT_CTX_ITEM_OFFS_POS_LO          = 0
 .equ LAYOUT_CTX_ITEM_OFFS_POS_HI          = 1
@@ -134,6 +134,7 @@ LayoutCtx_free:
 ; @param Y pointer to widget
 ; @return CFLAG set if context created, cleared on error
 ; @return X pointer to newly created context
+; @return R16 number of children
 ; @clobbers any, !Y
 
 LayoutCtx_CreateContextFor1D:
@@ -142,18 +143,39 @@ LayoutCtx_CreateContextFor1D:
   tst r16
   clc
   breq LayoutCtx_CreateContextFor1D_ret
+  rcall LayoutCtx_CreateContextForN
+LayoutCtx_CreateContextFor1D_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine LayoutCtx_CreateContextForN @global
+;
+; @param Y pointer to widget
+; @param R16  number of items
+; @return CFLAG set if context created, cleared on error
+; @return X pointer to newly created context
+; @clobbers any, !R16, !Y
+
+LayoutCtx_CreateContextForN:
+  tst r16
+  clc
+  breq LayoutCtx_CreateContextForN_ret
   push r16
     bigcall LayoutCtx_new               ; X=new ctx (r16, r17, r18, r19, r24, r25)
   pop r16
-  brcc LayoutCtx_CreateContextFor1D_ret
+  brcc LayoutCtx_CreateContextForN_ret
   ; set borders and spacing in layout context
   bigcall Widget_GetBorderAndSpacing    ; (none)
   adiw xh:xl, LAYOUT_CTX_OFFS_BORDERS
   st X+, r23                            ; store border
-  st X, r22                             ; store spacing
-  sbiw xh:xl, (LAYOUT_CTX_OFFS_BORDERS+1)
+  st X+, r22                            ; store spacing
+  st X, r16                             ; store number of items
+  sbiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS  ; back to beginning
   sec
-LayoutCtx_CreateContextFor1D_ret:
+LayoutCtx_CreateContextForN_ret:
   ret
 ; @end
 
@@ -168,7 +190,7 @@ LayoutCtx_CreateContextFor1D_ret:
 LayoutCtx_LayoutExpand:
   rcall layoutCtxCalcExpandPerExpandableItem  ; r17:r16=space to add to expandable items (r16-r25)
   rcall layoutCtxSetSizeWithExtra             ; (r20, r21, r22, r24)
-  rcall LayoutCtxSetPos                       ; (r16-r25)
+  rcall LayoutCtx_SetPos                      ; (r16-r25)
   ret
 ; @end
 
@@ -222,6 +244,7 @@ LayoutCtx_GetMaxSize_loop:
 LayoutCtx_GetMaxSize_next:
         adiw xh:xl, LAYOUT_CTX_ITEM_SIZE
         dec r24
+      brne LayoutCtx_GetMaxSize_loop
     pop xh
   pop xl
   ret
@@ -247,6 +270,33 @@ LayoutCtx_SetFixedSize_loop:
         st X, r19
         adiw xh:xl, (LAYOUT_CTX_ITEM_SIZE-LAYOUT_CTX_ITEM_OFFS_SIZE_HI)
         dec r24
+      brne LayoutCtx_SetFixedSize_loop
+    pop xh
+  pop xl
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine LayoutCtx_SetFixedPos
+;
+; @param X pointer to ctx
+; @param r19:r18 new pos
+; @clobbers r24
+
+LayoutCtx_SetFixedPos:
+  push xl
+    push xh
+      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
+      ld r24, X+                                             ; X now points to first item
+LayoutCtx_SetFixedPos_loop:
+        adiw xh:xl, LAYOUT_CTX_ITEM_OFFS_POS_LO
+        st X+, r18
+        st X, r19
+        adiw xh:xl, (LAYOUT_CTX_ITEM_SIZE-LAYOUT_CTX_ITEM_OFFS_POS_HI)
+        dec r24
+      brne LayoutCtx_SetFixedPos_loop
     pop xh
   pop xl
   ret
@@ -299,14 +349,14 @@ layoutCtxSetSizeWithExtra_store:
 
 
 ; ---------------------------------------------------------------------------
-; @routine LayoutCtxSetPos
+; @routine LayoutCtx_SetPos
 ;
-; Layout items in their dimension according to their packing flags.
+; Set pos of all items.
 ;
 ; @param X pointer to layout context
 ; @clobbers r16-r25
 
-LayoutCtxSetPos:
+LayoutCtx_SetPos:
   push xl
     push xh
       adiw xh:xl, LAYOUT_CTX_OFFS_BORDERS
@@ -315,7 +365,7 @@ LayoutCtxSetPos:
       ld r22, X+                                     ; spacing
       clr r23
       ld r24, X+                                     ; number of items (X now points to first item)
-LayoutCtxSetPos_loop:                                ; r19:r18=current pos, r22=spacing, r23=border, X=1st item
+LayoutCtx_SetPos_loop:                                ; r19:r18=current pos, r22=spacing, r23=border, X=1st item
         adiw xh:xl, LAYOUT_CTX_ITEM_OFFS_POS_LO      ; store pos
         st X+, r18
         st X, r19
@@ -330,7 +380,7 @@ LayoutCtxSetPos_loop:                                ; r19:r18=current pos, r22=
         adc r19, r23
         adiw xh:xl, LAYOUT_CTX_ITEM_SIZE             ; next item
         dec r24
-      brne LayoutCtxSetPos_loop
+      brne LayoutCtx_SetPos_loop
     pop xh
   pop xl
   ret
@@ -387,6 +437,7 @@ layoutCtxSetPosWithExtra_loop:                   ; r19:r18=current pos, r22=spac
 ; @routine layoutCtxPack
 ;
 ; @param  X       pointer to current item
+; @param  Y       current widget
 ; @param  r21:r20 default size of the widget
 ; @return r19:r18 calculated pos
 ; @return r21:r20 calculated size
@@ -424,10 +475,6 @@ layoutCtxPack_center:
 layoutCtxPack_filled:
   add r16, r20                 ; get total size back
   adc r17, r21
-  adiw xh:xl, LAYOUT_CTX_ITEM_OFFS_SIZE_LO
-  st X+, r16                   ; set item to full size
-  st X, r17
-  sbiw xh:xl, (LAYOUT_CTX_ITEM_OFFS_SIZE_LO+1)
   mov r20, r16
   mov r21, r17
 layoutCtxPack_done:
@@ -608,19 +655,13 @@ LayoutCtx_CountExpandableItems_next:
 ; @routine LayoutCtx_ReadXDimsContiguous
 ;
 ; @param X pointer to ctx
-; @param Y pointer to first widget to handle
-; @param r25 number of widgets to handle
-; @clobbers (r16, r18, r19, r24, Y)
+; @param Y pointer to widget
+; @clobbers R16, r18, r19, r24, Z
 
 LayoutCtx_ReadXDimsContiguous:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_CONT layoutCtxCbCopyWidgetXToItem    ; (r16, r18, r19, r24, Y)
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbCopyWidgetXToItem)
+  ldi zh, HIGH(layoutCtxCbCopyWidgetXToItem)
+  rjmp layoutCtxForEveryChildContiguous      ; (R16, r18, r19, r24)
 ; @end
 
 
@@ -633,14 +674,30 @@ LayoutCtx_ReadXDimsContiguous:
 ; @param r25 number of widgets to skip in each round
 
 LayoutCtx_ReadXDimsSkipped:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_SKIPPED layoutCtxCbCopyWidgetXToItem
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbCopyWidgetXToItem)
+  ldi zh, HIGH(layoutCtxCbCopyWidgetXToItem)
+  rjmp layoutCtxForEveryChildSkipped
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine LayoutCtx_ReadXMaxDimsHorizontal
+;
+; Read pos and size from first row and then check next rows. Determine the
+; highest width of every column and also set item flags to FILLED if any
+; widget of a column has this pack mode.
+;
+; @param X pointer to ctx
+; @param Y pointer to widget
+; @param r25 number of widgets to handle per row
+; @clobbers r16-r20, r24, Y
+
+LayoutCtx_ReadXMaxDimsHorizontal:
+  rcall layoutCtxResetAllItems                         ; (R16, R17)
+  ldi zl, LOW(layoutCtxCbMaxWidgetTmpToItemHPackIncX)
+  ldi zh, HIGH(layoutCtxCbMaxWidgetTmpToItemHPackIncX)
+  rjmp LayoutCtx_MultiActionHorizontal                 ; (r16-r20, r24)
 ; @end
 
 
@@ -651,17 +708,12 @@ LayoutCtx_ReadXDimsSkipped:
 ; @param X pointer to ctx
 ; @param Y pointer to first widget to handle
 ; @param r25 number of widgets to handle
-; @clobbers r16, r18, r19, r24, Y
+; @clobbers R16, r18, r19, r24, Z
 
 LayoutCtx_WriteXDimsContiguous:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_CONT layoutCtxCbCopyItemToWidgetX    ; (r16, r18, r19, Y)
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbCopyItemToWidgetX)
+  ldi zh, HIGH(layoutCtxCbCopyItemToWidgetX)
+  rjmp layoutCtxForEveryChildContiguous       ; (R16, r18, r19, r24)
 ; @end
 
 
@@ -670,18 +722,13 @@ LayoutCtx_WriteXDimsContiguous:
 ; @routine LayoutCtx_WriteXDimsSkipped
 ;
 ; @param X pointer to ctx
-; @param Y pointer to first widget to handle
+; @param Y pointer to widget
 ; @param r25 number of widgets to skip in each round
 
 LayoutCtx_WriteXDimsSkipped:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_SKIPPED layoutCtxCbCopyItemToWidgetX
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbCopyItemToWidgetX)
+  ldi zh, HIGH(layoutCtxCbCopyItemToWidgetX)
+  rjmp layoutCtxForEveryChildSkipped
 ; @end
 
 
@@ -690,18 +737,14 @@ LayoutCtx_WriteXDimsSkipped:
 ; @routine LayoutCtx_ReadYDimsContiguous
 ;
 ; @param X pointer to ctx
-; @param Y pointer to first widget to handle
+; @param Y pointer to widget
 ; @param r25 number of widgets to handle
+; @clobbers R16, r18, r19, r24, Z
 
 LayoutCtx_ReadYDimsContiguous:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_CONT layoutCtxCbCopyWidgetYToItem
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbCopyWidgetYToItem)
+  ldi zh, HIGH(layoutCtxCbCopyWidgetYToItem)
+  rjmp layoutCtxForEveryChildContiguous       ; (R16, r18, r19, r24)
 ; @end
 
 
@@ -714,11 +757,51 @@ LayoutCtx_ReadYDimsContiguous:
 ; @param r25 number of widgets to skip in each round
 
 LayoutCtx_ReadYDimsSkipped:
+  ldi zl, LOW(layoutCtxCbCopyWidgetYToItem)
+  ldi zh, HIGH(layoutCtxCbCopyWidgetYToItem)
+  rjmp layoutCtxForEveryChildSkipped
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine LayoutCtx_ReadYMaxDimsVertical
+;
+; Same as LayoutCtx_ReadXMaxDimsContinuous but for height and skipped.
+;
+; @param X pointer to ctx
+; @param Y pointer to widget containing childs to handle
+; @param r25 number of widgets in a row
+; @clobbers r16-r20, Z
+
+LayoutCtx_ReadYMaxDimsVertical:
+  rcall layoutCtxResetAllItems                         ; (R16, R17)
+  ldi zl, LOW(layoutCtxCbMaxWidgetTmpToItemVPackNoIncX)
+  ldi zh, HIGH(layoutCtxCbMaxWidgetTmpToItemVPackNoIncX) ; (r16-r20)
+  rjmp LayoutCtx_MultiActionVertical                     ; (r16-r20)
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxResetAllItems
+;
+; @param X pointer to ctx
+; @clobbers r16, r17
+
+layoutCtxResetAllItems:
   push xl
     push xh
       adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_SKIPPED layoutCtxCbCopyWidgetYToItem
+      ld r17, X+                             ; X now points to first item
+      tst r17
+      breq layoutCtxResetAllItems_done
+layoutCtxResetAllItems_loop:
+        rcall layoutCtxResetItem             ; (R16)
+        adiw xh:xl, LAYOUT_CTX_ITEM_SIZE
+        dec r17
+      brne layoutCtxResetAllItems_loop
+layoutCtxResetAllItems_done:
     pop xh
   pop xl
   ret
@@ -726,22 +809,73 @@ LayoutCtx_ReadYDimsSkipped:
 
 
 
+; ---------------------------------------------------------------------------
+; @routine layoutCtxResetItem
+;
+; @param X pointer to item
+; @clobbers r16
+
+layoutCtxResetItem:
+  clr r16
+  st X+, r16                             ; LAYOUT_CTX_ITEM_OFFS_POS_LO
+  st X+, r16                             ; LAYOUT_CTX_ITEM_OFFS_POS_HI
+  st X+, r16                             ; LAYOUT_CTX_ITEM_OFFS_SIZE_LO
+  st X+, r16                             ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
+  dec r16
+  st X, r16                              ; LAYOUT_CTX_ITEM_OFFS_FLAGS (write 0xff)
+  sbiw xh:xl, LAYOUT_CTX_ITEM_OFFS_FLAGS
+  ret
+; @end
+
+
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine LayoutCtx_PackYVertical
+;
+; @param X pointer to ctx
+; @param Y pointer to widget containing childs to handle
+; @param r25 number of widgets in a row
+; @clobbers r16, r18, r19, r24, Z
+
+LayoutCtx_PackYVertical:
+  ldi zl, LOW(layoutCtxCbPackYNoIncX)
+  ldi zh, HIGH(layoutCtxCbPackYNoIncX)
+  rjmp LayoutCtx_MultiActionVertical    ; (r16, r18, r19, r24)
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine LayoutCtx_PackXHorizontal
+;
+; @param X pointer to ctx
+; @param Y pointer to widget containing childs to handle
+; @param r25 number of widgets in a row
+; @clobbers r16, r18, r19, r24, Z
+
+LayoutCtx_PackXHorizontal:
+  ldi zl, LOW(layoutCtxCbPackXIncX)
+  ldi zh, HIGH(layoutCtxCbPackXIncX)
+  rjmp LayoutCtx_MultiActionHorizontal  ; (r16, r18, r19)
+; @end
+
+
+
 ; ---------------------------------------------------------------------------
 ; @routine LayoutCtx_WriteYDimsContiguous
 ;
 ; @param X pointer to ctx
 ; @param Y pointer to first widget to handle
 ; @param r25 number of widgets to handle
+; @clobbers R16, r18, r19, r24, Z
 
 LayoutCtx_WriteYDimsContiguous:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_CONT layoutCtxCbCopyItemToWidgetY
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbCopyItemToWidgetYIncX)
+  ldi zh, HIGH(layoutCtxCbCopyItemToWidgetYIncX)
+  rjmp layoutCtxForEveryChildContiguous       ; (R16, r18, r19, r24)
 ; @end
 
 
@@ -754,14 +888,9 @@ LayoutCtx_WriteYDimsContiguous:
 ; @param r25 number of widgets to skip in each round
 
 LayoutCtx_WriteYDimsSkipped:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_SKIPPED layoutCtxCbCopyItemToWidgetY
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbCopyItemToWidgetYIncX)
+  ldi zh, HIGH(layoutCtxCbCopyItemToWidgetYIncX)
+  rjmp layoutCtxForEveryChildSkipped       ; (R16, r18, r19)
 ; @end
 
 
@@ -770,21 +899,15 @@ LayoutCtx_WriteYDimsSkipped:
 ; @routine LayoutCtx_PackXContiguous
 ;
 ; @param X pointer to ctx
-; @param Y pointer to first widget to handle
-; @param r25 number of widgets to handle
+; @param Y pointer to widget
 ; @return CFLAG set if more widgets to handle, cleared otherwise
 ; @return Y pointer to next widget to handle (if CFLAG set)
-; @clobbers r16-r21, r24, r25, Y
+; @clobbers r16-r21, r24, r25
 
 LayoutCtx_PackXContiguous:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_CONT layoutCtxCbPackX                ; (r16-r21, r25, Y)
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbPackXIncX)
+  ldi zh, HIGH(layoutCtxCbPackXIncX)
+  rjmp layoutCtxForEveryChildContiguous       ; (r16-r21, r24, r25)
 ; @end
 
 
@@ -799,14 +922,9 @@ LayoutCtx_PackXContiguous:
 ; @return Y pointer to next widget to handle (if CFLAG set)
 
 LayoutCtx_PackXSkipped:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_SKIPPED layoutCtxCbPackX
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbPackXIncX)
+  ldi zh, HIGH(layoutCtxCbPackXIncX)
+  rjmp layoutCtxForEveryChildSkipped       ; (R16, r18, r19)
 ; @end
 
 
@@ -819,16 +937,12 @@ LayoutCtx_PackXSkipped:
 ; @param r25 number of widgets to handle
 ; @return CFLAG set if more widgets to handle, cleared otherwise
 ; @return Y pointer to next widget to handle (if CFLAG set)
+; @clobbers R16, r18, r19, r24, Z
 
 LayoutCtx_PackYContiguous:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_CONT layoutCtxCbPackY
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbPackYIncX)
+  ldi zh, HIGH(layoutCtxCbPackYIncX)
+  rjmp layoutCtxForEveryChildContiguous       ; (R16, r18, r19, r24)
 ; @end
 
 
@@ -843,14 +957,9 @@ LayoutCtx_PackYContiguous:
 ; @return Y pointer to next widget to handle (if CFLAG set)
 
 LayoutCtx_PackYSkipped:
-  push xl
-    push xh
-      adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
-      ld r24, X+                                             ; X now points to first item
-      M_LAYOUT_FOREVERY_SKIPPED layoutCtxCbPackY
-    pop xh
-  pop xl
-  ret
+  ldi zl, LOW(layoutCtxCbPackYIncX)
+  ldi zh, HIGH(layoutCtxCbPackYIncX)
+  rjmp layoutCtxForEveryChildSkipped       ; (R16, r18, r19)
 ; @end
 
 
@@ -864,16 +973,12 @@ LayoutCtx_PackYSkipped:
 ; ---------------------------------------------------------------------------
 ; @routine layoutCtxCbCopyWidgetXToItem
 ;
-; @param Y widget
-; @param X item
-; @param r24 number of items left in layout context (gets decreased)
+; @param  Y   widget
+; @param  X   item
+; @return X   next item
 ; @clobbers r16
 
 layoutCtxCbCopyWidgetXToItem:
-  tst r24
-  sec
-  breq layoutCtxCbCopyWidgetXToItem_ret
-  
   ldd r16, Y+WIDGET_OFFS_X_LO
   st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_POS_LO
   ldd r16, Y+WIDGET_OFFS_X_HI
@@ -882,15 +987,10 @@ layoutCtxCbCopyWidgetXToItem:
   st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_LO
   ldd r16, Y+WIDGET_OFFS_TMP_HI
   st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
-  clr r16
-  st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_DEFAULTSIZE_LO
-  st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_DEFAULTSIZE_HI
   ldd r16, Y+WIDGET_OFFS_PACK
   andi r16, (1<<WIDGET_PACK_HSELF0_BIT) | (1<<WIDGET_PACK_HSELF1_BIT)
   st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_FLAGS
-  dec r24
   clc
-layoutCtxCbCopyWidgetXToItem_ret:
   ret
 ; @end
 
@@ -899,27 +999,23 @@ layoutCtxCbCopyWidgetXToItem_ret:
 ; ---------------------------------------------------------------------------
 ; @routine layoutCtxCbCopyItemToWidgetX
 ;
-; @param Y widget
-; @param X item
-; @param r24 number of items left in layout context (gets decremented)
+; @param  Y   widget
+; @param  X   item
+; @param  r24 number of items left in layout context (gets decremented)
+; @return X   next item
 ; @clobbers r16
 
 layoutCtxCbCopyItemToWidgetX:
-  tst r24
-  sec
-  breq layoutCtxCbCopyItemToWidgetX_ret
   ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_POS_LO
   std Y+WIDGET_OFFS_X_LO, r16
   ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_POS_HI
   std Y+WIDGET_OFFS_X_HI, r16
   ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_LO
   std Y+WIDGET_OFFS_WIDTH_LO, r16
-  ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
+  ld r16, X                         ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
   std Y+WIDGET_OFFS_WIDTH_HI, r16
-  adiw xh:xl, 3
-  dec r24
+  adiw xh:xl, (LAYOUT_CTX_ITEM_SIZE-LAYOUT_CTX_ITEM_OFFS_SIZE_HI)
   clc
-layoutCtxCbCopyItemToWidgetX_ret:
   ret
 ; @end
 
@@ -928,15 +1024,12 @@ layoutCtxCbCopyItemToWidgetX_ret:
 ; ---------------------------------------------------------------------------
 ; @routine layoutCtxCbCopyWidgetYToItem
 ;
-; @param Y widget
-; @param X item
-; @param r24 number of items left in layout context
+; @param  Y   widget
+; @param  X   item
+; @return X   next item
+; @clobbers r16
 
 layoutCtxCbCopyWidgetYToItem:
-  tst r24
-  sec
-  breq layoutCtxCbCopyWidgetYToItem_ret
-  
   ldd r16, Y+WIDGET_OFFS_Y_LO
   st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_POS_LO
   ldd r16, Y+WIDGET_OFFS_Y_HI
@@ -945,107 +1038,442 @@ layoutCtxCbCopyWidgetYToItem:
   st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_LO
   ldd r16, Y+WIDGET_OFFS_TMP_HI
   st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
-  clr r16
-  st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_DEFAULTSIZE_LO
-  st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_DEFAULTSIZE_HI
   ldd r16, Y+WIDGET_OFFS_PACK
   andi r16, (1<<WIDGET_PACK_VSELF0_BIT) | (1<<WIDGET_PACK_VSELF1_BIT)
   lsr r16
   lsr r16
   st X+, r16                        ; LAYOUT_CTX_ITEM_OFFS_FLAGS
-  dec r24
   clc
-layoutCtxCbCopyWidgetYToItem_ret:
   ret
 ; @end
 
 
 
 ; ---------------------------------------------------------------------------
-; @routine layoutCtxCbCopyItemToWidgetY
+; @routine layoutCtxCbMaxWidgetTmpToItemHPackNoIncX
 ;
 ; @param Y widget
 ; @param X item
-; @param r24 number of items left in layout context
+; @clobbers r16-r20
 
-layoutCtxCbCopyItemToWidgetY:
-  tst r24
-  sec
-  breq layoutCtxCbCopyItemToWidgetY_ret
+layoutCtxCbMaxWidgetTmpToItemHPackNoIncX:
+  ldd r20, Y+WIDGET_OFFS_PACK
+  andi r20, (1<<WIDGET_PACK_HSELF0_BIT) | (1<<WIDGET_PACK_HSELF1_BIT)
+  rcall layoutCtxCopyWidgetTmpToItemSizeNoIncX
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxCbMaxWidgetTmpToItemHPackIncX
+;
+; @param Y widget
+; @param X item
+; @clobbers r16-r20
+
+layoutCtxCbMaxWidgetTmpToItemHPackIncX:
+  ldd r20, Y+WIDGET_OFFS_PACK
+  andi r20, (1<<WIDGET_PACK_HSELF0_BIT) | (1<<WIDGET_PACK_HSELF1_BIT)
+  rcall layoutCtxCopyWidgetTmpToItemSizeNoIncX
+  adiw xh:xl, LAYOUT_CTX_ITEM_SIZE
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxCbMaxWidgetTmpToItemVPackNoIncX
+;
+; @param Y widget
+; @param X item
+; @clobbers r16-r20
+
+layoutCtxCbMaxWidgetTmpToItemVPackNoIncX:
+  ldd r20, Y+WIDGET_OFFS_PACK
+  andi r20, (1<<WIDGET_PACK_VSELF0_BIT) | (1<<WIDGET_PACK_VSELF1_BIT)
+  lsr r20
+  lsr r20
+  andi r20, 3
+  rcall layoutCtxCopyWidgetTmpToItemSizeNoIncX ; (r16-r19)
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxCbMaxWidgetTmpToItemVPackIncX
+;
+; @param Y widget
+; @param X item
+; @clobbers r16-r20
+
+layoutCtxCbMaxWidgetTmpToItemVPackIncX:
+  ldd r20, Y+WIDGET_OFFS_PACK
+  andi r20, (1<<WIDGET_PACK_VSELF0_BIT) | (1<<WIDGET_PACK_VSELF1_BIT)
+  lsr r20
+  lsr r20
+  rcall layoutCtxCopyWidgetTmpToItemSizeNoIncX ; (r16-r19)
+  adiw xh:xl, LAYOUT_CTX_ITEM_SIZE
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxCopyWidgetTmpToItemSizeNoIncX
+;
+; @param Y widget
+; @param X item
+; @param r20 widget pack transformed to item flags
+; @clobbers r16-r19
+
+layoutCtxCopyWidgetTmpToItemSizeNoIncX:
+  ldd r16, Y+WIDGET_OFFS_TMP_LO
+  ldd r17, Y+WIDGET_OFFS_TMP_HI
+
+  adiw xh:xl, LAYOUT_CTX_ITEM_OFFS_SIZE_LO
+  ld r18, X+                                    ; LAYOUT_CTX_ITEM_OFFS_SIZE_LO
+  ld r19, X                                     ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
+  cp r18, r16
+  cpc r19, r17
+  brcc layoutCtxCopyWidgetTmpToItemSizeNoIncX_checkFlags
+  st X, r17                                     ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
+  st -X, r16                                    ; LAYOUT_CTX_ITEM_OFFS_SIZE_LO
+  adiw xh:xl, 1                                 ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
+layoutCtxCopyWidgetTmpToItemSizeNoIncX_checkFlags:
+  adiw xh:xl, 1                                 ; LAYOUT_CTX_ITEM_OFFS_FLAGS
+  ld r17, X                                     ; LAYOUT_CTX_ITEM_OFFS_FLAGS
+  cpi r17, 0xff
+  breq layoutCtxCopyWidgetTmpToItemSizeNoIncX_storeFlags
+  cpi r20, WIDGET_PACK_FILLED
+  brne layoutCtxCopyWidgetTmpToItemSizeNoIncX_done
+layoutCtxCopyWidgetTmpToItemSizeNoIncX_storeFlags:
+  st X, r20
+layoutCtxCopyWidgetTmpToItemSizeNoIncX_done:
+  sbiw xh:xl, LAYOUT_CTX_ITEM_OFFS_FLAGS
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxCbCopyItemToWidgetYIncX
+;
+; @param  Y   widget
+; @param  X   item
+; @return X   pointer to next item
+; @clobbers r16
+
+layoutCtxCbCopyItemToWidgetYIncX:
   ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_POS_LO
   std Y+WIDGET_OFFS_Y_LO, r16
   ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_POS_HI
   std Y+WIDGET_OFFS_Y_HI, r16
   ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_LO
   std Y+WIDGET_OFFS_HEIGHT_LO, r16
-  ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
+  ld r16, X                         ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
   std Y+WIDGET_OFFS_HEIGHT_HI, r16
-  adiw xh:xl, 3
-  dec r24
+  adiw xh:xl, (LAYOUT_CTX_ITEM_SIZE-LAYOUT_CTX_ITEM_OFFS_SIZE_HI)
   clc
-layoutCtxCbCopyItemToWidgetY_ret:
   ret
 ; @end
 
 
 
 ; ---------------------------------------------------------------------------
-; @routine layoutCtxCbPackX
+; @routine layoutCtxCbCopyItemToWidgetYNoXInc
+;
+; @param  Y   widget
+; @param  X   item
+; @clobbers r16
+
+layoutCtxCbCopyItemToWidgetYNoXInc:
+  ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_POS_LO
+  std Y+WIDGET_OFFS_Y_LO, r16
+  ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_POS_HI
+  std Y+WIDGET_OFFS_Y_HI, r16
+  ld r16, X+                        ; LAYOUT_CTX_ITEM_OFFS_SIZE_LO
+  std Y+WIDGET_OFFS_HEIGHT_LO, r16
+  ld r16, X                         ; LAYOUT_CTX_ITEM_OFFS_SIZE_HI
+  std Y+WIDGET_OFFS_HEIGHT_HI, r16
+  sbiw xh:xl, LAYOUT_CTX_ITEM_OFFS_SIZE_HI
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxCbPackXIncX
 ;
 ; @param Y widget
 ; @param X item
-; @param r24 number of items left in layout context (gets decremented)
 ; @clobbers r16-r21, r25
 
-layoutCtxCbPackX:
-  tst r24
-  sec
-  breq layoutCtxCbPackX_ret
-
+layoutCtxCbPackXIncX:
   ldd r20, Y+WIDGET_OFFS_TMP_LO
-  ldd r21, Y+WIDGET_OFFS_TMP_LO
-  rcall layoutCtxPack             ; (r16-r19, r25)
+  ldd r21, Y+WIDGET_OFFS_TMP_HI
+  rcall layoutCtxPack               ; (r16-r19, r25)
   std Y+WIDGET_OFFS_X_LO, r18
   std Y+WIDGET_OFFS_X_HI, r19
   std Y+WIDGET_OFFS_WIDTH_LO, r20
   std Y+WIDGET_OFFS_WIDTH_HI, r21
   adiw xh:xl, LAYOUT_CTX_ITEM_SIZE
-  dec r24
   clc
-layoutCtxCbPackX_ret:
   ret
 ; @end
 
 
 
 ; ---------------------------------------------------------------------------
-; @routine layoutCtxCbPackY
+; @routine layoutCtxCbPackXNoIncX
 ;
 ; @param Y widget
 ; @param X item
-; @param r24 number of items left in layout context
-
-layoutCtxCbPackY:
-  tst r24
-  sec
-  breq layoutCtxCbPackY_ret
+; @clobbers r16-r21, r25
 
+layoutCtxCbPackXNoIncX:
   ldd r20, Y+WIDGET_OFFS_TMP_LO
-  ldd r21, Y+WIDGET_OFFS_TMP_LO
-  rcall layoutCtxPack
-  std Y+WIDGET_OFFS_Y_LO, r18
-  std Y+WIDGET_OFFS_Y_HI, r19
-  std Y+WIDGET_OFFS_HEIGHT_LO, r20
-  std Y+WIDGET_OFFS_HEIGHT_HI, r21
-  adiw xh:xl, LAYOUT_CTX_ITEM_SIZE
-  dec r24
+  ldd r21, Y+WIDGET_OFFS_TMP_HI
+  rcall layoutCtxPack               ; (r16-r19, r25)
+  std Y+WIDGET_OFFS_X_LO, r18
+  std Y+WIDGET_OFFS_X_HI, r19
+  std Y+WIDGET_OFFS_WIDTH_LO, r20
+  std Y+WIDGET_OFFS_WIDTH_HI, r21
   clc
-layoutCtxCbPackY_ret:
   ret
 ; @end
 
 
 
+; ---------------------------------------------------------------------------
+; @routine layoutCtxCbPackYIncX
+;
+; @param  Y   widget
+; @param  X   item
+; @return X   next item
+; @clobbers r16-r21, r25
+
+layoutCtxCbPackYIncX:
+  rcall layoutCtxCbPackYNoIncX
+  adiw xh:xl, LAYOUT_CTX_ITEM_SIZE
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxCbPackYNoIncX
+;
+; @param Y   widget
+; @param X   item
+; @clobbers r16-r21, r25
+
+layoutCtxCbPackYNoIncX:
+  ldd r20, Y+WIDGET_OFFS_TMP_LO
+  ldd r21, Y+WIDGET_OFFS_TMP_HI
+  rcall layoutCtxPack               ; (r16-r19, r25)
+  std Y+WIDGET_OFFS_Y_LO, r18
+  std Y+WIDGET_OFFS_Y_HI, r19
+  std Y+WIDGET_OFFS_HEIGHT_LO, r20
+  std Y+WIDGET_OFFS_HEIGHT_HI, r21
+  clc
+  ret
+; @end
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Layout_CountChildrenSkipped
+;
+; @param X pointer to ctx
+; @param Y pointer to first widget to handle
+; @param r25 number of widgets to skip in each round
+; @return r16 number of items in skipped mode (e.g. number of rows)
+; @clobbers r18, r19
+
+Layout_CountChildrenSkipped:
+  push yl
+    push yh
+      clr r16
+      bigcall OBJ_GetFirstChild
+      brcc Layout_CountChildrenSkipped_done
+      mov yl, r18
+      mov yh, r19
+      M_LAYOUT_FOREVERY_SKIPPED layoutCbCount   ; (r18, r19)
+Layout_CountChildrenSkipped_done:
+    pop yh
+  pop yl
+  ret
+; @end
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCbCount
+;
+; @param Y widget
+; @clobbers none
+
+layoutCbCount:
+  inc r16
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine LayoutCtx_MultiActionVertical
+;
+;
+; @param X pointer to ctx
+; @param Y pointer to widget containing childs to handle
+; @param r25 number of widgets in a row
+; @param Z routine to call on every child widget
+; @clobbers r18, r19, {any}, !r25, !X, !Y
+
+LayoutCtx_MultiActionVertical:
+  bigcall OBJ_GetFirstChild
+  brcc LayoutCtx_MultiActionVertical_ret
+  push yl
+    push yh
+      push xl
+        push xh
+          adiw xh:xl, LAYOUT_CTX_OFFS_ITEMS
+LayoutCtx_MultiActionVertical_loop:
+            mov yl, r18
+            mov yh, r19
+              rcall layoutForEveryObjectContiguous   ; (r18, r19, {any}, !r25)
+            bigcall OBJ_GetNext
+            brcc LayoutCtx_MultiActionVertical_done
+            adiw xh:xl, LAYOUT_CTX_ITEM_SIZE
+          rjmp LayoutCtx_MultiActionVertical_loop
+LayoutCtx_MultiActionVertical_done:
+        pop xh
+      pop xl
+    pop yh
+  pop yl  
+LayoutCtx_MultiActionVertical_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine LayoutCtx_MultiActionHorizontal
+;
+;
+; @param X pointer to ctx
+; @param Y pointer to widget containing children to work on
+; @param r25 number of widgets to handle per row
+; @param Z routine to call on every child widget
+; @clobbers r16, r18, r19, r24
+
+LayoutCtx_MultiActionHorizontal:
+  bigcall OBJ_GetFirstChild
+  brcc LayoutCtx_MultiActionHorizontal_ret
+  push yl
+    push yh
+      push xl
+        push xh
+          adiw xh:xl, LAYOUT_CTX_OFFS_ITEMS
+LayoutCtx_MultiActionHorizontal_loop:
+            mov yl, r18
+            mov yh, r19
+              push xl                                    ; first item
+                push xh
+                  rcall layoutForEveryObjectContiguous   ; (r18, r19, Y {any})
+                pop xh
+              pop xl                                     ; first item
+            bigcall OBJ_GetNext
+            brcc LayoutCtx_MultiActionHorizontal_done
+          rjmp LayoutCtx_MultiActionHorizontal_loop
+LayoutCtx_MultiActionHorizontal_done:
+        pop xh
+      pop xl
+    pop yh
+  pop yl  
+LayoutCtx_MultiActionHorizontal_ret:
+  ret
+; @end
+
+
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxForEveryChildContiguous
+;
+; @param X pointer to ctx
+; @param Y pointer to first widget to handle
+; @param Z routine to call
+; @clobbers r18, r19, r24, {any}, !r25, !X, !Y
+
+layoutCtxForEveryChildContiguous:
+  bigcall OBJ_GetFirstChild
+  brcc layoutCtxForEveryChildContiguous_ret
+  push yl
+    push yh
+      mov yl, r18
+      mov yh, r19
+      push xl
+        push xh
+          push r25
+            adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
+            ld r24, X+                              ; X now points to first item
+            clr r25
+            rcall layoutForEveryObjectContiguous    ; (r18, r19, Y {any})
+          pop r25
+        pop xh
+      pop xl
+    pop yh
+  pop yl
+layoutCtxForEveryChildContiguous_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine layoutCtxForEveryChildSkipped
+;
+; @param X   pointer to ctx
+; @param Y   pointer to first widget to handle
+; @param Z   routine to call
+; @param r25 number of widgets per row
+; @clobbers any, !r25, !X, !Y
+
+layoutCtxForEveryChildSkipped:
+  bigcall OBJ_GetFirstChild
+  brcc layoutCtxForEveryChildSkipped_ret
+  push yl
+    push yh
+      mov yl, r18
+      mov yh, r19
+      push xl
+        push xh
+          push r25
+            adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
+            ld r24, X+                                             ; X now points to first item
+            rcall layoutForEveryObjectSkipped
+          pop r25
+        pop xh
+      pop xl
+    pop yh
+  pop yl
+layoutCtxForEveryChildSkipped_ret:
+  ret
+; @end
 
 
 
@@ -1189,10 +1617,10 @@ Layout2_SetDefaultWidths_ret:
 ; @clobbers any, !Y
 
 Layout2_SetDefaultHeights:
+  bigcall OBJ_GetFirstChild
+  brcc Layout2_SetDefaultHeights_ret
   push yl
     push yh
-      bigcall OBJ_GetFirstChild
-      brcc Layout2_SetDefaultHeights_ret
 Layout2_SetDefaultHeights_loop:
         mov yl, r18
         mov yh, r19
@@ -1201,9 +1629,9 @@ Layout2_SetDefaultHeights_loop:
         std Y+WIDGET_OFFS_TMP_HI, r19
         bigcall OBJ_GetNext
       brcs Layout2_SetDefaultHeights_loop
-Layout2_SetDefaultHeights_ret:
     pop yh
   pop yl
+Layout2_SetDefaultHeights_ret:
   ret
 ; @end
 
diff --git a/avr/modules/lcd2/gui2/base/mclayout.asm b/avr/modules/lcd2/gui2/base/mclayout.asm
new file mode 100644
index 0000000..eaf72bf
--- /dev/null
+++ b/avr/modules/lcd2/gui2/base/mclayout.asm
@@ -0,0 +1,289 @@
+; ***************************************************************************
+; copyright   : (C) 2026 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_GUI2_MCLAYOUT_ASM
+#define AQH_AVR_GUI2_MCLAYOUT_ASM
+
+
+; ***************************************************************************
+; defines
+
+.equ MCLAYOUT_OFFS_BEGIN      =  WIDGET_SIZE
+.equ MCLAYOUT_OFFS_MODE       =  MCLAYOUT_OFFS_BEGIN+0
+.equ MCLAYOUT_OFFS_COLUMNS    =  MCLAYOUT_OFFS_BEGIN+1
+.equ MCLAYOUT_SIZE            =  MCLAYOUT_OFFS_BEGIN+2
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; @routine MCLayout_new @global
+;
+; @return CFLAG set of okay, cleared otherwise
+; @return Y address of newly created object
+; @param X parent widget
+; @param r16 value for OBJECT_OFFS_OPTS
+; @param r17 value for WIDGET_OFFS_PACK
+; @param r20 number of columns or rows (depending on mode in r20)
+; @clobbers any
+
+MCLayout_new:
+  push r20
+    ldi r24, LOW(MCLAYOUT_SIZE)
+    ldi r25, HIGH(MCLAYOUT_SIZE)
+    bigcall Object_Alloc         ; (!r16, !r17, !X)
+  pop r20
+  brcc MCLayout_new_ret
+  rcall MCLayout_Init               ; (r16, r17, X)
+  sec
+MCLayout_new_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine MCLayout_Init @global
+;
+; @param Y address of widget
+; @param X parent widget (if any)
+; @param r16 value for OBJECT_OFFS_OPTS
+; @param r17 value for WIDGET_OFFS_PACK
+; @param r20 number of columns or rows (depending on mode in r20)
+; @clobbers r16, r17, X
+
+MCLayout_Init:
+  push r20
+    ; call base class
+    bigcall Widget_Init             ; (r16, r17, X)
+  pop r20
+
+  ; set widget-specific data
+  std Y+MCLAYOUT_OFFS_COLUMNS, r20
+
+  ; set default signal map
+  ldi r16, LOW(MCLayout_DefaultSignalmap*2)
+  std Y+OBJECT_OFFS_SIGNALMAP_LO, r16
+  ldi r16, HIGH(MCLayout_DefaultSignalmap*2)
+  std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
+
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine MCLayout_OnGetDefaultHeight
+;
+; @param Y pointer to widget
+; @return r19:r18 value
+; @clobbers any, !Y
+
+MCLayout_OnGetDefaultHeight:
+;  rcall Layout_SetDefaultHeights
+;  rcall Layout_GetMaxTmp
+;  bigcall Widget_AddOuterStyleBorders   ; (r20, r21)
+  ldi r18, 10
+  clr r19
+  sec
+  ret
+
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine MCLayout_OnGetDefaultWidth
+;
+; @param Y pointer to widget
+; @return r19:r18 value
+; @clobbers any, !Y
+
+MCLayout_OnGetDefaultWidth:
+;  rcall Layout_SetDefaultWidths
+;  rcall Layout_SumTmpValues     ; r19:r18=default width
+  ldi r18, 10
+  clr r19
+  sec
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine MCLayout_OnLayout
+;
+; @param Y pointer to widget
+; @clobbers any, !Y
+
+MCLayout_OnLayout:
+  ldd r25, Y+MCLAYOUT_OFFS_COLUMNS
+  rcall Layout_CountChildrenSkipped   ; r16=number of rows used (r18, r19)
+
+  mov r24, r16                        ; store for later
+  ldd r17, Y+MCLAYOUT_OFFS_COLUMNS
+  cp r16, r17
+  brcc MCLayout_OnLayout_mkCtx
+  mov r16, r17
+MCLayout_OnLayout_mkCtx:
+  ; create and preset context
+  push r24                                ; num of children
+    rcall LayoutCtx_CreateContextForN     ; X=ctx (any, !R16, !Y)
+  pop r24
+  brcc MCLayout_OnLayout_ret
+  
+  push r24                                ; num of children
+    ldd r24, Y+MCLAYOUT_OFFS_COLUMNS
+    rcall mcLayoutHorizontally
+  pop r24
+  rcall mcLayoutVertically
+  
+  ; release layout context
+  bigcall LayoutCtx_free
+
+  ; force re-drawing of this widget, clear layout bit
+  ldd r16, Y+OBJECT_OFFS_FLAGS
+  sbr r16, (1<<WIDGET_FLAGS_DIRTY_BIT)
+  cbr r16, (1<<WIDGET_FLAGS_LAYOUT_BIT)
+  std Y+OBJECT_OFFS_FLAGS, r16
+MCLayout_OnLayout_ret:
+  sec
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine mcLayoutVertically
+;
+; @param Y pointer to widget
+; @param X layout context
+; @param r24 number of rows
+; @clobbers any, !X, !Y
+
+mcLayoutVertically:
+  ; prepare
+  push xl
+    push xh
+      push r24
+        rcall Layout2_SetDefaultHeights ; (any, !Y)
+      pop r24
+    pop xh
+  pop xl
+
+  ldd r20, Y+WIDGET_OFFS_HEIGHT_LO
+  ldd r21, Y+WIDGET_OFFS_HEIGHT_HI
+  adiw xh:xl, LAYOUT_CTX_OFFS_TOTALSIZE_LO
+  st X+, r20
+  st X, r21
+  sbiw xh:xl, (LAYOUT_CTX_OFFS_TOTALSIZE_LO+1)
+  adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
+  st X, r24
+  sbiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
+
+  ; read positions and flags into new layout context
+  ldd r25, Y+MCLAYOUT_OFFS_COLUMNS
+  bigcall LayoutCtx_ReadYMaxDimsVertical     ; (r16-r20, Z)
+
+  ; layout
+  bigcall LayoutCtx_LayoutExpand             ; (r16-r25)
+
+  ; pack
+  ldd r25, Y+MCLAYOUT_OFFS_COLUMNS
+  rcall LayoutCtx_PackYVertical              ; (r16, r18, r19, r24, Z)
+
+
+;mov zl, yl
+;mov zh, yh
+;bigcall DEBUG_DUMPWDG
+
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine mcLayoutHorizontally
+;
+; @param Y pointer to widget
+; @param X layout context
+; @param r24 number of items to use
+; @clobbers any, !Y
+
+mcLayoutHorizontally:
+  ; prepare
+  push xl
+    push xh
+      push r24
+        rcall Layout2_SetDefaultWidths  ; (any, !Y)
+      pop r24
+    pop xh
+  pop xl
+
+  ; setup layout context for horizontal operations
+  ldd r20, Y+WIDGET_OFFS_WIDTH_LO
+  ldd r21, Y+WIDGET_OFFS_WIDTH_HI
+  adiw xh:xl, LAYOUT_CTX_OFFS_TOTALSIZE_LO
+  st X+, r20
+  st X, r21
+  sbiw xh:xl, (LAYOUT_CTX_OFFS_TOTALSIZE_LO+1)
+  adiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
+  st X, r24
+  sbiw xh:xl, LAYOUT_CTX_OFFS_NUMITEMS
+
+  ; read positions and flags into new layout context
+  ldd r25, Y+MCLAYOUT_OFFS_COLUMNS
+  bigcall LayoutCtx_ReadXMaxDimsHorizontal   ; (r16-r20, Z)
+
+  ; layout
+  bigcall LayoutCtx_LayoutExpand             ; (r16-r25)
+
+  ; pack
+  ldd r25, Y+MCLAYOUT_OFFS_COLUMNS
+  rcall LayoutCtx_PackXHorizontal            ; (r16, r18, r19, r24, Z)
+
+;bigjmp DEBUG_DUMPCTX ; still correct, maybe packXHorizontal doesn't set pos correctly?
+
+;mov zl, yl
+;mov zh, yh
+;bigcall DEBUG_DUMPWDG
+
+  ret
+; @end
+
+
+
+
+
+
+
+
+; ***************************************************************************
+; data in FLASH
+
+MCLayout_DefaultSignalmap:
+  ; header
+  .dw Widget_DefaultSignalmap*2  ; next table to use
+  ; entries
+  .db 0,                           WIDGET_SIGNAL_LAYOUT,   LOW(MCLayout_OnLayout),           HIGH(MCLayout_OnLayout)
+  .db WIDGET_VALUE_DEFAULT_WIDTH,  WIDGET_SIGNAL_GETVALUE, LOW(MCLayout_OnGetDefaultWidth),  HIGH(MCLayout_OnGetDefaultWidth)
+  .db WIDGET_VALUE_DEFAULT_HEIGHT, WIDGET_SIGNAL_GETVALUE, LOW(MCLayout_OnGetDefaultHeight), HIGH(MCLayout_OnGetDefaultHeight)
+
+  .db 0, 0, 0, 0  ; end of table
+
+
+
+#endif
+