Engagement planning form following the PAG (tweaks)