refactored views.