WP-2064 Updating the views to match functional requirements