Improve visualization code
Fix merge conflict