Update of SetupStep view. Almost done