Fix in controller and views files