Updated form layout for #7