Moved interactivity to FinalPlot
Fixed merge conflict