Update issue: Support child widget menus and cleanup