Performance improvements Gui
Merge conflicts resolved
Finally fixed the graph plotting