Update to routes, and views