SPA - fixed graph, UI tweaks