Updated Routing, and Views