Made controller and view edits