Better force fill behavior

  * Measure actual column width better
  * Handle single-column case better