make the plot page work.
Merge branch 'dev'