Claim/navigation refactoring with just "next buttons" requiring updating.
merge with postmvp