Hi MaryScot,
Hope you are well.
Follow JohnUk instructions, the same thing happened to me while checking in and had previously on an airline app. Its the way our NHS passes show the Booster first.
About your Covid test, yes any fit to fly certificate would work. If your departure from the UK and cruise embarkation is within 48 hrs you can use the same test.
Hope it helps,
Jose from London