Improvements at form generator