Replace form structure with table.
Simplify syntax.