Merge branch 'develop'
Fixed the Plot page... still not done