Reduce line-height and improve width queries