Scatter plot refactored

Mainly contain UI changes and refactoring to adjust the Scatter Plot analysis to work with backend changes.