design update
adding chart.js
design improvents
Merge origin/master