Changed cukes to match new design
Made login choice cuke work for what we know of the new choices