Refactoring of views and routes. To be continued...