Improve WelcomeView to work with external templates