Fix routes and views