Improved handling of multi-col boxes