Refactored views.