Better form labeling

Change-Id: I49b4fa440562c521b280b294e7c936a0c8847994