Made view and controller changes to reflect Prof's changes