Menu: Improved support for nested content