Added d3 chart, refactored views