Feature/html helper updates

See commit messages for proposed changes.