improved labels and tooltip