more figure re-formatting