Added noFinishButton setting