Main menu layout is now more robust.