Adding support to reference renders through html
Cleanups