UI clean up and Org edit bug
starting of the d3 additions