Fix bugs in welcome screen

Fix 2 bugs in welcome screen