several changes in the forms add more settings functionality, test to be done