Added WelcomeForm

And fixed some related bugs