Improve visualization