Updated helper to include optional labels for nonJS rendering
made claimant contact address optional in nonJS