style user form, dry user form, fix tests