Update form template for TB 3.0. Make some cleaning