Cleanup/Fix in menus/layout