edited controlers and views