Improved layout; dimensions more predictable.