Updated Routes and Views