More formatting of form tags

Should align in a table now.