Updated View and Controller