Updated controller to return ModelAndView