Various fixes to the new welcome page system