Extract menu + add DropDown + fix test for DD