Able to use two different edit forms in one screen

@AlvinM :point_down: