fix offset issues in visualization, please check