Added more logic to the game controller and view