Fix display+layout menu item order