form2, table2 submit replaced as button, added icon-save to them