Added more finish button functionality