#14: Fixed port dragging after refactoring.
Merge branch 'feature/14-fix-port-dropping'