Update/fix ScreenSteps