Layout refactor, bbox.