Reorder then & now columns to flow better