updated goals form helper layout