fixed 'finish and review' functionality