Manually arranged nodes in canvas to be more tree like for presentation
Fixed merge