More edits to controllers and views