Updated form layout.