removed span tags and used div
Conflicts resolved for all rows
Resolved issues for form