Fixes to cucumber steps taking into account the new screen flow and layouts