Adjustments to show labels wherever needed