Add remaining form sections

Add remaining form sections
Remove label-long from other language group
Merge changes