removed unused rhash method and split out figure html