updated to use defhtml in common