updating final screen
Merge remote-tracking branch 'origin/master'
Updating final view