Added some visualization enhancements