some more generalization in the form, some css fixes, etc