Fix two-columns

One PR to rule them all