Fix bugs in welcome screen
Merge pull request #528 from timrae/welcomeScreenFix2

Fix bugs in welcome screen