Design and round trip amends to finalise registration journey

This also fixes some but not all design in greenscreen