Fix some overlap problems on the x-axis labelling