Fix no data handling
Slightly better no data handling
Spread out data labels