Upgraded 2d visualizer