form2, table2 active/inactive controls changed to buttons, added icons