Add what’s next to welcome page and clean-up