Inserted ul li to within form, re-arranged and added fieldset
Merge pull request #32 from dsjlee/patch-12

Inserted ul li to within form, re-arranged and added fieldset