Fix controller and views