Merge "Yangman - Menus overlapping in params dialog"