Resizing and better 'guessing' for visualizer
Resolve conflicts