Refactored similar views and data providers.