variant and form widgets fixes