added form and table