Add menu nesting and polygon support