added d3 graphs and modal popup
fixed merge conflicts