added new class handlers for form elements, for our specific use-case