Merge master files to m3

changes to welcome screen regarding buttons and stuff