redesign form

(haven't added code yet)