cleaning up and adding touch support for forms