Added new changes which use Intents to switch views and keep track of the results