Merge pull request #4966 from shreyasp/move-compny-fld-in-jv

[Minor] Moved company field to top of the form