MADS: Cleanup of menu item positioning