Added Viki end screen and updated some logic