Feature/refactor visualizations