Wrap form, fix error message animation