fix menu nesting + ...

...sync with development channel

I received help from Sumi for this one!