updated form layout