fixes include rlt support for contact form, minor refactoring

@dbudell