Added stub yes, no and payment pages