ConnectionDrawingManager refactoring and bugfix