Visualization refactor

Same as above?