WP-2505: Update view to spec.