Added a finish button, and the functionality associated with it