edited controllers and views