885203 - Menu width fixes. [Do Not Merge]

DO NOT MERGE