Follow on to #1368, actually let's just return the formatted page from onWelcomePage instead