Form layout incorrect

Form layout incorrect
https://opencart.atlassian.net/browse/OC-1665