Update visualizations page to working state
Fix merge conflicts