Reversed order of finish buttons
Implemented finish/finishcontinue