rearragne d3-1 layout
fix d3-1
fix conflicts
fix end in controller