WIP: Worked on cleaning up visualizations and interactions