PAHMA-1060: formatting tweaks to HSR forms