WP-1967: adjust alignment and spacing.