refactored finish page and fixed broken finish messages