WP-2061: update views markup.