Updated form layout