merge watermelon, tweak tailor menus