Template changes
Put user form in a table