Implemented view/routing modifications