[3649] markup and widgets