Updated form layout and styles