Implement new page to select the maturity before checkout

For some reason the PR #631 was merged without any commits. This PR is the commits that was in there.