diff --git a/avr/devices/c03/main/w_netstats.asm b/avr/devices/c03/main/w_netstats.asm
index 11d77db..73db6b1 100644
--- a/avr/devices/c03/main/w_netstats.asm
+++ b/avr/devices/c03/main/w_netstats.asm
@@ -14,7 +14,7 @@
 ; defines
 
 
-.equ NETSTATWIN_OFFS_BEGIN   = MAINWINDOW_SIZE
+.equ NETSTATWIN_OFFS_BEGIN   = CDIALOG_SIZE
 .equ NETSTATWIN_OFFS_TIMER   = NETSTATWIN_OFFS_BEGIN+0
 .equ NETSTATWIN_SIZE         = NETSTATWIN_OFFS_BEGIN+1
 
@@ -22,6 +22,13 @@
 .equ NETSTATWIN_TIMERVAL              = 50  ; update every 5 secs
 
 
+.equ NETSTATWIN_SEL_PACKETSIN  = 1
+.equ NETSTATWIN_SEL_PACKETSOUT = 2
+.equ NETSTATWIN_SEL_ECONTENT   = 3
+.equ NETSTATWIN_SEL_EIO        = 4
+.equ NETSTATWIN_SEL_EMSGSIZE   = 5
+
+
 
 ; ***************************************************************************
 ; code
@@ -65,7 +72,9 @@ NetStatWin_Init:
   ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
   ldi r20, LOW(RESSOURCE_TXT_NETSTATS)
   ldi r21, HIGH(RESSOURCE_TXT_NETSTATS)
-  bigcall MainWindow_Init               ; (any, !Y)
+  ldi r22, LOW(NetStatWinWin_Config*2)
+  ldi r23, HIGH(NetStatWinWin_Config*2)
+  bigcall CDialog_Init               ; Y=main window
   brcc NetStatWin_Init_ret
 
   ; set default signal map
@@ -78,28 +87,18 @@ NetStatWin_Init:
   ldi r16, NETSTATWIN_TIMERVAL
   std Y+NETSTATWIN_OFFS_TIMER, r16
 
-  bigcall MainWindow_GetContentWidget      ; r19:r18=content window
-  brcc NetStatWin_Init_ret
-  mov xl, r18                              ; use content window as parent
-  mov xh, r19
-
-  ; Y=MainWindow
-  push yl
-    push yh
-      push xl                              ; content window
-        push xh
-          rcall netStatWinCreateContent
-        pop xh
-      pop xl
-      bigcall C03App_CreateBackButton
-    pop yh
-  pop yl
 NetStatWin_Init_ret:
   ret
 ; @end
 
 
 
+; ---------------------------------------------------------------------------
+; @routine NetStatWin_OnToGui @global
+;
+; @param Y pointer to dialog
+; @clobbers any, !Y
+
 NetStatWin_OnTimer:
   ldd r16, Y+OBJECT_OFFS_FLAGS
   andi r16, (1<<WIDGET_FLAGS_VISIBLE_BIT)
@@ -111,11 +110,7 @@ NetStatWin_OnTimer:
   dec r16
   std Y+NETSTATWIN_OFFS_TIMER, r16
   brne NetStatWin_OnTimer_ret
-  push yl
-    push yh
-      rcall netStatWinUpdate
-    pop yh
-  pop yl
+  rcall NetStatWin_toGui
   ldi r16, NETSTATWIN_TIMERVAL
   std Y+NETSTATWIN_OFFS_TIMER, r16
 NetStatWin_OnTimer_ret:
@@ -125,16 +120,20 @@ NetStatWin_OnTimer_ret:
 
 
 
-NetStatWin_OnShow:
-  bigcall Widget_OnShow
-  push yl
-    push yh
-      rcall netStatWinUpdate
-    pop yh
-  pop yl
-  ; reset timer
-  ldi r16, NETSTATWIN_TIMERVAL
-  std Y+NETSTATWIN_OFFS_TIMER, r16
+; ---------------------------------------------------------------------------
+; @routine NetStatWin_OnMkContent @global
+;
+; @param  Y       pointer to dialog
+; @clobbers any, !Y
+
+NetStatWin_OnMkContent:
+  rcall CDialog_CreateContent
+  bigcall MainWindow_GetContentWidget  ; r19:r18=content window
+  brcc NetStatWin_OnMkContent_ret
+  mov xl, r18                          ; use content window as parent
+  mov xh, r19
+  bigcall C03App_CreateBackButton
+NetStatWin_OnMkContent_ret:
   sec
   ret
 ; @end
@@ -142,218 +141,207 @@ NetStatWin_OnShow:
 
 
 ; ---------------------------------------------------------------------------
-; @routine netStatWinCreateContent
+; @routine NetStatWin_OnToGui @global
 ;
-; @param Y pointer to MainWindow
-; @param X pointer to MainWindow content window (becomes parent)
-; @return CFLAG set of okay, cleared otherwise
+; @param Y pointer to dialog
+; @clobbers any, !Y
 
-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, 2                               ; columns per row
-  bigcall MCLayout_new
-  brcc netStatWinCreateContent_ret
-
-  mov xl, yl                               ; use MLayout as parent
-  mov xh, yh
-
-  ldi r20, LOW(RESSOURCE_TXT_PACKETSIN)
-  ldi r21, HIGH(RESSOURCE_TXT_PACKETSIN)
-  rcall netStatWinCreateWidgetPair         ; (any, !X, !Y)
-  brcc netStatWinCreateContent_ret
-
-  ldi r20, LOW(RESSOURCE_TXT_PACKETSOUT)
-  ldi r21, HIGH(RESSOURCE_TXT_PACKETSOUT)
-  rcall netStatWinCreateWidgetPair         ; (any, !X, !Y)
-  brcc netStatWinCreateContent_ret
-
-  ldi r20, LOW(RESSOURCE_TXT_ECONTENT)
-  ldi r21, HIGH(RESSOURCE_TXT_ECONTENT)
-  rcall netStatWinCreateWidgetPair         ; (any, !X, !Y)
-  brcc netStatWinCreateContent_ret
-
-  ldi r20, LOW(RESSOURCE_TXT_EIO)
-  ldi r21, HIGH(RESSOURCE_TXT_EIO)
-  rcall netStatWinCreateWidgetPair         ; (any, !X, !Y)
-  brcc netStatWinCreateContent_ret
-
-  ldi r20, LOW(RESSOURCE_TXT_EMSGSIZE)
-  ldi r21, HIGH(RESSOURCE_TXT_EMSGSIZE)
-  rcall netStatWinCreateWidgetPair         ; (any, !X, !Y)
-
-netStatWinCreateContent_ret:
+NetStatWin_OnToGui:
+  rcall NetStatWin_toGui
+  sec
   ret
 ; @end
 
 
 
 ; ---------------------------------------------------------------------------
-; @routine netStatWinCreateWidgetPair
+; @routine NetStatWin_toGui @global
 ;
-; @param X parent
-; @param r21:r20 id of text ressource
-; @return CFLAG  set if created, cleared otherwise
-; @clobbers !X, !Y
+; @param  Y       pointer to dialog
+; @clobbers any, !Y, !Z
 
-netStatWinCreateWidgetPair:
-  push yl
-    push yh
-      rcall netStatWinCreateLabel            ; (any, !X)
-      brcc netStatWinCreateWidgetPair_popRet
-      rcall netStatWinCreateValueLabel       ; (any, !X)
-netStatWinCreateWidgetPair_popRet:
-    pop yh
-  pop yl
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine netStatWinCreateLabel
-;
-; @param X parent
-; @param r21:r20 id of text ressource
-; @return CFLAG  set if created, cleared otherwise
-; @return Y      new object created
-; @clobbers !X
-
-netStatWinCreateLabel:
-  push xl
-    push xh
-      ldi r16, 0
-      ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT)     | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
-               (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT)  | (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)
-      bigcall Label_new
-    pop xh
-  pop xl
-  ret
-; @end
-
-
-; ---------------------------------------------------------------------------
-; @routine netStatWinCreateValueLabel
-;
-; @param X parent (content sub-window of main window)
-; @return CFLAG  set if created, cleared otherwise
-; @return Y      new object created
-; @clobbers !X
-
-netStatWinCreateValueLabel:
-  push xl
-    push xh
-      ldi r16, 0
-      ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT)  | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
-               (WIDGET_PACK_END<<WIDGET_PACK_HCONTENT0_BIT)  | (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)
-      clr r20 ; postkomma digits
-      clr r21 ; total digits (variable)
-      bigcall ValueLabel_new
-    pop xh
-  pop xl
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine netStatWinUpdate
-;
-; @param Y pointer to window
-; @clobbers any
-
-netStatWinUpdate:
-  bigcall MainWindow_GetFirstChildOfContentWidget    ; get MLayout
-  brcc netStatWinUpdate_ret
-  mov yl, r18
-  mov yh, r19
-  bigcall OBJ_GetFirstChild                          ; get first child widget (label)
-  brcc netStatWinUpdate_ret
-  mov yl, r18
-  mov yh, r19
-  bigcall OBJ_GetNext                                ; get first value label widget
-  brcc netStatWinUpdate_ret
-  mov yl, r18
-  mov yh, r19
-
-  rcall netWinStatsUpdatePacketsIn
-  brcc netStatWinUpdate_ret
-  rcall netWinStatsUpdatePacketsOut
-  brcc netStatWinUpdate_ret
-  rcall netWinStatsUpdateContentErrors
-  brcc netStatWinUpdate_ret
-  rcall netWinStatsUpdateIoErrors
-  brcc netStatWinUpdate_ret
-  rcall netWinStatsUpdateMsgSizeErrors
-netStatWinUpdate_ret:
-  ret
-; @end
-
-
-
-netWinStatsUpdatePacketsIn:
+NetStatWin_toGui:
   lds xl, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_HIGH
-  bigcall Widget_SetCurrentValue
-  rjmp netWinStatsSkip2
-; @end
+  ldi r16, NETSTATWIN_SEL_PACKETSIN
+  bigcall CDialog_SetChildValue
 
-
-
-netWinStatsUpdatePacketsOut:
   lds xl, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_HIGH
-  bigcall Widget_SetCurrentValue
-  rjmp netWinStatsSkip2
-; @end
+  ldi r16, NETSTATWIN_SEL_PACKETSOUT
+  bigcall CDialog_SetChildValue
 
-
-netWinStatsUpdateContentErrors:
   lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_HIGH
-  bigcall Widget_SetCurrentValue
-  rjmp netWinStatsSkip2
-; @end
+  ldi r16, NETSTATWIN_SEL_ECONTENT
+  bigcall CDialog_SetChildValue
 
-
-
-netWinStatsUpdateIoErrors:
   lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_IO_HIGH
-  bigcall Widget_SetCurrentValue
-  rjmp netWinStatsSkip2
-; @end
+  ldi r16, NETSTATWIN_SEL_EIO
+  bigcall CDialog_SetChildValue
 
-
-netWinStatsUpdateMsgSizeErrors:
   lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_HIGH
-  bigcall Widget_SetCurrentValue
+  ldi r16, NETSTATWIN_SEL_EMSGSIZE
+  bigcall CDialog_SetChildValue
+
   ret
 ; @end
 
 
 
-netWinStatsSkip2:
-  ldi r16, 2
-  bigcall OBJ_SkipObjects
-  mov yl, r18
-  mov yh, r19
-  ret
-
-
 
 
 ; ***************************************************************************
 ; data in FLASH
 
+
+NetStatWinWin_Config:
+  .db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0                 ; TYPE, FLAGS
+  .dw 0                                                     ; STYLE
+  .db 2, 0                                                  ; PARAM1, PARAM2
+  
+  ; line 1, left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+         (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_PACKETSIN                               ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 1, right widget
+  .db CWIDGETCFG_WIDGET_TYPE_VALUELABEL, 0                  ; TYPE, FLAGS
+  .db NETSTATWIN_SEL_PACKETSIN, 0                           ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_END<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+
+  ; line 2, left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+         (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_PACKETSOUT                              ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 2, right widget
+  .db CWIDGETCFG_WIDGET_TYPE_VALUELABEL, 0                  ; TYPE, FLAGS
+  .db NETSTATWIN_SEL_PACKETSOUT, 0                          ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_END<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 3, left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+         (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_ECONTENT                                ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 3, right widget
+  .db CWIDGETCFG_WIDGET_TYPE_VALUELABEL, 0                  ; TYPE, FLAGS
+  .db NETSTATWIN_SEL_ECONTENT, 0                            ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_END<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 4, left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+         (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_EIO                                     ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 4, right widget
+  .db CWIDGETCFG_WIDGET_TYPE_VALUELABEL, 0                  ; TYPE, FLAGS
+  .db NETSTATWIN_SEL_EIO, 0                            ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_END<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 5, left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+         (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_EMSGSIZE                                ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 5, right widget
+  .db CWIDGETCFG_WIDGET_TYPE_VALUELABEL, 0                  ; TYPE, FLAGS
+  .db NETSTATWIN_SEL_EMSGSIZE, 0                            ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_END<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; end of configuration
+  .dw 0
+
+
+
+
+
 NetStatWin_DefaultSignalmap:
   ; header
-  .dw MainWindow_DefaultSignalmap*2  ; next table to use
+  .dw CDialog_DefaultSignalmap*2  ; next table to use
   ; entries
-  .db 0, OBJECT_SIGNAL_TIMER,   LOW(NetStatWin_OnTimer),  HIGH(NetStatWin_OnTimer)
-  .db 0, WIDGET_SIGNAL_SHOW,    LOW(NetStatWin_OnShow),   HIGH(NetStatWin_OnShow)
+  .db 0, OBJECT_SIGNAL_TIMER,     LOW(NetStatWin_OnTimer),     HIGH(NetStatWin_OnTimer)
+  .db 0, DIALOG_SIGNAL_TOGUI,     LOW(NetStatWin_OnToGui),     HIGH(NetStatWin_OnToGui)
+  .db 0, DIALOG_SIGNAL_MKCONTENT, LOW(NetStatWin_OnMkContent), HIGH(NetStatWin_OnMkContent)
 
   .db 0, 0, 0, 0  ; end of table