Revised placement of form code