Added setup screen flow