Fix menubar width issues