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