Fixes on routing and views