Refactored views and models and services and helpers