modules/welcome: refactored.

Other cosmetic changes.