Updated form template to reflect the form change, and fixed a small bug with the as_p rendering