add wrapper, new AutoLayout Separator, some other changes