Fix order of operation when calculating margin for forms in rows
Merge pull request #2227 from sagamore/form-row-margin-fix

Fix order of operation when calculating margin for forms in rows