WP-2124: sizing and spacing changes.