Added form and table