improve form in demo12