Fixes to menu structure.