Tidy-up spaces and columns