Updates to controllers and views