Tweaked all steps to the new design.