improved bounding boxes

These are from the design firm and are meant to have better
bounding boxes than the previous versions. They should be
otherwise unchanged.

Should be checked but hopefully fixes #1