Fix menu width, submenu item formatting