Updated form view part 2