controllers and layouts modified