Visualization refactoring and tweaks.