Space calculation improved but space for labels isn't quite right when changing fonts, especially for small fonts.