Adjusting node layout for duplicate counter
More fixes - still 1 failing test