Updated format of forms