WP-2619: adjust dividers and spacing.