Add fields to form, remove unused files for 1.0
Merge branch 'master' of https://github.com/zwp/mfn