Refactoring of routing, data and services
Styling of content