Various fixes to the new Welcome Page system