Updated prediction logic, controllers, and views