Updated controllers and views