Extract validations into include file to remove duplication. Issue: #487
Added repeating sections. Added expanding sections. Issue: #487