Updated form design