Major updates to planning form