Changed controllers and views