Bounding box fixes, layout improvements.