Fix node size calculation
Fix drawing links