updated controllers and views