A little bit refactor views and routes