Prep work for fixing the two-column layouts