WP-2052 Updating to use new view mode