Got rid of checkbox madness in WelcomeActivity