Front-End Further Work - Finished Charts
Merge remote-tracking branch 'origin/master'