WP-4158: changes to layout b.