merging all welcome screen changes from sandbox