Update collection form template

Add ``class="controls"`` to fix collection rows indentation
Merge class attributes
Merge pull request #1167 from EmmanuelVella/patch-6

Update collection form template