Some refactoring on routing and views