fix controllers and views