Changes to WelcomeWindow

Tried to keep all of Ivy's changes in the file.